Merge branch 'feature-delay-add' into dev

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

@@ -29,6 +29,7 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
 import com.xxfc.platform.order.pojo.price.CancelStartedVO;
 import com.xxfc.platform.order.pojo.price.CostDetailExtend;
+import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -447,7 +448,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.setViolateDesc("");
                 //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
-            handleCrosstownDelayDetail(crosstown, oad, csv);
+            handleCrosstownDelayDetail(crosstown, oad);
 
             if(StrUtil.isBlank(csv.getViolateDesc())) {
                 csv.setViolateDesc(inProgressVO.getViolateDesc());
@@ -593,7 +594,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private void handleCrosstownDelayDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad, CancelStartedVO csv) {
+    private void handleCrosstownDelayDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad) {
         try{
             if(null != crosstown.getDelayVehicleDetail()) {
                 //修改代码
@@ -601,7 +602,28 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
                 for(DedDetailDTO vio : vios) {
                     if(OrderViolateEnum.DELAY_VEHICLE.getCode().equals(vio.getType())) {
-                        handleDelayDetail(DeductionTypeEnum.OTHER_DELAY_SAFE, oad, vio, csv);
+                        Boolean flag = Boolean.FALSE;
+                        for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                            if(DeductionTypeEnum.OTHER_DELAY_SAFE.getCode().equals(deduction.getType())) {
+                                deduction.setName(vio.getDeductions());
+                                BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
+                                //修改归还押金金额
+                                oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
+                                deduction.setAmount(vio.getCost());
+
+                                flag = Boolean.TRUE;
+                                break;
+                            }
+                        }
+
+                        //如果没有修改，则添加
+                        if(Boolean.FALSE.equals(flag)) {
+                            OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), DeductionTypeEnum.OTHER_DELAY_SAFE, OrderAccountDeduction.ORIGIN_DEPOSIT);
+                            oad.getDeductions().add(oadNew);
+                            //修改归还押金金额
+                            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
+
+                        }
                     }
                 }
             }
@@ -641,38 +663,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private void handleDelayDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
-        Boolean flag = Boolean.FALSE;
-        for(OrderAccountDeduction deduction : oad.getDeductions()) {
-            if(dte.getCode().equals(deduction.getType())) {
-                deduction.setName(vio.getDeductions());
-                BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
-                //修改归还押金金额
-                oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
-                deduction.setAmount(vio.getCost());
-
-//                //设置订单明细参数
-//                csv.setViolateAmount(csv.getViolateAmount().add(diff));
-//                csv.setViolateDesc(csv.getViolateDesc()+ deduction.getName());
-                flag = Boolean.TRUE;
-                break;
-            }
-        }
-
-        //如果没有修改，则添加
-        if(Boolean.FALSE.equals(flag)) {
-            OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), dte, OrderAccountDeduction.ORIGIN_DEPOSIT);
-            oad.getDeductions().add(oadNew);
-            //修改归还押金金额
-            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
-
-//            //设置订单明细参数
-//            csv.setViolateAmount(csv.getViolateAmount().add(oadNew.getAmount()));
-//            csv.setViolateDesc(csv.getViolateDesc()+ oadNew.getName());
-        }
-    }
-
-
     /**
      * 获取每日订单账目,用于统计
      * @param term