Merge branch 'v17.3_youhua_20240615' into release

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/OrderChildServiceImpl.java

@@ -2681,7 +2681,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 }else{
                     List<String> childTruckInfoList = new ArrayList<>();
                     childTruckInfoList.add(generateChildTruckInfo(child));
-                    cancelTruckMap.put(child.getChildNo(),childTruckInfoList);
+                    cancelTruckMap.put(child.getOrderGoodsNo(),childTruckInfoList);
                 }
             }
 
@@ -2764,7 +2764,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

@@ -1046,9 +1046,20 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             }
         }
         //取消货单下未接单的车辆绑定关系
-        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
-                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        if(CollectionUtils.isNotEmpty(cancelTruckBindOrderGoodsNoList)){
+            //查询定向货单下未接单的车辆
+            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;