修改BUG

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

@@ -44,4 +44,6 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     List<OrderGoodsTruckBind>  judgeTruckIsBindDxOrder(Set<String> set);
 
     void deleteByIds(List<Integer> ids);
+
+    List<OrderGoodsTruckBind> selectCancelRecord(String orderGoodsNo, List<String> truckList);
 }

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

@@ -139,4 +139,11 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public void deleteByIds(List<Integer> ids) {
         baseMapper.deleteBatchIds(ids);
     }
+
+    @Override
+    public List<OrderGoodsTruckBind> selectCancelRecord(String orderGoodsNo, List<String> truckList) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .in(CollectionUtil.isNotEmpty(truckList), OrderGoodsTruckBind::getTruckNo, truckList)
+        );
+    }
 }

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

@@ -7,6 +7,7 @@ import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -63,6 +64,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OrderChildService orderChildService;
 
+    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+
 
 
     @Override
@@ -99,6 +102,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                     orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                 }
+                goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                 ids.add(orderGoods.getId());
             }
             orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
@@ -153,6 +158,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                     orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                 }
+                goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                 orderGoodsDao.updateEntityByKey(update);
             }
 
@@ -223,16 +230,12 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
                 //已取消
-                //List<Integer> ids = new LinkedList<>();
                 for (OrderGoods orderGoods : orderGoodsList) {
                     truckDemandMap.put(orderGoods.getTruckDemand(),
                             truckDemandMap.get(orderGoods.getTruckDemand())
                                     .add(orderGoods.getResidueTransportWeight()));
-                    //ids.add(orderGoods.getId());
                 }
-//                if (CollectionUtil.isNotEmpty(ids)) {
-//                    orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
-//                }
+
 
             }
 
@@ -304,17 +307,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
 
             } else if (OrderEnum.Status.CANCELED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
-                //已取消
-                //List<Integer> ids = new LinkedList<>();
                 for (OrderGoods orderGoods : orderGoodsList) {
                     vehicleUsageMap.put(orderGoods.getVehicleUsage(),
                             vehicleUsageMap.get(orderGoods.getVehicleUsage())
                                     .add(orderGoods.getResidueTransportWeight()));
-                    //ids.add(orderGoods.getId());
                 }
-//                if (CollectionUtil.isNotEmpty(ids)) {
-//                    orderGoodsDao.batchUpdateOrderGoodsWeight(BigDecimal.ZERO, ids);
-//                }
 
             }
 
@@ -367,6 +364,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                         if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                             orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                         }
+                        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                         ids.add(orderGoods.getId());
                     }
                     orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
@@ -392,6 +391,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                         orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                     orderGoodsDao.updateEntityByKey(update);
                 }
 
@@ -410,6 +411,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
                 }
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    orderChildDao.batchUpdateOrderChildStatus(
+                            OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+                            ids);
+                }
 
                 Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
                 if (CollectionUtil.isNotEmpty(ids)) {
@@ -444,6 +450,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                         orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {
@@ -506,6 +514,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                         }
                         ids.add(orderGoods.getId());
+                        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                     }
                     orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
                             ids);
@@ -526,7 +536,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     }
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                         orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
                     }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 break;
@@ -542,9 +555,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
                 }
-                orderChildDao.batchUpdateOrderChildStatus(
-                        OrderChildEnum.Status.OWNER_CANCEL.getCode(),
-                        ids);
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    orderChildDao.batchUpdateOrderChildStatus(
+                            OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+                            ids);
+                }
 
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
                 Map<String, List<OrderChild>> orderChildMap = orderChildren.stream()
@@ -570,6 +585,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
                         orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
                     orderGoodsDao.updateEntityByKey(update);
                 }
 

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

@@ -1864,12 +1864,19 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public void updateCancelTruckBind(String orderGoodsNo) {
-        List<OrderChild> arriveSendOrderChild = orderChildDao.selectArriveSendOrderChildGe(orderGoodsNo);
-        List<String> truckList = null;
-        if (CollectionUtils.isEmpty(arriveSendOrderChild)) {
-            truckList = arriveSendOrderChild.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
-        }
-        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode(), truckList);
+            List<OrderChild> arriveSendOrderChild = orderChildDao.selectArriveSendOrderChildGe(orderGoodsNo);
+            List<String> truckList = null;
+            if (CollectionUtils.isNotEmpty(arriveSendOrderChild)) {
+                truckList = arriveSendOrderChild.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
+            }
+            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode(), truckList);
+
+//            List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectCancelRecord(orderGoodsNo, truckList);
+//            if (CollectionUtils.isNotEmpty(truckBindList)) {
+//                for (OrderGoodsTruckBind bind : truckBindList) {
+//                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsNo, bind.getTruckNo());
+//                }
+//            }
 
     }