From 8bc7c4c95d2f3bcc802c070f80ba486dbe59533e Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Tue, 10 Sep 2024 09:56:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=BD=A6=E5=9E=8B=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppController.java | 2 +- .../controller/system/EtModelController.java | 10 +++- .../system/EtOperatingAreaController.java | 4 ++ .../com/ruoyi/system/domain/EtFeeRule.java | 4 ++ .../java/com/ruoyi/system/domain/EtModel.java | 13 +++++ .../com/ruoyi/system/domain/EtModelRule.java | 28 +++++++++++ .../java/com/ruoyi/system/domain/EtOrder.java | 18 +++++++ .../ruoyi/system/mapper/EtFeeRuleMapper.java | 16 +++++++ .../system/mapper/EtModelRuleMapper.java | 29 ++++++++++++ .../system/service/IEtFeeRuleService.java | 16 +++++++ .../service/impl/EtFeeRuleServiceImpl.java | 47 ++++++++++++++----- .../service/impl/EtModelServiceImpl.java | 24 ++++++++-- .../impl/EtOperatingAreaServiceImpl.java | 34 +++++++------- .../service/impl/EtOrderServiceImpl.java | 31 +++++++++--- .../mapper/system/EtFeeRuleMapper.xml | 19 ++++++++ .../resources/mapper/system/EtModelMapper.xml | 12 +++-- .../mapper/system/EtModelRuleMapper.xml | 14 ++++++ 17 files changed, 278 insertions(+), 43 deletions(-) create mode 100644 electripper-system/src/main/java/com/ruoyi/system/domain/EtModelRule.java create mode 100644 electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelRuleMapper.java create mode 100644 electripper-system/src/main/resources/mapper/system/EtModelRuleMapper.xml diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index cfc72b3..81a574a 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -251,7 +251,7 @@ public class AppController extends BaseController @GetMapping("/fee/list") public AjaxResult feeList(EtFeeRule etFeeRule) { - List list = etFeeRuleService.selectEtFeeRuleListByAreaId(etFeeRule.getAreaId()); + List list = etFeeRuleService.selectRuleInfoListByModelId(etFeeRule.getModelId()); return success(list); } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java index eb45a43..edeae2f 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtModelController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.system.service.IAsDeviceService; +import com.ruoyi.system.service.IEtFeeRuleService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -39,6 +40,9 @@ public class EtModelController extends BaseController @Autowired private IAsDeviceService asDeviceService; + @Autowired + private IEtFeeRuleService etFeeRuleService; + /** * 查询车辆型号列表 @@ -72,7 +76,11 @@ public class EtModelController extends BaseController @GetMapping(value = "/{modelId}") public AjaxResult getInfo(@PathVariable("modelId") Long modelId) { - return success(etModelService.selectEtModelByModelId(modelId)); + AjaxResult ajax = AjaxResult.success(); + EtModel model = etModelService.selectEtModelByModelId(modelId); + ajax.put(AjaxResult.DATA_TAG, model); + ajax.put("ruleIds", etFeeRuleService.selectRuleListByModelId(modelId)); + return ajax; } /** diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtOperatingAreaController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtOperatingAreaController.java index c63609d..b91b163 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtOperatingAreaController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtOperatingAreaController.java @@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.EtFeeRule; import com.ruoyi.system.domain.EtModel; import com.ruoyi.system.domain.EtOperatingArea; import com.ruoyi.system.mapper.EtModelMapper; @@ -172,6 +173,9 @@ public class EtOperatingAreaController extends BaseController EtModel model = new EtModel(); model.setOperator(deptId); ajax.put("modelList", etModelMapper.selectEtModelList(model)); + EtFeeRule rule = new EtFeeRule(); + rule.setDeptId(deptId); + ajax.put("ruleList", etFeeRuleService.selectEtFeeRuleList(rule)); return success(ajax); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java index 6790162..0dbe51f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java @@ -47,6 +47,10 @@ public class EtFeeRule extends BaseEntity @Excel(name = "运营商id") private Long deptId; + @Excel(name = "车型id") + @TableField(exist = false) + private Long modelId; + /** 说明 */ @Excel(name = "说明") private String explain; diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtModel.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtModel.java index 5254865..75caac6 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtModel.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtModel.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; @@ -32,6 +33,14 @@ public class EtModel extends BaseEntity @Excel(name = "运营商id") private Long operator; + /** 运营区id */ + @Excel(name = "运营区id") + private Long areaId; + + /** 运营区名称 */ + @Excel(name = "运营区名称") + private String areaName; + /** 运营商 */ @Excel(name = "运营商") private String operatorName; @@ -58,4 +67,8 @@ public class EtModel extends BaseEntity @Excel(name = "运营区列表") private List areaList; + /** 收费方式 */ + @TableField(exist = false) + private Long[] ruleIds; + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtModelRule.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtModelRule.java new file mode 100644 index 0000000..4e88ee0 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtModelRule.java @@ -0,0 +1,28 @@ +package com.ruoyi.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +/** + * 车型与收费方式关联对象 et_model_rule + * + * @author 邱贞招 + * @date 2024-05-19 + */ +@Data +@Builder +@TableName(value = "et_model_rule") +public class EtModelRule implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 区域id */ + private Long modelId; + + /** 收费规则id */ + private Long ruleId; + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java index 5d976d5..050daf0 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java @@ -329,5 +329,23 @@ public class EtOrder extends BaseEntity @TableField(exist = false) private BigDecimal cost; + /** 可退预约费 */ + @Excel(name = "可退预约费") + @TableField(exist = false) + private BigDecimal refundableAppointmentFee; + /** 可退运营区外调度费退款 */ + @Excel(name = "可退运营区外调度费退款") + @TableField(exist = false) + private BigDecimal refundableRideFee; + + /** 可退预约费 */ + @Excel(name = "可退预约费") + @TableField(exist = false) + private BigDecimal refundableDispatchFee; + + /** 可退停车点外调度费退款 */ + @Excel(name = "可退停车点外调度费退款") + @TableField(exist = false) + private BigDecimal refundableManageFee; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java index cc9e377..c31799f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java @@ -76,6 +76,14 @@ public interface EtFeeRuleMapper */ public List selectRuleListByAreaId(Long areaId); + /** + * 根据modelId获取收费方式选择框列表 + * + * @param modelId 车型id + * @return 选中收费方式ID列表 + */ + public List selectRuleListByModelId(Long modelId); + /** * 根据区域ID获取收费方式列表 * @@ -84,6 +92,14 @@ public interface EtFeeRuleMapper */ public List selectRuleInfoListByAreaId(Long areaId); + /** + * 根据区域ID获取收费方式列表 + * + * @param modelId 车型id + * @return 选中收费方式ID列表 + */ + public List selectRuleInfoListByModelId(Long modelId); + /** * 根据区域ID获取收费方式名称选择框列表 diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelRuleMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelRuleMapper.java new file mode 100644 index 0000000..886b077 --- /dev/null +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtModelRuleMapper.java @@ -0,0 +1,29 @@ +package com.ruoyi.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.EtModelRule; + +/** + * 区域与收费方式关联 数据层 + * + * @author ruoyi + */ +public interface EtModelRuleMapper extends BaseMapper +{ + /** + * 通过用运营区ID删除区域与收费方式关联 + * + * @param areaId 运营区id + * @return 结果 + */ + public int deleteModelRuleByModelId(Long areaId); + + /** + * 通过用ruleId删除区域与收费方式关联 + * + * @param ruleId 运营区id + * @return 结果 + */ + public int deleteModelRuleByRuleId(Long ruleId); + +} diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java index cc0a754..bf8d457 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java @@ -44,6 +44,14 @@ public interface IEtFeeRuleService */ public List selectEtFeeRuleListByAreaId(Long areaId); + /** + * 根据运营区获取收费方式列表 + * + * @param modelId 车型id + * @return 收费方式集合 + */ + public List selectRuleInfoListByModelId(Long modelId); + /** * 新增收费方式 @@ -93,4 +101,12 @@ public interface IEtFeeRuleService * @return 选中收费方式名称列表 */ public List selectRuleNameListByAreaId(Long areaId); + + /** + * 根据modelId获取收费方式选择框列表 + * + * @param modelId 车型id + * @return 选中收费方式ID列表 + */ + public List selectRuleListByModelId(Long modelId); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java index 6727361..5439364 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java @@ -1,7 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.List; - import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.annotation.DataScope; @@ -10,20 +8,20 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.system.domain.EtAreaRule; +import com.ruoyi.system.domain.EtFeeRule; +import com.ruoyi.system.domain.EtModelRule; import com.ruoyi.system.domain.EtOperatingArea; -import com.ruoyi.system.domain.vo.IntervalRuleVo; import com.ruoyi.system.domain.vo.StartingRuleVo; -import com.ruoyi.system.mapper.EtAreaRuleMapper; +import com.ruoyi.system.mapper.EtFeeRuleMapper; +import com.ruoyi.system.mapper.EtModelRuleMapper; +import com.ruoyi.system.service.IEtFeeRuleService; import com.ruoyi.system.service.IEtOperatingAreaService; import com.ruoyi.system.service.IWxPayService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.EtFeeRuleMapper; -import com.ruoyi.system.domain.EtFeeRule; -import com.ruoyi.system.service.IEtFeeRuleService; import javax.annotation.Resource; +import java.util.List; /** * 收费方式Service业务层处理 @@ -43,8 +41,11 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService @Autowired private IWxPayService wxPayService; +// @Resource +// private EtAreaRuleMapper etAreaRuleMapper; + @Resource - private EtAreaRuleMapper etAreaRuleMapper; + private EtModelRuleMapper etModelRuleMapper; /** * 查询收费方式 @@ -122,6 +123,17 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService return etFeeRuleMapper.selectRuleInfoListByAreaId(areaId); } + /** + * 根据运营区获取收费方式列表 + * + * @param modelId 车型id + * @return 结果 + */ + @Override + public List selectRuleInfoListByModelId(Long modelId) { + return etFeeRuleMapper.selectRuleInfoListByModelId(modelId); + } + /** * 新增收费方式 * @@ -141,7 +153,7 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService etFeeRule.setStatus("0"); int i = etFeeRuleMapper.insertEtFeeRule(etFeeRule); if(ObjectUtil.isNotNull(etFeeRule.getAreaId())){ - etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etFeeRule.getAreaId()).ruleId(etFeeRule.getRuleId()).build()); + etModelRuleMapper.insert(EtModelRule.builder().modelId(etFeeRule.getModelId()).ruleId(etFeeRule.getRuleId()).build()); } return i; } @@ -155,9 +167,9 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService @Override public int updateEtFeeRule(EtFeeRule etFeeRule) { - int i = etAreaRuleMapper.deleteAreaRuleByRuleId(etFeeRule.getRuleId()); + int i = etModelRuleMapper.deleteModelRuleByModelId(etFeeRule.getRuleId()); if(ObjectUtil.isNotNull(etFeeRule.getAreaId())){ - etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etFeeRule.getAreaId()).ruleId(etFeeRule.getRuleId()).build()); + etModelRuleMapper.insert(EtModelRule.builder().modelId(etFeeRule.getModelId()).ruleId(etFeeRule.getRuleId()).build()); } return etFeeRuleMapper.updateEtFeeRule(etFeeRule); } @@ -197,6 +209,17 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService return etFeeRuleMapper.selectRuleListByAreaId(areaId); } + /** + * 根据modelId获取收费方式选择框列表 + * + * @param modelId 车型id + * @return 选中收费方式ID列表 + */ + @Override + public List selectRuleListByModelId(Long modelId) { + return etFeeRuleMapper.selectRuleListByModelId(modelId); + } + /** * 根据区域ID获取收费方式名称选择框列表 * diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java index 5d42eff..9b454c8 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java @@ -12,9 +12,11 @@ import com.ruoyi.common.utils.onenet.ResponseVo; import com.ruoyi.common.utils.onenet.Token; import com.ruoyi.system.domain.AsDevice; import com.ruoyi.system.domain.EtModel; +import com.ruoyi.system.domain.EtModelRule; import com.ruoyi.system.domain.EtOperatingArea; import com.ruoyi.system.mapper.AsDeviceMapper; import com.ruoyi.system.mapper.EtModelMapper; +import com.ruoyi.system.mapper.EtModelRuleMapper; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.service.IAsDeviceService; import com.ruoyi.system.service.IEtModelService; @@ -44,15 +46,15 @@ public class EtModelServiceImpl implements IEtModelService @Autowired private IAsDeviceService asDeviceService; - @Resource - private AsDeviceMapper asDeviceMapper; - @Resource private IEtOperatingAreaService etOperatingAreaService; @Resource private SysDeptMapper deptMapper; + @Resource + private EtModelRuleMapper etModelRuleMapper; + /** * 查询车辆型号 @@ -120,6 +122,13 @@ public class EtModelServiceImpl implements IEtModelService } etModel.setCreateTime(DateUtils.getNowDate()); int i = etModelMapper.insertEtModel(etModel); + Long[] ruleIds = etModel.getRuleIds(); + if(ObjectUtil.isNotNull(ruleIds) && ruleIds.length > 0){ + for (Long ruleId:ruleIds){ + etModelRuleMapper.insert(EtModelRule.builder().modelId(etModel.getModelId()).ruleId(ruleId).build()); + } + } + // // 发送设置低电压命令 // Integer lowBatteryReminder = etModel.getLowBatteryReminder(); // if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ @@ -156,6 +165,15 @@ public class EtModelServiceImpl implements IEtModelService } etModel.setUpdateTime(DateUtils.getNowDate()); int i = etModelMapper.updateEtModel(etModel); + Long[] ruleIds = etModel.getRuleIds(); + if(ObjectUtil.isNotNull(ruleIds)){ + etModelRuleMapper.deleteModelRuleByModelId(etModel.getModelId()); + if(ObjectUtil.isNotNull(ruleIds)){ + for (Long ruleId:ruleIds){ + etModelRuleMapper.insert(EtModelRule.builder().modelId(etModel.getModelId()).ruleId(ruleId).build()); + } + } + } // 发送设置低电压命令 // Integer lowBatteryReminder = etModel.getLowBatteryReminder(); // if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java index 5e0befd..0bd7d45 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java @@ -56,8 +56,8 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl 0){ - for (Long ruleId:ruleIds){ - etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etOperatingArea.getAreaId()).ruleId(ruleId).build()); - } - } +// Long[] ruleIds = etOperatingArea.getRuleIds(); +// if(ObjectUtil.isNotNull(ruleIds) && ruleIds.length > 0){ +// for (Long ruleId:ruleIds){ +// etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etOperatingArea.getAreaId()).ruleId(ruleId).build()); +// } +// } Long deptId = SecurityUtils.getDeptId(); if(deptId == 100){ deptId = etOperatingArea.getDeptId(); @@ -193,15 +193,15 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl refundList = etRefundService.selectEtRefundList(etRefund); + // 初始化可退金额为订单的原始费用 + BigDecimal remainingDispatchFee = order.getDispatchFee(); + BigDecimal remainingManageFee = order.getManageFee(); + BigDecimal remainingRidingFee = order.getRidingFee(); + BigDecimal remainingAppointmentFee = order.getAppointmentFee(); + BigDecimal totalRefundedAmount = BigDecimal.ZERO; // 总退款金额 + + List refundList = etRefundService.selectEtRefundByOrderNo(order.getOrderNo()); + if(ObjectUtils.isNotEmpty(refundList) && refundList.size() > 0){ + order.setEtRefunds(refundList); + } if(ObjectUtils.isNotEmpty(refundList)){ - EtRefund etRefund1 = refundList.get(0); - order.setEtRefund(etRefund1); - order.setSettlementFee(order.getTotalFee().subtract(etRefund1.getAmount())); + for (EtRefund refund : refundList) { + totalRefundedAmount = totalRefundedAmount.add(refund.getAmount() != null ? refund.getAmount() : BigDecimal.ZERO); + // 减去已退款的金额 + remainingDispatchFee = remainingDispatchFee.subtract(refund.getDispatchFee() != null ? refund.getDispatchFee() : BigDecimal.ZERO); + remainingManageFee = remainingManageFee.subtract(refund.getManageFee() != null ? refund.getManageFee() : BigDecimal.ZERO); + remainingRidingFee = remainingRidingFee.subtract(refund.getRidingFee() != null ? refund.getRidingFee() : BigDecimal.ZERO); + remainingAppointmentFee = remainingAppointmentFee.subtract(refund.getAppointmentFee() != null ? refund.getAppointmentFee() : BigDecimal.ZERO); + } + order.setSettlementFee(order.getTotalFee().subtract(totalRefundedAmount)); }else{ order.setSettlementFee(order.getTotalFee()); } + order.setRefundableDispatchFee(remainingDispatchFee.max(BigDecimal.ZERO)); + order.setRefundableManageFee(remainingManageFee.max(BigDecimal.ZERO)); + order.setRefundableRideFee(remainingRidingFee.max(BigDecimal.ZERO)); + order.setRefundableAppointmentFee(remainingAppointmentFee.max(BigDecimal.ZERO)); + //行程记录 EtTripLog tripLog = new EtTripLog(); tripLog.setOrderNo(order.getOrderNo()); diff --git a/electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml b/electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml index 7e47fea..c44ea8a 100644 --- a/electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml @@ -74,6 +74,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.is_deleted = 0 and a.area_id = #{areaId} + + + + insert into et_fee_rule diff --git a/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml index 500c6d9..9d1171c 100644 --- a/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtModelMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,24 +22,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select model_id, model, brand, operator, full_voltage, low_voltage, full_endurance, low_battery_reminder, create_by, create_time, update_by, update_time, remark from et_model + select model_id, model, brand, operator, area_id, full_voltage, low_voltage, full_endurance, low_battery_reminder, create_by, create_time, update_by, update_time, remark from et_model