From 803d2211aa81a1e0f3dcbaf179192333cf4a56d3 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 7 Aug 2024 10:25:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppController.java | 14 +++ .../controller/app/AppVerifyController.java | 17 +++ .../com/ruoyi/common/enums/BusinessType.java | 4 + .../java/com/ruoyi/system/domain/EtOrder.java | 4 + .../ruoyi/system/mapper/EtOrderMapper.java | 9 ++ .../ruoyi/system/service/IEtOrderService.java | 5 + .../service/impl/AsDeviceServiceImpl.java | 26 +++-- .../service/impl/CallbackServiceImpl.java | 1 + .../service/impl/EtOrderServiceImpl.java | 100 ++++++++++-------- .../system/service/impl/WxPayService.java | 1 + .../resources/mapper/system/EtOrderMapper.xml | 16 ++- 11 files changed, 141 insertions(+), 56 deletions(-) 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 76cf831..8c08bc5 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 @@ -345,6 +345,20 @@ public class AppController extends BaseController return success(orders); } + /** + * 查询当前用户是否有正在审核中的订单 + */ + @PostMapping("/user/isInAuditOrder") + public AjaxResult isInAuditOrder(Long userId) + { + if(StrUtil.isBlank(userId.toString())){ + logger.info("没有userId参数：【userId={}】",userId); + return error("请传userId参数"+"【userId="+userId+"】"); + } + List orders = etOrderService.isInAuditOrder(userId,null); + return success(orders); + } + /** * 根据定位获取地址 逆地理编码 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 65eb1fc..3ec1a65 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 @@ -270,6 +270,9 @@ public class AppVerifyController extends BaseController if(!ServiceConstants.ORDER_PAY_STATUS_NON_PAYMENT.equals(etOrder1.getPaid())){ throw new ServiceException("订单已支付，不能改价"); } + if("1".equals(etOrder1.getLocking())){ + throw new ServiceException("用户正在支付中，请勿操作"); + } if(!ServiceConstants.ORDER_STATUS_RIDING_END.equals(etOrder1.getStatus()) && !ServiceConstants.ORDER_STATUS_CANCEL_APPOINTMENT.equals(etOrder1.getStatus())){ throw new ServiceException("改价失败，订单未结束，订单状态："+etOrder1.getStatus()); } @@ -937,6 +940,20 @@ public class AppVerifyController extends BaseController return toAjax(etOrderService.updateEtOrderByOrderNo(etOrder)); } + /** + * 取消锁单 + */ + @Log(title = "取消锁单", businessType = BusinessType.UNLOCKORDER) + @PostMapping("/order/unlockOrder") + public AjaxResult unlockOrder(String orderNo) + { + logger.info("【取消锁单】：{}", orderNo); + EtOrder etOrder = new EtOrder(); + etOrder.setLocking("0"); + etOrder.setOrderNo(orderNo); + return toAjax(etOrderService.updateEtOrderByOrderNo(etOrder)); + } + /** * 还车审核通过 * 改状态，退押金 diff --git a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 755bbc1..32ffa8b 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -159,6 +159,10 @@ public enum BusinessType * 保存视频 */ VIDEO, + /** + * 取消锁单 + */ + UNLOCKORDER, /** * 重启设备 */ 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 b9411f5..a80151f 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 @@ -263,4 +263,8 @@ public class EtOrder extends BaseEntity /** 换车原因：1-电量过低，2-车辆故障 */ @Excel(name = "换车原因：1-电量过低，2-车辆故障") private String changeReason; + + /** 锁单中: 0-否；1-是 */ + @Excel(name = "锁单中: 0-否；1-是") + private String locking; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java index 2eb7d23..6aa3f0f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java +++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java @@ -94,6 +94,15 @@ public interface EtOrderMapper */ public List isInOrder(@Param("userId") Long userId,@Param("orderNo") String orderNo); + /** + * 查询当前用户是否有正在进行中的审核订单 + * + * @param userId 用户id + * @param orderNo 排除当前订单号 + * @return 结果 + */ + public List isInAuditOrder(@Param("userId") Long userId,@Param("orderNo") String orderNo); + /** * 查询当前车辆是否有正在进行中的订单 * diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java index 8094667..38d6b77 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java @@ -115,6 +115,11 @@ public interface IEtOrderService */ List isInOrder(Long userId,String orderNo); + /** + * 查询当前用户是否有正在审核中的订单 + */ + List isInAuditOrder(Long userId,String orderNo); + /** * 查询当前车辆是否有正在进行中的订单 */ 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 c1aa453..27ac134 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 @@ -1318,8 +1318,14 @@ public class AsDeviceServiceImpl extends ServiceImpl i /** 2.发送命令*/ sendCommand(asDevice.getMac(), Token.getToken(),IotConstants.COMMAND_CLOSE+IotConstants.COMMAND_FREQUENCY_3600,"管理员锁车",null,userName); asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); - if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + // 判断该sn是否有正在骑行中的订单，如果有骑行中的订单则修改为临时锁车 + EtOrder etOrder = etOrderService.getCurrentOrder(asDevice.getSn()); + if(ObjectUtil.isNotNull(etOrder)){ + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK); + }else{ + if(!asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + } } asDevice.setIsAdminUnlocking("0"); int device = asDeviceMapper.updateAsDevice(asDevice); @@ -1591,13 +1597,15 @@ public class AsDeviceServiceImpl extends ServiceImpl i } } } - /** 4. 更新车辆状态*/ - device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); - device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); - int deviceUpdate = asDeviceMapper.updateAsDevice(device); - if(deviceUpdate==0){ - log.info("【还车关锁】更新车辆状态失败"); - throw new ServiceException("【还车关锁】更新车辆状态失败"); + if(ObjectUtil.isNotNull(device)){ + /** 4. 更新车辆状态*/ + device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); + int deviceUpdate = asDeviceMapper.updateAsDevice(device); + if(deviceUpdate==0){ + log.info("【还车关锁】更新车辆状态失败"); + throw new ServiceException("【还车关锁】更新车辆状态失败"); + } } /** 3. 计算订单费用，保存订单总金额*/ order = calculateOrderFee(order,isInParkingArea); 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 a9876eb..c799abb 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 @@ -194,6 +194,7 @@ public class CallbackServiceImpl implements CallbackService { order.setPaid("1"); order.setPayTime(DateUtils.getNowDate()); order.setPayType(ServiceConstants.PAY_TYPE_WX); + order.setLocking("0"); if(attachVo.getType().equals(ServiceConstants.BUSINESS_TYPE_RIDING)){ logger.info("【微信支付回调】骑行支付"); // 1-骑行支付 关锁 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 7dafaf2..e7e884b 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 @@ -1546,6 +1546,15 @@ public class EtOrderServiceImpl implements IEtOrderService } return inOrder; } + + /** + * 查询当前用户是否有正在进行中的订单 + */ + @Override + public List isInAuditOrder(Long userId,String orderNo) { + List inOrder = etOrderMapper.isInAuditOrder(userId, orderNo); + return inOrder; + } /** * 查询当前车辆是否有正在进行中的订单 */ @@ -1570,53 +1579,54 @@ public class EtOrderServiceImpl implements IEtOrderService throw new ServiceException("该订单状态非骑行中"); } String sn = order.getSn(); - if(StrUtil.isBlank(sn))throw new ServiceException("sn不能为空"); - AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); - /** 2.发送命令*/ - if(!"true".equals(isBluetooth)){ - ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "换车关锁",orderNo); - if(responseVo.getCode()!=0){ - log.info("【还车关锁】远程关锁失败"); - throw new ServiceException("远程关锁失败"); - } - }else{ - asDevice.setLongitude(lon); - asDevice.setLatitude(lat); - if(StrUtil.isNotBlank(voltage)){ - BigDecimal divide = new BigDecimal(voltage).divide(new BigDecimal(10)); - asDevice.setVoltage(divide.toString()); - EtModel model = etModelService.selectEtModelByModelId(asDevice.getModelId()); - Integer remainingMileage = 0; - if(StrUtil.isNotBlank(asDevice.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + if(StrUtil.isNotBlank(sn)){ + AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); + /** 2.发送命令*/ + if(!"true".equals(isBluetooth)){ + ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "换车关锁",orderNo); + if(responseVo.getCode()!=0){ + log.info("【还车关锁】远程关锁失败"); + throw new ServiceException("远程关锁失败"); } - Integer electricQuantity = CommonUtil.getElectricQuantity(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 - asDevice.setRemainingMileage(remainingMileage); - asDevice.setRemainingPower(electricQuantity.toString()); + }else{ + asDevice.setLongitude(lon); + asDevice.setLatitude(lat); + if(StrUtil.isNotBlank(voltage)){ + BigDecimal divide = new BigDecimal(voltage).divide(new BigDecimal(10)); + asDevice.setVoltage(divide.toString()); + EtModel model = etModelService.selectEtModelByModelId(asDevice.getModelId()); + Integer remainingMileage = 0; + if(StrUtil.isNotBlank(asDevice.getVoltage())){ + remainingMileage = CommonUtil.getRemainingMileage(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + } + Integer electricQuantity = CommonUtil.getElectricQuantity(asDevice.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + asDevice.setRemainingMileage(remainingMileage); + asDevice.setRemainingPower(electricQuantity.toString()); + } + asDevice.setLastTime(DateUtils.getNowDate()); + } + asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setIsAdminUnlocking("0"); + int device = asDeviceMapper.updateAsDevice(asDevice); + if(device==0){ + log.info("【临时解锁】改变车辆状态失败"); + throw new ServiceException("【临时锁车】改变车辆状态失败"); + } + String usedSn = order.getUsedSn(); + if(StrUtil.isNotBlank(usedSn)){ + usedSn = usedSn+","+sn; + }else{ + usedSn = sn; + } + order.setUsedSn(usedSn); + order.setSn(""); + order.setChangeReason(changeReason); + int i = etOrderMapper.updateEtOrderByOrderNo(order); + if(i==0){ + log.info("【换车关锁】改变订单使用过的sn失败"); + throw new ServiceException("【换车关锁】改变订单使用过的sn失败"); } - asDevice.setLastTime(DateUtils.getNowDate()); - } - asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); - asDevice.setIsAdminUnlocking("0"); - int device = asDeviceMapper.updateAsDevice(asDevice); - if(device==0){ - log.info("【临时解锁】改变车辆状态失败"); - throw new ServiceException("【临时锁车】改变车辆状态失败"); - } - String usedSn = order.getUsedSn(); - if(StrUtil.isNotBlank(usedSn)){ - usedSn = usedSn+","+sn; - }else{ - usedSn = sn; - } - order.setUsedSn(usedSn); - order.setSn(""); - order.setChangeReason(changeReason); - int i = etOrderMapper.updateEtOrderByOrderNo(order); - if(i==0){ - log.info("【换车关锁】改变订单使用过的sn失败"); - throw new ServiceException("【换车关锁】改变订单使用过的sn失败"); } return Boolean.TRUE; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java index d9fd3ee..2ae5e09 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java @@ -108,6 +108,7 @@ public class WxPayService implements IWxPayService { request.setAmount(getAmount(order.getPayFee())); String outTradeNo = IdUtils.getOrderNo("wx"); order.setOutTradeNo(outTradeNo); + order.setLocking("1"); int updateEtOrder = etOrderService.updateEtOrder(order); if(updateEtOrder == 0){ throw new ServiceException("更新订单outTradeNo失败"); diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml index 4175763..7ad6bd6 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml @@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_mac, sn, pay_time, paid, pay_type, type, total_fee, pay_fee, dispatch_fee, manage_fee, riding_fee, appointment_fee, mark, duration, distance, status, create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time, - rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,used_sn,change_reason from et_order + rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,used_sn,change_reason,locking from et_order + +