Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -309,11 +309,11 @@ public class OrderChildDtsListener  {
             // 装车吨数发生变化
             || Objects.equals(after.getLoadNet(),before.getLoadNet())
         ){
-            log.info("开始发送同步挂单运费表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
+            log.info("开始发送同步挂单运费表消息====运单部分,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
             Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
             rabbitTemplate.send(SYNC_PENDING_FREIGHT_FOR_ORDER_CHILD_EXCHANGE,
                     SYNC_PENDING_FREIGHT_FOR_ORDER_CHILD_ROUTING_KEY, body);
-            log.info("结束发送同步挂单运费表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
+            log.info("结束发送同步挂单运费表消息====运单部分,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
         }
     }
 

clx-performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -50,10 +50,12 @@ public class OrderGoodsDtsListener {
                 //同步after数据
                 log.info("新增:{}",JSON.toJSONString(after));
                 syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
+                syncPendingFreight(before,after,DtsOperationTypeEnum.INSERT.getCode());
                 sendSaveOrderGoodsAdjustmentPriceMessage(before,after,DtsOperationTypeEnum.INSERT.getCode());
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 log.info("修改:{}",JSON.toJSONString(after));
                 syncPerformanceProgress(before,after,DtsOperationTypeEnum.UPDATE.getCode());
+                syncPendingFreight(before,after,DtsOperationTypeEnum.UPDATE.getCode());
                 sendSaveOrderGoodsAdjustmentPriceMessage(before,after,DtsOperationTypeEnum.UPDATE.getCode());
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
@@ -103,11 +105,11 @@ public class OrderGoodsDtsListener {
             }
         }
         if(isSend){
-            log.info("开始发送同步挂单运费表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
+            log.info("开始发送同步挂单运费表消息===货单部分,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
             Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
             rabbitTemplate.send(SYNC_PENDING_FREIGHT_FOR_ORDER_GOODS_EXCHANGE,
                     SYNC_PENDING_FREIGHT_FOR_ORDER_GOODS_ROUTING_KEY, body);
-            log.info("结束发送同步挂单运费表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
+            log.info("结束发送同步挂单运费表消息===货单部分,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
         }
     }
 

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

@@ -130,7 +130,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
     @Override
     public void dealPendingFreight4OrderGoods(OrderGoods orderGoods) {
         String orderNo = orderGoods.getOrderNo();
-        //计算历史运费和历史平均运费
+        //计算接单率和装车率
         OrderedAndLoadTruckRateDTO dto = calcOrderedAndLoadTruckRate(orderNo);
         //计算线路挂单运费
         BigDecimal pendingFreight = this.queryLinePendingFreight(orderGoods.getSendAddressId(),