修改BUG

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

@@ -110,10 +110,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     ids);
 
         } else {
-            orderChildrenList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
+            List<OrderChild> arriveSendChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
 
             List<Integer> ids = new LinkedList<>();
-            for (OrderChild orderChild : orderChildrenList) {
+            for (OrderChild orderChild : arriveSendChildList) {
                 //释放车辆
                 driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                 ids.add(orderChild.getId());
@@ -412,11 +412,6 @@ 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)) {

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

@@ -405,6 +405,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         List<OrderChild> orderChildList = null;
         BigDecimal residueWeight = null;
         BigDecimal sum = BigDecimal.ZERO;
+        List<Integer> ids = new LinkedList<>();
+
         RollbackOrderWeightParam param = new RollbackOrderWeightParam();
         Integer cancelOperateType = goodsCancelParam.getCancelOperateType();
         switch (cancelOperateType) {
@@ -443,8 +445,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             case 2:
                 orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.ARRIVE_SEND.getCode());
                 if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    sum = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    for (OrderChild orderChild : orderChildList) {
+                        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                        ids.add(orderChild.getId());
+                        sum = sum.add(orderChild.getWeight());
                     }
+                    orderChildDao.batchUpdateOrderChildStatus(
+                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),
+                            ids);
+                }
+
                 residueWeight = orderGoods.getResidueTransportWeight().add(sum);
                 param.setResidueWeight(residueWeight);
                 param.setOrderNo(orderGoods.getOrderNo());
@@ -462,10 +472,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 }
 
                 orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-                if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), orderChildList.stream().map(OrderChild::getId).collect(Collectors.toList()));
 
-                }
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     OrderGoods update = new OrderGoods();
@@ -478,8 +485,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             case 3:
                 orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.LOAD.getCode(), goodsCancelParam.getTruckList());
                 if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    sum = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    for (OrderChild orderChild : orderChildList) {
+                        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                        ids.add(orderChild.getId());
+                        sum = sum.add(orderChild.getWeight());
+                    }
+                    orderChildDao.batchUpdateOrderChildStatus(
+                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),
+                            ids);
                 }
+
                 residueWeight = orderGoods.getResidueTransportWeight().add(sum);
                 param.setResidueWeight(residueWeight);
                 param.setOrderNo(orderGoods.getOrderNo());
@@ -496,15 +511,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     }
                 }
                 orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
-                if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    List<Integer> ids = new LinkedList<>();
-                    for (OrderChild orderChild : orderChildList) {
-                        ids.add(orderChild.getId());
-                        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 
-                    }
-                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), ids);
-                }
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(residueWeight, sum, OrderGoodsStatusEnum.Status.CANCEL.getCode(), orderGoods.getId());
@@ -521,6 +528,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
         orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
+        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
 
         orderFeign.orderCancelReason(orderCancelReasonParam);
 

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

@@ -36,7 +36,7 @@ public class OrderGoodsSqlProvider {
                     " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
                     " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
-                    "a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time");
+                    "a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,a.vehicle_usage");
             FROM("order_goods a");
 
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {