diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index 5b7650c..54bb24d 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -1169,7 +1169,7 @@ public class AppVerifyController extends BaseController } // 当前有骑行中的订单 EtOrder currentOrder = etOrderService.getCurrentOrder(newDevice.getSn()); - if(ObjectUtil.isNotNull(currentOrder)){ + if(ObjectUtil.isNotNull(currentOrder) && !currentOrder.getOrderNo().equals(orderNo)){ return error("当前车辆有骑行中的订单，请换车"); } //低电量不得骑行判断 diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java index 4f8a972..00f42a3 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCapitalFlow.java @@ -89,4 +89,11 @@ public class EtCapitalFlow extends BaseEntity @TableField(exist = false) private String[] typeList; + /** 型号id */ + private Long modelId; + + /** 型号 */ + @TableField(exist = false) + private String model; + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java index 9f7b983..8a6528a 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/AsDeviceMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.AsDevice; import org.apache.ibatis.annotations.Param; @@ -69,6 +71,7 @@ public interface AsDeviceMapper extends BaseMapper * @param asDevice 设备 * @return 结果 */ + @Log(title = "修改设备", businessType = BusinessType.UPDATE) public int updateAsDevice(AsDevice asDevice); /** diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index 5c745c2..ce44f19 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -971,7 +971,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i Boolean inOrderBySn = etOrderService.isInOrderBySn(sn);//有进行中的订单，跳过 if(!inOrderBySn){ AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//车辆解禁 int device = asDeviceMapper.updateAsDevice(asDevice); if(device==0){ log.info("车辆解禁状态失败"); @@ -1455,7 +1455,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK); }else{ if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//管理员锁车 } } asDevice.setIsAdminUnlocking("0"); @@ -1487,7 +1487,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK); }else{ if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//管理员锁车 } } asDevice.setIsAdminUnlocking("0"); @@ -1602,7 +1602,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i throw new ServiceException("【车辆超时预约】:更新订单状态失败"); } // 改变车辆状态 - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//定时取消预约 asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); int device = asDeviceMapper.updateAsDevice(asDevice); if(device==0){ @@ -1644,7 +1644,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(i==0){ throw new ServiceException("【取消预约】:更新订单失败"); } - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//取消预约 asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN); int device = asDeviceMapper.updateAsDevice(asDevice); if(device==0){ @@ -1777,7 +1777,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i } if(ObjectUtil.isNotNull(device)){ /** 4. 更新车辆状态*/ - device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//还车 device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); int deviceUpdate = asDeviceMapper.updateAsDevice(device); if(deviceUpdate==0){ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index df53bbc..386ddde 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -124,6 +124,9 @@ public class CallbackServiceImpl implements CallbackService { @Autowired private CallbackService callbackService; + @Resource + private EtModelMapper etModelMapper; + @Value("${aliyun.accessKeyId}") private String accessKeyId; @@ -684,6 +687,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(payType); capitalFlow.setCreateTime(DateUtils.getNowDate()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【微信支付回调】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); if(i==0){ @@ -731,6 +738,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(payType); capitalFlow.setCreateTime(DateUtils.getNowDate()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【微信支付回调】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); if(i==0){ @@ -843,6 +854,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(payType); capitalFlow.setCreateTime(DateUtils.getNowDate()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【微信支付回调】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); if(i==0){ @@ -890,6 +905,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(payType); capitalFlow.setCreateTime(order.getPayTime()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【微信支付回调】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); if(i==0){ @@ -953,6 +972,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(ServiceConstants.PAY_TYPE_WX); capitalFlow.setCreateTime(DateUtils.getNowDate()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【保存资金流水】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); return i; @@ -1010,6 +1033,10 @@ public class CallbackServiceImpl implements CallbackService { } capitalFlow.setPayType(ServiceConstants.PAY_TYPE_WX); capitalFlow.setCreateTime(DateUtils.getNowDate()); + AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn()); + if (device != null) { + capitalFlow.setModelId(device.getModelId()); + } logger.info("【保存资金流水】保存资金流水记录对象 : " + JSON.toJSONString(capitalFlow)); int i = etCapitalFlowService.insertEtCapitalFlow(capitalFlow); return i; diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 9d7f5f8..8580256 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -1835,7 +1835,7 @@ public class EtOrderServiceImpl implements IEtOrderService } Boolean execute = transactionTemplate.execute(e -> { asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//换车关锁 asDevice.setIsAdminUnlocking("0"); int device = asDeviceMapper.updateAsDevice(asDevice); if(device==0){ diff --git a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml index cecb744..0e8dcdb 100644 --- a/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml @@ -50,12 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cf.partner_dividend, cf.pay_type, cf.create_time, - a.area_name + a.area_name, + m.model FROM et_capital_flow cf LEFT JOIN et_operating_area a ON a.area_id = cf.area_id LEFT JOIN et_area_dept ad ON ad.area_id = cf.area_id LEFT JOIN sys_dept d ON d.dept_id = ad.dept_id + LEFT JOIN et_model m ON m.model_id = cf.model_id WHERE 1 = 1 and cf.area_id = #{areaId} @@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cf.operator_dividend = #{operatorDividend} and cf.operator_balance = #{operatorBalance} and cf.partner_dividend = #{partnerDividend} + and cf.model_id = #{modelId} and cf.pay_type = #{payType} AND cf.create_time >= #{params.beginTime}