修改Bug

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

@@ -91,9 +91,6 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .set(OrderGoodsTruckBind::getStatus, code)
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .in(OrderGoodsTruckBind::getTruckNo, truckList)
-                .or()
-                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
         );
     }
 

performance-web/src/main/java/com/clx/performance/listener/RabbitOrderGoodsStatusOnHandler.java

@@ -42,9 +42,14 @@ public class RabbitOrderGoodsStatusOnHandler {
             orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.PAYING.getCode());
 
             // 添加积分货单
+            try {
                 integralMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo(),
                         orderGoods.getSendAddressId(), orderGoods.getSendAddressShorter(),
                         orderGoods.getReceiveAddressId(), orderGoods.getReceiveAddressShorter());
+            }catch (Exception e) {
+                e.printStackTrace();
+            }
+
 
         }
     }

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

@@ -10,10 +10,8 @@ import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.TruckDemandEnum;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -60,6 +58,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final OwnerAccountService ownerAccountService;
 
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -90,9 +90,17 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (!result.succeed()) {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
+            List<Integer> ids = new LinkedList<>();
+            for (OrderGoods orderGoods : orderGoodsList) {
+                if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(),
+                                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+                }
+                ids.add(orderGoods.getId());
 
+            }
             orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
-                    orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                    ids);
 
         } else {
 
@@ -124,7 +132,18 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             //虽然没有余量，但是可以取消的运单都是未到达货源地的
                             update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
                         }
+                    }
+                }
 
+                if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                    List<OrderChild> arriveSendOrderChild = orderChildDao.selectArriveSendOrderChild(orderGoods.getOrderGoodsNo());
+                    if (CollectionUtil.isNotEmpty(arriveSendOrderChild)) {
+                        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(),
+                                OrderGoodsTruckBindEnum.Status.CANCEL.getCode(),
+                                arriveSendOrderChild.stream().map(OrderChild::getTruckNo).collect(Collectors.toList()));
+                    }else {
+                        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(),
+                                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
                     }
                 }
                 orderGoodsDao.updateEntityByKey(update);
@@ -143,14 +162,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         if (!result.succeed()) {
             throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
         }
-        //       log.info("执行货主订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
-//        OrderCancelMqParam mqParam = new OrderCancelMqParam();
-//        mqParam.setType("2");
-//        mqParam.setOrderNo(orderNo);
-//        Message message = MessageBuilder.withBody(JSONUtil.parse(mqParam).toString().getBytes()).build();
-//        rabbitTemplate.send(
-//                RabbitKeyConstants.ORDER_CANCEL_EXCHANGE, RabbitKeyConstants.ORDER_CANCEL_ROUTE_KEY, message
-//        );
 
     }
 
@@ -340,9 +351,16 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
                 if (CollectionUtil.isNotEmpty(orderGoodsList)) {
-                    orderGoodsDao.batchUpdateOrderGoodsStatus(
-                            OrderGoodsStatusEnum.Status.CANCEL.getCode(),
-                            orderGoodsList.stream().map(OrderGoods::getId).collect(Collectors.toList()));
+                    List<Integer> ids = new LinkedList<>();
+                    for (OrderGoods orderGoods : orderGoodsList) {
+                        if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                            orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(),
+                                    OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+                        }
+                        ids.add(orderGoods.getId());
+                    }
+                    orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
+                            ids);
                 }
                 Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode());
                 if (!result.succeed()) {
@@ -350,9 +368,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
                 break;
             case 2: //取消未拉运吨数的货单
-//                if (!orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode()).succeed()) {
-//                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");
-//                }
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
 
                 for (OrderGoods orderGoods : orderGoodsList) {
@@ -364,6 +379,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                         orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
                         update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
                     }
+                    if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(),
+                                OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+                    }
                     orderGoodsDao.updateEntityByKey(update);
                 }
 
@@ -375,31 +394,30 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             case 3: //取消未拉运+未到达货源地吨数
                 List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-                if (CollectionUtil.isEmpty(orderChildren)) {
-                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单已发生变化,请重新选择取消方式");
-                }
-//                if (!orderFeign.updateOrderStatusByOrderNo(orderNo, OrderEnum.Status.CANCELED.getCode()).succeed()) {
-//                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");
-//                }
-                List<Integer> ids = new LinkedList<>();
 
+                List<Integer> ids = new LinkedList<>();
                 for (OrderChild orderChild : orderChildren) {
                     //释放车辆
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
                 }
+
+                Map<String, List<OrderChild>> orderChildMap = null;
+                if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(
                             OrderChildEnum.Status.OWNER_CANCEL.getCode(),
                             ids);
+                    orderChildMap = orderChildren.stream()
+                            .collect(Collectors.groupingBy(OrderChild::getOrderGoodsNo));
+
+                }
 
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
-                Map<String, List<OrderChild>> orderChildMap = orderChildren.stream()
-                        .collect(Collectors.groupingBy(OrderChild::getOrderGoodsNo));
 
                 for (OrderGoods orderGoods : orderGoodsList) {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
-                    if (CollectionUtil.isEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
+                    if (orderChildMap != null && CollectionUtil.isEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
                         update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
                     } else {
                         BigDecimal reduce = orderChildMap.get(orderGoods.getOrderGoodsNo())
@@ -419,7 +437,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
                 break;
 
-
             default:
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");