司机上报优化

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectLineReportController.java

@@ -30,6 +30,7 @@ public class CarrierDriverCollectLineReportController {
         IPage<CollectLineReportVO> page = collectLineReportService.carrierPageSendAddressReport(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
     @ApiOperation(value = "货源地上报审核", notes = "<br>By:艾庆国")
     @PostMapping("/updateSendAddressReportAudit")
     public Result<Void> updateSendAddressReportAudit(@RequestBody @Validated CollectLineReportSendAddressAuditParam param) {

performance-web/src/main/java/com/clx/performance/dao/impl/integral/IntegralRuleDaoImpl.java

@@ -24,6 +24,7 @@ public class IntegralRuleDaoImpl extends BaseDaoImpl<IntegralRuleMapper, Integra
                 .set(IntegralRule::getOrderDiscountRuleJson, item.getOrderDiscountRuleJson())
                 .set(IntegralRule::getOrderChildTimeoutRuleJson, item.getOrderChildTimeoutRuleJson())
                 .set(IntegralRule::getPlatformCompensationRuleJson, item.getPlatformCompensationRuleJson())
+                .set(IntegralRule::getDriverReportRuleJson, item.getDriverReportRuleJson())
         );
     }
 

performance-web/src/main/java/com/clx/performance/model/integral/IntegralRule.java

@@ -31,7 +31,7 @@ public class IntegralRule implements HasKey<Integer> {
     private String orderDiscountRuleJson;           //货单扣减积分规则
     private String orderChildTimeoutRuleJson;       //运单超时扣减规则
     private String platformCompensationRuleJson;    //平台补偿积分规则
-    private String driverRuleJson;                  //司机上报积分规则
+    private String driverReportRuleJson;            //司机上报积分规则
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间
 

performance-web/src/main/java/com/clx/performance/service/impl/integral/IntegralRuleServiceImpl.java

@@ -26,7 +26,7 @@ public class IntegralRuleServiceImpl implements IntegralRuleService {
         rule.setOrderDiscountRuleJson(JSON.toJSONString(param.getOrderDiscountRule()));
         rule.setOrderChildTimeoutRuleJson(JSON.toJSONString(param.getOrderChildTimeoutRule()));
         rule.setPlatformCompensationRuleJson(JSON.toJSONString(param.getPlatformCompensationRule()));
-        rule.setDriverRuleJson(JSON.toJSONString(param.getDriverReportRule()));
+        rule.setDriverReportRuleJson(JSON.toJSONString(param.getDriverReportRule()));
 
         integralRuleDao.update(rule);
     }
@@ -41,7 +41,7 @@ public class IntegralRuleServiceImpl implements IntegralRuleService {
         vo.setOrderChildCancelRule(JSON.parseObject(rule.getOrderDiscountRuleJson(), AppIntegralRuleVO.OrderChildCancelRule.class));
         vo.setOrderChildTimeoutRule(JSON.parseObject(rule.getOrderChildTimeoutRuleJson(), AppIntegralRuleVO.OrderChildTimeoutRule.class));
         vo.setPlatformCompensationRule(JSON.parseObject(rule.getPlatformCompensationRuleJson(), AppIntegralRuleVO.PlatformCompensationRule.class));
-        vo.setDriverReportRule(JSON.parseObject(rule.getDriverRuleJson(), AppIntegralRuleVO.DriverReportRule.class));
+        vo.setDriverReportRule(JSON.parseObject(rule.getDriverReportRuleJson(), AppIntegralRuleVO.DriverReportRule.class));
 
         return vo;
     }