Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderViolateEnum.java

@@ -7,7 +7,6 @@ import java.util.Map;
 public enum OrderViolateEnum {
     BEFORE(1, "提前"),
     AFTER(2, "延期"),
-    EXCESS(3, "消费超额金")
     ;
     /**
      * 编码

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

@@ -435,11 +435,22 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad) {
         try{
             if(null != crosstown.getViolateDetail()) {
-                List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(crosstown.getViolateDetail()), DedDetailDTO.class);
-                for(DedDetailDTO vio : dddList) {
+                DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
+
                 if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio);
+                }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio);
+                }
+            }
+        }catch (Exception e) {
+            log.error("crosstown.getViolateDetail() crosstown id :"+crosstown.getId() +" 转换失败");
+        }
+    }
+
+    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio) {
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
-                            if(DeductionTypeEnum.VIOLATE_ADVANCE.getCode().equals(deduction.getType())) {
+            if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
                 BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
                 //修改归还押金金额
@@ -448,12 +459,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }
         }
     }
-                }
-            }
-        }catch (Exception e) {
-            log.error("crosstown.getViolateDetail() crosstown id :"+crosstown.getId() +" 转换失败");
-        }
-    }
 
 
     /**

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

@@ -261,10 +261,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
-            JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getViolateDetail());
-            if(jsonArray != null && jsonArray.size() > 0) {
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+            JSONObject jsonObject = JSONObject.parseObject(orderVehicleCrosstownDto.getViolateDetail());
             if (jsonObject != null) {
                 if (jsonObject.getString("cost") != null) {
                     cost += Double.parseDouble(jsonObject.getString("cost"));
@@ -274,8 +271,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
             }
         }
-            }
-        }
         orderVehicleCrosstownDto.setUserLicenseImg(orderVehicleCrosstownDto.getLicenseImg());
        //扣除费用,每次都是重新计算
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);