Merge branch 'v6.4_transportation_20231110' into release

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

@@ -96,7 +96,7 @@ public class OrderChildDtsListener  {
             Result<?> result = client.encryptPost(JSON.toJSONString(after),after.topic());
             log.info("运单信息同步，运单编号:{},响应结果:{}",after.getChildNo(),JSON.toJSONString(result));
             //当运单状态为到达目的地之后的状态时候，需要判断最后一车的逻辑
-            if(after.getStatus() >= OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()  && after.getStatus() >= OrderChildEnum.Status.COMPLETE.getCode()){
+            if(after.getStatus() >= OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()  && after.getStatus() <= OrderChildEnum.Status.COMPLETE.getCode()){
                 OrderChild child = lastTruckService.getLastTruckChild(after.getOrderNo());
                 if(Objects.nonNull(child)){
                     OrderChildMessage message = orderChildStruct.convertMessage(child);

performance-web/src/main/java/com/clx/performance/listener/child/OrderChildDriverConfirmListener.java

@@ -25,7 +25,7 @@ public class OrderChildDriverConfirmListener {
     @Autowired
     private OrderChildMqHandlerService orderChildMqHandlerService;
 
-    @RabbitListener(queues = RabbitKeyOrderChildConstants.ORDER_CHILD_ADD_QUEUE)
+    @RabbitListener(queues = RabbitKeyOrderChildConstants.ORDER_CHILD_DRIVER_CONFIRM_QUEUE)
     public void process(Message message) {
         try{
             log.info("运单-司机确认收货, message:{}", new String(message.getBody()));

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

@@ -417,8 +417,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     }
                 }
             }
-            orderGoodsTruckBindDao.saveBatchEntity(param.getOrderNo(), orderGoodsNo, truckList, now);
-            goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, truckList);
+            if (CollectionUtils.isNotEmpty(truckList)) {
+                orderGoodsTruckBindDao.saveBatchEntity(param.getOrderNo(), orderGoodsNo, truckList, now);
+                goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, truckList);
+            }
+
         }
 
         orderGoodsStatusLazyComponent.deleteRedisRecordForLastOrderTime(orderGoodsNo);