Merge branch 'feature-delay-add' into dev

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

@@ -597,12 +597,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         try{
             if(null != crosstown.getDelayVehicleDetail()) {
                 //修改代码
-                List<DedDetailDTO> vios = JSONUtil.toList(JSONUtil.parseArray(crosstown.getViolateDetail()), DedDetailDTO.class);
-                //DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
+                List<DedDetailDTO> vios = JSONUtil.toList(JSONUtil.parseArray(crosstown.getDelayVehicleDetail()), DedDetailDTO.class);
 
                 for(DedDetailDTO vio : vios) {
                     if(OrderViolateEnum.DELAY_VEHICLE.getCode().equals(vio.getType())) {
-                        handleViolateDetail(DeductionTypeEnum.OTHER_DELAY_SAFE, oad, vio, csv);
+                        handleDelayDetail(DeductionTypeEnum.OTHER_DELAY_SAFE, oad, vio, csv);
                     }
                 }
             }
@@ -642,6 +641,37 @@ 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());
+        }
+    }
+
 
     /**
      * 获取每日订单账目,用于统计