Merge branch 'v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildLoadMqParam.java

@@ -17,6 +17,7 @@ import lombok.ToString;
 @NoArgsConstructor
 public class OrderChildLoadMqParam {
 
-    private String childNo;        //运单编号
+    private String childNo;                 //运单编号
+    private Integer repeatStatus;           //重复状态：0首次 1重复
 
 }

performance-api/src/main/java/com/clx/performance/vo/mq/OrderChildUnloadMqParam.java

@@ -17,6 +17,7 @@ import lombok.ToString;
 @NoArgsConstructor
 public class OrderChildUnloadMqParam {
 
-    private String childNo;        //运单编号
+    private String childNo;                 //运单编号
+    private Integer repeatStatus;           //重复状态：0首次 1重复
 
 }

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

@@ -120,8 +120,8 @@ public class AppIntegralRuleVO {
         private Integer integralTruck;
         @ApiModelProperty(value = "油表上报积分x")
         private Integer integralRefuel;
-        @ApiModelProperty(value = "上报交通拥堵积分x")
-        private Integer integralTraffic;
+//        @ApiModelProperty(value = "上报交通拥堵积分x")
+//        private Integer integralTraffic;
         @ApiModelProperty(value = "上报货源地需要排队积分x")
         private Integer integralSendAddressWait;
         @ApiModelProperty(value = "上报货源地无需排队积分x")

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractOwnerRecordDaoImpl.java

@@ -9,7 +9,6 @@ import com.clx.performance.enums.BreakContractOwnerRecordEnum;
 import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.mapper.breakcontract.BreakContractOwnerRecordMapper;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
-import com.clx.performance.model.breakcontract.BreakContractOwnerRule;
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRecordParam;
 import com.clx.performance.param.pc.breakcontract.owner.PageOwnerBreakContractOwnerRecordParam;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRecordVO;

performance-web/src/main/java/com/clx/performance/service/OrderChildMqService.java

@@ -9,7 +9,7 @@ public interface OrderChildMqService {
     void orderChildDriverConfirm(String childNo);
 
     void orderChildLoad(String childNo);
-    void orderChildUnLoad(String childNo);
+    void orderChildUnload(String childNo);
 
     void orderChildCancel(String childNo, Integer status, Integer opUserType, Long opUserNo, String opUserName);
 

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

@@ -77,6 +77,7 @@ public class OrderChildMqServiceImpl implements OrderChildMqService {
     public void orderChildLoad(String childNo) {
         OrderChildLoadMqParam mq = new OrderChildLoadMqParam();
         mq.setChildNo(childNo);
+        mq.setRepeatStatus(0);
 
         MqDelay<MqWrapper<OrderChildLoadMqParam>> delay = new MqDelay<>(RabbitKeyOrderChildConstants.DEFAULT_EXCHANGE, RabbitKeyOrderChildConstants.ORDER_CHILD_LOAD_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
@@ -85,9 +86,10 @@ public class OrderChildMqServiceImpl implements OrderChildMqService {
     }
 
     @Override
-    public void orderChildUnLoad(String childNo) {
+    public void orderChildUnload(String childNo) {
         OrderChildUnloadMqParam mq = new OrderChildUnloadMqParam();
         mq.setChildNo(childNo);
+        mq.setRepeatStatus(0);
 
         MqDelay<MqWrapper<OrderChildUnloadMqParam>> delay = new MqDelay<>(RabbitKeyOrderChildConstants.DEFAULT_EXCHANGE, RabbitKeyOrderChildConstants.ORDER_CHILD_UNLOAD_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();

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

@@ -721,6 +721,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
+
+        // 发送mq 装车
+        orderChildMqService.orderChildLoad(orderChild.getChildNo());
     }
 
     private void updateReload(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
@@ -850,6 +853,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         //释放车辆
         goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+
+        // 发送mq 卸车
+        orderChildMqService.orderChildUnload(orderChild.getChildNo());
     }
 
     private void updateReUnload(OrderChildUnloadParam param, OrderChild orderChild) {

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

@@ -360,7 +360,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         AppIntegralRuleVO ruleInfo = integralRuleService.getRuleInfo();
         // 报存积分
         integralRecordService.addDriverReportRecord(ruleInfo, collectLineReport.getTruckNo(), IntegralRecordEnum.Type.REPORT_ABNORMAL.getValue(),
-                ruleInfo.getDriverReportRule().getIntegralQuality(), IntegralRecordEnum.Type.REPORT_ABNORMAL.getMsg());
+                ruleInfo.getDriverReportRule().getIntegralAbnormal(), IntegralRecordEnum.Type.REPORT_ABNORMAL.getMsg());
     }
 
     @Transactional(rollbackFor = Exception.class)