修改BUG

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

@@ -208,7 +208,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                 }
                 log.info("取消运单ID集合：{}", ids);
                 if (CollectionUtil.isNotEmpty(ids)) {
-                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), ids);
+                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消", ids);
                 }
 
                 RollbackOrderWeightParam param = new RollbackOrderWeightParam();

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

@@ -103,7 +103,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> selectArriveSendOrderChildGe(String orderGoodsNo);
 
 
-    void batchUpdateOrderChildStatus(Integer status, List<Integer> ids);
+    void batchUpdateOrderChildStatus(Integer status, String remark, List<Integer> ids);
 
     List<OrderChild> selectOrderChildListByOrderGoodsNoAndStatusGE(String orderGoodsNo, Integer status);
 

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

@@ -312,8 +312,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public void batchUpdateOrderChildStatus(Integer status, List<Integer> ids) {
-        baseMapper.updateOrderGoodsSetResidueWeight(status, ids);
+    public void batchUpdateOrderChildStatus(Integer status, String remark, List<Integer> ids) {
+        baseMapper.updateOrderGoodsSetResidueWeight(status,remark, ids);
     }
 
     @Override

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -47,5 +47,5 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     int countValidByOrderGoodsNo(String orderGoodsNo);
 
     @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateOrderChildStatus")
-    Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "ids") List<Integer> ids);
+    Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "remark") String remark, @Param(value = "ids") List<Integer> ids);
 }
\ No newline at end of file

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

@@ -121,7 +121,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             if (CollectionUtil.isNotEmpty(ids)) {
                 orderChildDao.batchUpdateOrderChildStatus(
-                        OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+                        OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
                         ids);
             }
 
@@ -192,19 +192,19 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         if (!TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode().equals(orderInfoFeignVO.getTruckDemand())) {
             if (OrderEnum.Status.COMPLETED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
                 //已完结
-                List<Integer> ids = new LinkedList<>();
+//                List<Integer> ids = new LinkedList<>();
                 List<OrderChild> orderChildrenList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-                for (OrderChild orderChild : orderChildrenList) {
-                    //释放车辆
-                    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);
-                }
+//                for (OrderChild orderChild : orderChildrenList) {
+//                    //释放车辆
+//                    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<OrderGoods>> orderGoodsMap = orderGoodsList.stream()
@@ -269,18 +269,18 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (OrderEnum.Status.COMPLETED.getCode().equals(orderInfoFeignVO.getOrderStatus())) {
                 //已完结
                 List<OrderChild> orderChildrenList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-                List<Integer> ids = new LinkedList<>();
-                for (OrderChild orderChild : orderChildrenList) {
-                    //释放车辆
-                    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);
-                }
+//                List<Integer> ids = new LinkedList<>();
+//                for (OrderChild orderChild : orderChildrenList) {
+//                    //释放车辆
+//                    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<OrderGoods>> orderGoodsMap = orderGoodsList.stream()
@@ -416,7 +416,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
                 if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(
-                            OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+                            OrderChildEnum.Status.OWNER_CANCEL.getCode(), "货主取消",
                             ids);
                     orderChildMap = orderChildren.stream()
                             .collect(Collectors.groupingBy(OrderChild::getOrderGoodsNo));
@@ -553,7 +553,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
                 if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(
-                            OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+                            OrderChildEnum.Status.OWNER_CANCEL.getCode(), "平台取消",
                             ids);
                 }
 

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

@@ -1346,6 +1346,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             return;
         }
 
+
         Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
 
         orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, status);

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

@@ -125,6 +125,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
     @Override
     public void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus) {
+        OrderGoodsVO entity = orderGoodsDao.findOrderGoodsById(id);
+        if (entity.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
+            || entity.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+        ) {
+
+        }
+
         orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
     }
 
@@ -451,7 +458,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                         sum = sum.add(orderChild.getWeight());
                     }
                     orderChildDao.batchUpdateOrderChildStatus(
-                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),
+                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
                             ids);
                 }
 
@@ -491,7 +498,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                         sum = sum.add(orderChild.getWeight());
                     }
                     orderChildDao.batchUpdateOrderChildStatus(
-                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),
+                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),"系统取消",
                             ids);
                 }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -126,10 +126,10 @@ public class OrderChildSqlProvider {
     }
 
 
-    public String batchUpdateOrderChildStatus(@Param(value ="status") Integer status, @Param(value = "ids") List<Integer> ids ){
+    public String batchUpdateOrderChildStatus(@Param(value ="status") Integer status, @Param(value ="remark") String remark,@Param(value = "ids") List<Integer> ids ){
         StringBuffer sqlList = new StringBuffer();
 
-        sqlList.append("update order_child set status = " + status + " where id in (");
+        sqlList.append("update order_child set cancel_remark = "+ remark +" status = " + status + " where id in (");
         for (int i = 0; i < ids.size(); i++) {
             Integer id = ids.get(i);