修改代码

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

@@ -371,7 +371,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //剩余押金 = 押金 - 违章保证金 - 定损金额
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
-            handleCrosstownDetail(crosstown, oad);
+            handleCrosstownDetail(crosstown, oad, csv);
 
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
@@ -437,15 +437,15 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         return refundDesc;
     }
 
-    private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad) {
+    private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad, CancelStartedVO csv) {
         try{
             if(null != crosstown.getViolateDetail()) {
                 DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
 
                 if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio);
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
                 }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio);
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
                 }
             }
         }catch (Exception e) {
@@ -453,7 +453,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio) {
+    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
             if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
@@ -461,6 +461,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 //修改归还押金金额
                 oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
                 deduction.setAmount(vio.getCost());
+
+                //设置订单明细参数
+                csv.setViolateAmount(deduction.getAmount());
+                csv.setViolateDesc(deduction.getName());
             }
         }
     }