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

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsTruckBindDao.java

@@ -68,4 +68,5 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void batchUpdateBindTruckList(String orderGoodsNo, Integer code, List<String> truckNo);
 
+    List<OrderGoodsTruckBind> queryNotOrderTruck(List<String> cancelTruckBindOrderGoodsNoList);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsTruckBindDaoImpl.java

@@ -224,4 +224,11 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .in(OrderGoodsTruckBind::getTruckNo, truckNoList)
         );
     }
+
+
+    @Override
+    public List<OrderGoodsTruckBind> queryNotOrderTruck(List<String> cancelTruckBindOrderGoodsNoList) {
+        return baseMapper.selectList(lQrWrapper().in(OrderGoodsTruckBind::getOrderGoodsNo, cancelTruckBindOrderGoodsNoList)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode()));
+    }
 }

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

@@ -1052,6 +1052,17 @@ 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());
+                }
+            }
         }
         orderGoodsLogService.saveBatchLog(orderGoodsLogs);
         return totalCancelWeight;