From a9a4a36b8a728e92e3b2dfa8dea4d84a43f64d57 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Mon, 5 Aug 2024 22:22:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/receive/ReceiveController.java | 9 ++-- .../system/EtCapitalFlowController.java | 10 +++++ .../java/com/ruoyi/system/domain/EtOrder.java | 4 ++ .../service/impl/AsDeviceServiceImpl.java | 8 ++-- .../service/impl/EtOrderServiceImpl.java | 44 ++++++++++--------- 5 files changed, 45 insertions(+), 30 deletions(-) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 63ecc6b..8a97128 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -300,12 +300,9 @@ public class ReceiveController { optimizeRoute(jsonArray, newPoint,lon,lat,etOrder); }else{ -// String isLocked = device.getIsLocked(); -// //当前无订单，并且不是管理员开锁的情况下，直接关锁 -// if(!isAdminUnlocking.equals("1") && !isLocked.equals("0") && !device.getStatus()){ -// log.info("当前无订单，并且不是管理员开锁的情况下，直接关锁--------" + logEntry.getDevName()); -// asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "无订单关锁", null, null, msg); -// } + if(ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())){ + asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "车辆锁同步关锁", null, null, msg); + } } } } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java index faafbe7..4483bdc 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtCapitalFlowController.java @@ -13,12 +13,14 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.EtCapitalFlow; import com.ruoyi.system.domain.EtWithdraw; import com.ruoyi.system.service.IEtCapitalFlowService; +import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.List; /** @@ -37,6 +39,9 @@ public class EtCapitalFlowController extends BaseController @Autowired private ISysDeptService deptService; + @Autowired + private ISysConfigService sysConfigService; + /** * 查询资金流水列表 */ @@ -117,6 +122,11 @@ public class EtCapitalFlowController extends BaseController if(ObjectUtil.isNull(deptId)){ deptId = getDeptId(); } + String minimumWithdrawalAmount = sysConfigService.selectConfigByKey("minimum.withdrawal.amount");//最低提现金额 + BigDecimal minimum = new BigDecimal(minimumWithdrawalAmount); + if(etWithdraw.getAmount().compareTo(minimum) < 0){ + throw new RuntimeException("最低提现金额不能小于"+minimum); + } SysDept sysDept = deptService.selectDeptById(deptId); String method = etWithdraw.getMethod(); if(method.equals(ServiceConstants.WITHDRAW_METHOD_WX)){ 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 b509fee..b9411f5 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 @@ -82,6 +82,10 @@ public class EtOrder extends BaseEntity @TableField(exist = false) private EtRefund etRefund; + /** 退款对象 */ + @TableField(exist = false) + private List etRefunds; + /** 设备sn编码 */ @Excel(name = "设备sn编码") private String sn; 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 c8e0297..c1aa453 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 @@ -1584,9 +1584,11 @@ public class AsDeviceServiceImpl extends ServiceImpl i device.setLastTime(DateUtils.getNowDate()); } }else{ - ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "辅助还车关锁",orderNo); - if(responseVo.getCode()!=0){ - log.info("【还车关锁】远程关锁失败"); + if(ObjectUtil.isNotNull(device)){ + ResponseVo responseVo = sendCommandWithResp(device.getMac(), token, IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "辅助还车关锁",orderNo); + if(responseVo.getCode()!=0){ + log.info("【还车关锁】远程关锁失败"); + } } } /** 4. 更新车辆状态*/ 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 80ac1f6..7dafaf2 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 @@ -143,7 +143,7 @@ public class EtOrderServiceImpl implements IEtOrderService // 退款记录 List refunds = etRefundService.selectEtRefundByOrderNo(order.getOrderNo()); if(ObjectUtils.isNotEmpty(refunds) && refunds.size() > 0){ - order.setEtRefund(refunds.get(0)); + order.setEtRefunds(refunds); } return order; } @@ -441,26 +441,28 @@ public class EtOrderServiceImpl implements IEtOrderService if(updateEtOrder1 == 0){ throw new ServiceException("押金抵扣失败，更新押金订单失败"); } - /** 退款剩余押金*/ - Refund refund = wxPayService.refund(depositOrder, "押金抵扣退款",afterDeductionFee,IdUtils.getOrderNo("ref")); - /** 2.记录退款表 创建退款对象*/ - depositOrder.setReason("押金抵扣退款"); - EtRefund refund1= createRefund(depositOrder, afterDeductionFee, null, null, null, null, refund.getOutRefundNo(),ServiceConstants.REFUND_TYPE_DEPOSIT); - int i = etRefundService.insertEtRefund(refund1); - if(i == 0){ - log.info("【押金抵扣】保存退款对象失败"); - throw new ServiceException("【押金抵扣】，保存退款对象失败"); - } - /** 更新用户余额*/ - AsUser asUser = asUserService.selectUserById(depositOrder.getUserId()); - if(asUser!=null){ - // 更新用户并更新缓存 - asUser.setBalance(BigDecimal.ZERO); - if (asUserService.updateUserProfile(asUser) > 0) - { - log.info("【押金抵扣成功】更新用户信息成功:"+ JSON.toJSON(asUser)); - }else{ - throw new ServiceException("【押金抵扣】，更新用户信息失败"); + if(afterDeductionFee.compareTo(BigDecimal.ZERO) > 0){ + /** 退款剩余押金*/ + Refund refund = wxPayService.refund(depositOrder, "押金抵扣退款",afterDeductionFee,IdUtils.getOrderNo("ref")); + /** 2.记录退款表 创建退款对象*/ + depositOrder.setReason("押金抵扣退款"); + EtRefund refund1= createRefund(depositOrder, afterDeductionFee, null, null, null, null, refund.getOutRefundNo(),ServiceConstants.REFUND_TYPE_DEPOSIT); + int i = etRefundService.insertEtRefund(refund1); + if(i == 0){ + log.info("【押金抵扣】保存退款对象失败"); + throw new ServiceException("【押金抵扣】，保存退款对象失败"); + } + /** 更新用户余额*/ + AsUser asUser = asUserService.selectUserById(depositOrder.getUserId()); + if(asUser!=null){ + // 更新用户并更新缓存 + asUser.setBalance(BigDecimal.ZERO); + if (asUserService.updateUserProfile(asUser) > 0) + { + log.info("【押金抵扣成功】更新用户信息成功:"+ JSON.toJSON(asUser)); + }else{ + throw new ServiceException("【押金抵扣】，更新用户信息失败"); + } } } return 1;