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

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

@@ -1050,19 +1050,18 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         }
         //取消货单下未接单的车辆绑定关系
         if(CollectionUtils.isNotEmpty(cancelTruckBindOrderGoodsNoList)){
-            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
-                    OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-
             //查询定向货单下未接单的车辆
             List<OrderGoodsTruckBind> notOrderBindTruckList = orderGoodsTruckBindDao.
                     queryNotOrderTruck(cancelTruckBindOrderGoodsNoList);
-
             //删除缓存中未接单的车辆绑定
             if(CollectionUtils.isNotEmpty(notOrderBindTruckList)){
                 for (OrderGoodsTruckBind bind : notOrderBindTruckList) {
                     goodsOrderTruckRecordComponent.deleteTruckRecord(bind.getOrderGoodsNo(), bind.getTruckNo());
                 }
             }
+
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
+                    OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
         }
         orderGoodsLogService.saveBatchLog(orderGoodsLogs);
         return totalCancelWeight;