修改代码

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java

@@ -169,4 +169,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         }
     }
 
+    public void completeRecordStatus(Integer crosstownId, DepositRefundStatus depositRefundStatus) {
+        DepositRefundRecord depositRefundRecord = findByCrossIdAndStatus(crosstownId, depositRefundStatus.getCode());
+        depositRefundRecord.setIscomplete(Boolean.TRUE);
+        updateSelectiveById(depositRefundRecord);
+    }
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRefundBiz.java

@@ -28,7 +28,6 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -82,14 +81,14 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
         //未退还， 进行挂起保留违章预备金 的退还
         if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {
             Integer crosstownTypeEnum;
-            Integer depositRefundRecordStatus;
+            DepositRefundStatus depositRefundRecordStatus;
             //判断是否定损过
             if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
                 crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
-                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUND.getCode();
+                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUND;
             }else {
                 crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
-                depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL.getCode();
+                depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL;
             }
             OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
                 setOrderId(orderMQDTO.getId());
@@ -122,10 +121,10 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);
 
-            DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(crosstown.getId(), depositRefundRecordStatus);
-            depositRefundRecord.setIscomplete(Boolean.TRUE);
-            orderDepositRefundRecordBiz.updateSelectiveById(depositRefundRecord);
-
+//            DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(crosstown.getId(), depositRefundRecordStatus);
+//            depositRefundRecord.setIscomplete(Boolean.TRUE);
+//            orderDepositRefundRecordBiz.updateSelectiveById(depositRefundRecord);
+            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
             orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
         }
 //        else {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -52,6 +52,9 @@ public class RentDepositJobHandler extends IJobHandler {
     @Autowired
     OrderVehicleCrosstownBiz crosstownBiz;
 
+    @Autowired
+    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
+
     @Autowired
     OrderViolationBiz orderViolationBiz;
 
@@ -109,15 +112,21 @@ public class RentDepositJobHandler extends IJobHandler {
                                 setIsDel(SYS_FALSE);
                             }});
 
+                            String refundDesc = "退还押金：";
+                            BigDecimal refundAmont;
                             if(null != orderViolation) {
                                 //还车扣除款 剩余的 钱，再减去违章预备金
-                                BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
-                                String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
+                                refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
+                                refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
                                 refundDesc += ")";
+                            }else {
+                                refundAmont = orvd.getReturnPayResidue();
+                                refundDesc += refundAmont.toString();
+                            }
                             orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
                             orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
                         }
-                        }
 
                         //获取交车时间
 //                        List<OrderVehicleCrosstown> crosstowns = crosstownBiz.selectByExample(