Merge remote-tracking branch 'origin/v17.3_youhua_20240615' into test

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

@@ -2777,7 +2777,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             entry.getValue().forEach(item-> {
                 Integer truckId = Integer.parseInt(item.split("_")[1]);
                 Long driverUserNo = Long.parseLong(item.split("_")[2]);
-                updateDriverOrderStatusUnload(driverUserNo,truckId);
+                updateDriverOrderStatusCancel(driverUserNo,truckId);
             });
         }
     }

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

@@ -1049,9 +1049,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             }
         }
         //取消货单下未接单的车辆绑定关系
-        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
-                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-
+        if(CollectionUtils.isNotEmpty(cancelTruckBindOrderGoodsNoList)){
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
+                    OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        }
         orderGoodsLogService.saveBatchLog(orderGoodsLogs);
         return totalCancelWeight;