违规规则

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRuleVO.java

@@ -66,8 +66,10 @@ public class BreakContractOwnerRuleVO {
     @ToString
     @NoArgsConstructor
     public static class OrderAmountReduceRule {
-        @ApiModelProperty(value = "总运费*X%", example = "1.23")
-        private BigDecimal ratio;
+        @ApiModelProperty(value = "挂单前：总运费*X%", example = "1.23")
+        private BigDecimal beforeRatio;
+        @ApiModelProperty(value = "挂单后：总运费*X%", example = "1.23")
+        private BigDecimal afterRatio;
     }
 
     @Getter

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractOwnerRuleController.java

@@ -45,6 +45,7 @@ public class CarrierBreakContractOwnerRuleController {
         if (StringUtils.isBlank(param.getRule().get("A-b"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
         if (StringUtils.isBlank(param.getRule().get("A-c"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
         if (StringUtils.isBlank(param.getRule().get("A-d"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-e"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
 
         breakContractOwnerRuleService.saveRule(param);
 

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRuleServiceImpl.java

@@ -55,10 +55,11 @@ public class BreakContractOwnerRuleServiceImpl  implements BreakContractOwnerRul
         autoRule.setOrderCancelRule(new BreakContractOwnerRuleVO.OrderCancelRule());
         autoRule.setOrderAmountReduceRule(new BreakContractOwnerRuleVO.OrderAmountReduceRule());
 
-        autoRule.getOrderAmountReduceRule().setRatio(new BigDecimal(param.getRule().get("A-a")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-b")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setAfterRatio(new BigDecimal(param.getRule().get("A-c")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setAfterFigurePerHour(new BigDecimal(param.getRule().get("A-d")).movePointLeft(2));
+        autoRule.getOrderAmountReduceRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-a")).movePointLeft(2));
+        autoRule.getOrderAmountReduceRule().setAfterRatio(new BigDecimal(param.getRule().get("A-b")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-c")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setAfterRatio(new BigDecimal(param.getRule().get("A-d")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setAfterFigurePerHour(new BigDecimal(param.getRule().get("A-e")).movePointLeft(2));
         rule.setAutoRuleJson(JSON.toJSONString(autoRule));
 
         breakContractOwnerRuleDao.saveEntity(rule);

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java

@@ -347,7 +347,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         String autoRuleJson = ownerRule.getAutoRuleJson();//系统自动违规
         BreakContractOwnerRuleVO.AutoRule autoRule = JSONObject.parseObject(autoRuleJson, BreakContractOwnerRuleVO.AutoRule.class);
         BreakContractOwnerRuleVO.OrderAmountReduceRule reduceRule = autoRule.getOrderAmountReduceRule();//订单吨数减少规则
-        BigDecimal ratio = reduceRule.getRatio();//比例
+        BigDecimal ratio = reduceRule.getBeforeRatio();//比例
 
         //组装参数 生成违约记录 违约计费  违约结算单
         BreakContractOwnerRecordAddParam ownerRecordAddParam = new BreakContractOwnerRecordAddParam();