1. 优化

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(ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())){
-//                                            //当前无订单，并且不是管理员开锁的情况下，直接关锁
+                                                asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "车辆锁同步关锁", null, null, msg);
-//                                            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);
-//                                            }
                                         }
                                     }
                                 }

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)){

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<EtRefund> etRefunds;
+
     /** 设备sn编码 */
     @Excel(name = "设备sn编码")
     private String sn;

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java

@@ -1584,11 +1584,13 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
                     device.setLastTime(DateUtils.getNowDate());
                 }
             }else{
+                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. 更新车辆状态*/
             device.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);
             device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java

@@ -143,7 +143,7 @@ public class EtOrderServiceImpl implements IEtOrderService
         // 退款记录
         List<EtRefund> refunds = etRefundService.selectEtRefundByOrderNo(order.getOrderNo());
         if(ObjectUtils.isNotEmpty(refunds) && refunds.size() > 0){
-            order.setEtRefund(refunds.get(0));
+            order.setEtRefunds(refunds);
         }
         return order;
     }
@@ -441,6 +441,7 @@ public class EtOrderServiceImpl implements IEtOrderService
         if(updateEtOrder1 == 0){
             throw new ServiceException("押金抵扣失败，更新押金订单失败");
         }
+        if(afterDeductionFee.compareTo(BigDecimal.ZERO) > 0){
             /** 退款剩余押金*/
             Refund refund = wxPayService.refund(depositOrder, "押金抵扣退款",afterDeductionFee,IdUtils.getOrderNo("ref"));
             /** 2.记录退款表  创建退款对象*/
@@ -463,6 +464,7 @@ public class EtOrderServiceImpl implements IEtOrderService
                     throw new ServiceException("【押金抵扣】，更新用户信息失败");
                 }
             }
+        }
         return 1;
     }