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

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

@@ -1031,6 +1031,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         List<OrderGoodsLog> orderGoodsLogs = new ArrayList<>();
         OrderGoodsLog orderGoodsLog = null;
         BigDecimal totalCancelWeight = BigDecimal.ZERO;
+        List<String> cancelTruckBindOrderGoodsNoList = new ArrayList<>();
+
         for(OrderGoods orderGoods:orderGoodsUpdateList){
             orderGoodsLog = new OrderGoodsLog();
             orderGoodsLog.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
@@ -1041,7 +1043,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             orderGoodsLogs.add(orderGoodsLog);
             totalCancelWeight = totalCancelWeight.add(Objects.nonNull(orderGoods.getResidueTransportWeight())?
                     orderGoods.getResidueTransportWeight() : BigDecimal.ZERO);
+            if(Objects.equals(orderGoods.getPendingOrderWay(),PendingOrderWayStatusEnum.Status.DX.getCode())
+                    || Objects.equals(orderGoods.getPendingOrderWay(),PendingOrderWayStatusEnum.Status.FLEET_DX.getCode())){
+                cancelTruckBindOrderGoodsNoList.add(orderGoods.getOrderGoodsNo());
+            }
         }
+        //取消货单下未接单的车辆绑定关系
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
+                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+
         orderGoodsLogService.saveBatchLog(orderGoodsLogs);
         return totalCancelWeight;