修改BUG

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -13,6 +13,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
@@ -37,7 +38,7 @@ public class OrderCancelComponent {
 
     private final OrderGoodsDao orderGoodsDao;
 
-    private final OrderChildService orderChildService;
+    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
 
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
@@ -62,7 +63,7 @@ public class OrderCancelComponent {
                     List<Integer> ids = new LinkedList<>();
                     for (OrderGoods orderGoods : orderGoodsList) {
                         if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                            orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                            orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                         }
                         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 
@@ -87,7 +88,7 @@ public class OrderCancelComponent {
                         update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
                     }
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
                     goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 
@@ -140,7 +141,7 @@ public class OrderCancelComponent {
                         }
                     }
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
                     goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -78,5 +78,4 @@ public interface OrderChildService {
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
-    void updateCancelTruckBind(String orderGoodsNo);
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsTruckBindService.java

@@ -9,4 +9,6 @@ public interface OrderGoodsTruckBindService {
     List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
 
     List<OrderGoodsAPPVO> getCancelOrderGoods(Long userNo);
+
+    void updateCancelTruckBind(String orderGoodsNo);
 }

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

@@ -20,7 +20,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.OrderCancelService;
-import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.exception.ServiceSystemException;
@@ -62,7 +62,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
 
-    private final OrderChildService orderChildService;
+    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
 
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
@@ -99,7 +99,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             List<Integer> ids = new LinkedList<>();
             for (OrderGoods orderGoods : orderGoodsList) {
                 if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                    orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                    orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                 }
                 goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 
@@ -157,7 +157,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
 
                 if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                    orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                    orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                 }
                 goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 
@@ -360,7 +360,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     List<Integer> ids = new LinkedList<>();
                     for (OrderGoods orderGoods : orderGoodsList) {
                         if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                            orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                            orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                         }
                         ids.add(orderGoods.getId());
                         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
@@ -384,7 +384,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                         update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
                     }
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                         goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
                     }
                     goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
@@ -432,7 +432,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     }
 
                     if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
-                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        orderGoodsTruckBindService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
                     }
                     goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 

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

@@ -1879,23 +1879,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildDao.selectInTransitOrderChild(orderNo);
     }
 
-    @Override
-    public void updateCancelTruckBind(String orderGoodsNo) {
-            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());
-//                }
-//            }
-
-    }
 
     /**
      * @return

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

 package com.clx.performance.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.service.OrderGoodsTruckBindService;
@@ -15,6 +18,7 @@ import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +38,8 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
 
     private final TruckFeign truckFeign;
 
+    private final OrderChildDao orderChildDao;
+
     @Override
     public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
         return orderGoodsTruckBindDao.getTrucksByOrderGoodsNo(orderGoodsNo);
@@ -60,4 +66,21 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
     }
 
 
+    @Override
+    public void updateCancelTruckBind(String orderGoodsNo) {
+        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());
+//                }
+//            }
+
+    }
 }