Merge branch 'v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/enums/UserTypeEnum.java

@@ -9,7 +9,7 @@ import java.util.Optional;
 @Getter
 @AllArgsConstructor
 public enum UserTypeEnum {
-
+        SYSTEM(0, "系统"),
         OWNER(1, "货主"),
         CARRIER(2, "承运端"),
         DRIVER(3, "司机");

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralRecordEnum.java

@@ -38,6 +38,7 @@ public enum IntegralRecordEnum {
         REPORT_RECEIVE_ADDRESS_NO_WAIT(56, "上报目的地无需排队"),
         REPORT_QUALITY(57, "上报煤炭质量问题"),
         REPORT_ABNORMAL(58, "上报拉运异常问题"),
+        REPORT_SEND_ADDRESS_INFO(59, "上报货源地情况"),
         ;
 
         private Integer value;

performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralRuleVO.java

@@ -138,6 +138,8 @@ public class AppIntegralRuleVO {
         private BigDecimal reportLimit;
         @ApiModelProperty(value = "当日上报奖励积分上限x")
         private Integer integralLimit;
+        @ApiModelProperty(value = "上报货源地情况积分x")
+        private Integer integralSendAddressInfo;
     }
 
 

performance-web/src/main/java/com/clx/performance/service/child/OrderChildPostService.java

@@ -5,14 +5,15 @@ import com.clx.performance.model.OrderChild;
 public interface OrderChildPostService {
 
     void orderChildDriverConfirm(OrderChild orderChild);
-    void orderChildFinish(String childNo);
 
     void orderChildCancelByDriver(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName);
     void orderChildCancelByCarrier(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName);
+    void orderChildCancelByArtificial(String childNo);
 
     void arriveSendAddressTimeoutCancel(OrderChild orderChild);
     void orderCancel(String childNo);
     void orderGoodsCancel(String childNo);
-    void orderChildCancelByArtificial(String childNo);
+
+    void orderChildFinish(String childNo);
 
 }

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

@@ -223,7 +223,8 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
                     IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getValue(),
                     IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.getValue(),
                     IntegralRecordEnum.Type.REPORT_QUALITY.getValue(),
-                    IntegralRecordEnum.Type.REPORT_ABNORMAL.getValue()
+                    IntegralRecordEnum.Type.REPORT_ABNORMAL.getValue(),
+                    IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_INFO.getValue()
             );
             for (Map.Entry<String, List<IntegralRecord>> entry : map.entrySet()) {
                 Integer orderChildCompleteIntegral = 0;

performance-web/src/main/java/com/clx/performance/service/impl/child/OrderChildPostServiceImpl.java

 package com.clx.performance.service.impl.child;
 
+import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.UserTypeEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.IntegralMqService;
@@ -25,29 +27,21 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
 
     @Override
     public void orderChildDriverConfirm(OrderChild orderChild) {
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(orderChild.getChildNo());
+
+        orderChildFinish(orderChild.getChildNo());
 
         // 发送mq 司机确认收货
         orderChildMqService.orderChildDriverConfirm(orderChild.getChildNo());
     }
 
-    /**
-     * 运单结束
-     */
-    @Override
-    public void orderChildFinish(String childNo) {
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(childNo);
-    }
+
 
     /**
      * 司机取消
      */
     @Override
     public void orderChildCancelByDriver(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName){
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(orderChild.getChildNo());
+        orderChildFinish(orderChild.getChildNo());
 
         // 发送mq （运单取消）
         orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), opUserType, opUserNo, opUserName);
@@ -58,8 +52,7 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
      */
     @Override
     public void orderChildCancelByCarrier(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName) {
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(orderChild.getChildNo());
+        orderChildFinish(orderChild.getChildNo());
 
         // 发送mq （运单取消）
         orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), opUserType, opUserNo, opUserName);
@@ -72,27 +65,46 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
     @Override
     public void arriveSendAddressTimeoutCancel(OrderChild orderChild){
 
-        // 发送mq （运单取消）
-        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), 0L, "系统");
-
         // 保存违约记录
         breakContractDriverRecordService.saveDriverRecordOfArriveSendAddressTimeout(orderChild, 0L, "系统");
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(orderChild.getChildNo(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(), UserTypeEnum.SYSTEM.getCode(), 0L, "系统");
+
     }
 
     @Override
     public void orderCancel(String childNo) {
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(childNo);
+        orderChildFinish(childNo);
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(childNo, OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), UserTypeEnum.SYSTEM.getCode(), 0L, "系统");
+
     }
 
     @Override
     public void orderGoodsCancel(String childNo) {
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(childNo);
+        orderChildFinish(childNo);
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(childNo, OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), UserTypeEnum.SYSTEM.getCode(), 0L, "系统");
+
     }
 
     @Override
     public void orderChildCancelByArtificial(String childNo) {
+        orderChildFinish(childNo);
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(childNo, OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode(), UserTypeEnum.CARRIER.getCode(), 0L, "系统");
+
+    }
+
+    /**
+     * 运单结束
+     */
+    @Override
+    public void orderChildFinish(String childNo) {
         // 运单结束 统计积分
         integralMqService.orderChildFinish(childNo);
     }

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java

@@ -340,6 +340,13 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         CollectLineReport collectLineReport = collectLineReportDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         collectLineReport.setAuditStatus(CollectLineReport.AuditStatus.AUDIT.getCode());
         collectLineReportDao.updateAuditStatus(collectLineReport);
+
+        // 查找规则
+        AppIntegralRuleVO ruleInfo = integralRuleService.getRuleInfo();
+
+        // 报存积分
+        integralRecordService.addDriverReportRecord(ruleInfo, collectLineReport.getTruckNo(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_INFO.getValue(),
+                ruleInfo.getDriverReportRule().getIntegralSendAddressInfo(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_INFO.getMsg());
     }
 
     @Transactional(rollbackFor = Exception.class)

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTrafficCongestionServiceImpl.java

@@ -102,13 +102,6 @@ public class CollectTrafficCongestionServiceImpl implements CollectTrafficConges
         collectTrafficCongestion.setAuditStatus(CollectTrafficCongestion.AuditStatus.AUDIT.getCode());
         collectTrafficCongestionDao.updateAuditStatus(collectTrafficCongestion);
 
-        // 查找规则
-        AppIntegralRuleVO ruleInfo = integralRuleService.getRuleInfo();
-
-        // 报存积分
-        integralRecordService.addDriverReportRecord(ruleInfo, collectTrafficCongestion.getTruckNo(), IntegralRecordEnum.Type.REPORT_TRAFFIC.getValue(),
-                ruleInfo.getDriverReportRule().getIntegralTraffic(), IntegralRecordEnum.Type.REPORT_TRAFFIC.getMsg());
-
     }
 
     @Override