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,19 +435,12 @@ 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) {
-                    if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
-                        for(OrderAccountDeduction deduction : oad.getDeductions()) {
-                            if(DeductionTypeEnum.VIOLATE_ADVANCE.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());
-                            }
-                        }
-                    }
+                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) {
@@ -455,6 +448,18 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
+    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio) {
+        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());
+            }
+        }
+    }
+
 
     /**
      * 获取每日订单账目,用于统计

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

@@ -261,18 +261,13 @@ 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());
-                    if (jsonObject != null) {
-                        if (jsonObject.getString("cost") != null) {
-                            cost += Double.parseDouble(jsonObject.getString("cost"));
-                        }
-                        if (jsonObject.getString("excessCost") != null) {
-                            cost += Double.parseDouble(jsonObject.getString("excessCost"));
-                        }
-                    }
+            JSONObject jsonObject = JSONObject.parseObject(orderVehicleCrosstownDto.getViolateDetail());
+            if (jsonObject != null) {
+                if (jsonObject.getString("cost") != null) {
+                    cost += Double.parseDouble(jsonObject.getString("cost"));
+                }
+                if (jsonObject.getString("excessCost") != null) {
+                    cost += Double.parseDouble(jsonObject.getString("excessCost"));
                 }
             }
         }