优化货单取消相关代码

performance-web/src/main/java/com/clx/performance/dto/OrderGoodsCancelDTO.java

+package com.clx.performance.dto;
+
+import com.clx.order.param.feign.RollbackOrderWeightParam;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.param.pc.OrderGoodsCancelParam;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class OrderGoodsCancelDTO {
+
+    private OrderGoodsCancelParam orderGoodsCancelParam;
+
+    private Integer orderGoodsStatus;
+
+    private OrderGoods orderGoods;
+
+    private List<String> childNoList;
+
+}

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

@@ -190,9 +190,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         message.getMessageProperties().setHeader("x-delay", 2000);
 
+        //执行解绑自有车辆处理逻辑，将绑定记录正常改为取消
         rabbitTemplate.send(
                 RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_EXCHANGE, RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_ROUTE_KEY, message
-        );        //开始执行订单取消吨数回填
+        );
         this.ownerConfirmCancelProcess(orderNo);
 
     }
@@ -353,10 +354,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         Message message2 = MessageBuilder.withBody(JSONUtil.parse(bindCancelParam).toString().getBytes()).build();
 
         message2.getMessageProperties().setHeader("x-delay", 2000);
-
+        //执行解绑自有车辆处理逻辑，将绑定记录正常改为取消
         rabbitTemplate.send(
                 RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_EXCHANGE, RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_ROUTE_KEY, message2
-        );        //开始执行订单取消吨数回填
+        );
     }
 
     /**

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

@@ -14,10 +14,12 @@ import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
+import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.dto.OrderGoodsCancelDTO;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
@@ -36,6 +38,7 @@ import com.clx.performance.struct.OrderGoodsStruct;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.mq.OrderTruckBindCancelParam;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
@@ -50,16 +53,18 @@ import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -69,7 +74,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-public class OrderGoodsServiceImpl implements OrderGoodsService {
+public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBean {
 
     @Autowired
     private OrderGoodsDao orderGoodsDao;
@@ -108,6 +113,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     private OrderChildLogService orderChildLogService;
     @Autowired
     private OrderChildPostService orderChildPostService;
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    private static Map<Integer, Consumer<OrderGoodsCancelDTO>> orderGoodsCancelMap = new HashMap<>();
 
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
@@ -504,23 +513,82 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     public void orderGoodsCancel(OrderGoodsCancelParam goodsCancelParam) {
         String orderGoodsNo = goodsCancelParam.getOrderGoodsNo();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).orElseThrow(PerformanceResultEnum.HTTP_ERROR, "数据错误");
-        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
-        List<OrderChild> orderChildList = null;
-        BigDecimal residueWeight = null;
-        BigDecimal sum = BigDecimal.ZERO;
         List<String> childNoList = new LinkedList<>();
+        Integer orderGoodsStatus = OrderGoodsStatusEnum.Status.CANCEL.getCode();
+
+        //封装取消策略参数
+        OrderGoodsCancelDTO build = OrderGoodsCancelDTO.builder().orderGoodsCancelParam(goodsCancelParam)
+                .orderGoodsStatus(orderGoodsStatus).orderGoods(orderGoods)
+                .childNoList(childNoList).build();
+        //根据不同取消策略调用不同方法
+        orderGoodsCancelMap.get(goodsCancelParam.getCancelOperateType()).accept(build);
+
+        OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
+        orderCancelReasonParam.setOrderNo(goodsCancelParam.getOrderNo());
+        orderCancelReasonParam.setOrderGoodsNo(goodsCancelParam.getOrderGoodsNo());
+        orderCancelReasonParam.setReason(goodsCancelParam.getCancelReason());
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
+        orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
+
+        //删除绑定记录
+        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+        //记录取消意见
+        orderFeign.orderCancelReason(orderCancelReasonParam);
+
+        if (CollectionUtil.isNotEmpty(childNoList)) {
+            for (String childNo : childNoList) {
+                // 货单取消
+                orderChildPostService.orderGoodsCancel(childNo);
+            }
+        }
+
+        OrderTruckBindCancelParam bindCancelParam = new OrderTruckBindCancelParam();
+        bindCancelParam.setOrderGoodsNo(orderGoodsNo);
+        Message message = MessageBuilder.withBody(JSONUtil.parse(bindCancelParam).toString().getBytes()).build();
+        message.getMessageProperties().setHeader("x-delay", 2000);
+        //执行解绑自有车辆处理逻辑，将绑定记录正常改为取消
+        rabbitTemplate.send(
+                RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_EXCHANGE, RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_ROUTE_KEY, message
+        );
+        orderGoodsLogService.saveLog(orderGoodsNo, loginUserInfo.getUserNo(), loginUserInfo.getUserName(), OrderGoodsLogsEnum.Type.CANCEL.getName(), "");
+
+    }
 
+    private void cancelOperateThreeTypeStrategy(OrderGoodsCancelDTO dto) {
+        String now = DateUtils.formatDateTime(LocalDateTime.now()).get();
+        BigDecimal sum = BigDecimal.ZERO;
+        OrderGoods orderGoods = dto.getOrderGoods();
+        List<String> childNoList = dto.getChildNoList();
         RollbackOrderWeightParam param = new RollbackOrderWeightParam();
-        Integer cancelOperateType = goodsCancelParam.getCancelOperateType();
-        Integer orderGoodsStatus = OrderGoodsStatusEnum.Status.CANCEL.getCode();
-        switch (cancelOperateType) {
-            case 1:
-                orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.DRIVER_CANCEL.getCode());
+
+        List<OrderChild> orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(),
+                OrderChildEnum.Status.DRIVER_CANCEL.getCode(), dto.getOrderGoodsCancelParam().getTruckList());
+
         if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单已产生运单");
+            List<OrderChild> filterOrderChildList = orderChildList.stream().
+                    filter(item -> item.getStatus() < OrderChildEnum.Status.LOAD.getCode()).collect(Collectors.toList());
+
+            for (OrderChild orderChild : filterOrderChildList) {
+                driverService.updateOrderStatus(orderChild.getDriverUserNo(),
+                        DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                childNoList.add(orderChild.getChildNo());
+                sum = sum.add(orderChild.getWeight());
+                orderChildLogService.saveOrderChildLog(orderChild.getChildNo(),
+                        OrderChildEnum.Status.OWNER_CANCEL.getCode(), OrderChildEnum.Status.OWNER_CANCEL.getName(),
+                        OrderChildLogEnum.CreateType.OWNER.getCode(), 0L, OrderChildLogEnum.CreateType.OWNER.getMsg()
+                );
+            }
+            orderChildDao.batchUpdateOrderChildStatus(
+                    OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),"系统取消",
+                    now, now, childNoList);
+            orderChildList.removeAll(filterOrderChildList);
+            if (CollectionUtil.isNotEmpty(orderChildList)) {
+                dto.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+            }
         }
 
-                residueWeight = orderGoods.getResidueTransportWeight();
+        BigDecimal residueWeight = orderGoods.getResidueTransportWeight().add(sum);
         param.setResidueWeight(residueWeight);
         param.setOrderNo(orderGoods.getOrderNo());
         if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
@@ -535,20 +603,22 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             }
         }
-                orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
 
         log.info("取消货单,参数：{}", JSONUtil.parse(param));
         if (orderFeign.rollbackOrderWeight(param).succeed()) {
-                    OrderGoods update = new OrderGoods();
-                    update.setId(orderGoods.getId());
-                    update.setResidueTransportWeight(BigDecimal.ZERO);
-                    update.setOrderGoodsStatus(orderGoodsStatus);
-                    orderGoodsDao.updateEntityByKey(update);
+            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(orderGoods.getResidueTransportWeight(),
+                    sum, dto.getOrderGoodsStatus(), orderGoods.getId());
+        }
     }
-                break;
-            case 2:
-                orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.DRIVER_CANCEL.getCode());
 
+    private void cancelOperateTwoTypeStrategy(OrderGoodsCancelDTO dto) {
+        BigDecimal sum = BigDecimal.ZERO;
+        String now = DateUtils.formatDateTime(LocalDateTime.now()).get();
+        OrderGoods orderGoods = dto.getOrderGoods();
+        RollbackOrderWeightParam param = new RollbackOrderWeightParam();
+        List<OrderChild> orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.DRIVER_CANCEL.getCode());
+        List<String> childNoList = dto.getChildNoList();
         if (CollectionUtils.isNotEmpty(orderChildList)) {
             List<OrderChild> filterOrderChildList = orderChildList.stream().filter(item -> item.getStatus() < OrderChildEnum.Status.ARRIVE_SEND.getCode()).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(filterOrderChildList)) {
@@ -563,15 +633,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 }
                 orderChildDao.batchUpdateOrderChildStatus(
                         OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), OrderChildEnum.Status.PLATFORM_CANCEL.getName(),
-                                now,now,childNoList);
+                        now, now, childNoList);
             }
             orderChildList.removeAll(filterOrderChildList);
             if (CollectionUtil.isNotEmpty(orderChildList)) {
-                        orderGoodsStatus = OrderGoodsStatusEnum.Status.COMPLETED.getCode();
+                dto.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
             }
         }
 
-                residueWeight = orderGoods.getResidueTransportWeight().add(sum);
+        BigDecimal residueWeight = orderGoods.getResidueTransportWeight().add(sum);
         param.setResidueWeight(residueWeight);
         param.setOrderNo(orderGoods.getOrderNo());
         if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
@@ -587,7 +657,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             }
         }
 
-                orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
 
         log.info("取消货单,参数：{}", JSONUtil.parse(param));
         if (orderFeign.rollbackOrderWeight(param).succeed()) {
@@ -597,32 +667,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
             orderGoodsDao.updateEntityByKey(update);
         }
-                break;
-            case 3:
-                orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.DRIVER_CANCEL.getCode(),goodsCancelParam.getTruckList());
+    }
 
+    private void cancelOperateOneTypeStrategy(OrderGoodsCancelDTO dto) {
+        RollbackOrderWeightParam param = new RollbackOrderWeightParam();
+        OrderGoods orderGoods = dto.getOrderGoods();
+        List<OrderChild> orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.DRIVER_CANCEL.getCode());
         if (CollectionUtils.isNotEmpty(orderChildList)) {
-                    List<OrderChild> filterOrderChildList = orderChildList.stream().filter(item -> item.getStatus() < OrderChildEnum.Status.LOAD.getCode()).collect(Collectors.toList());
-
-                    for (OrderChild orderChild : filterOrderChildList) {
-                        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
-                        childNoList.add(orderChild.getChildNo());
-                        sum = sum.add(orderChild.getWeight());
-                        orderChildLogService.saveOrderChildLog(orderChild.getChildNo(),
-                                OrderChildEnum.Status.OWNER_CANCEL.getCode(), OrderChildEnum.Status.OWNER_CANCEL.getName(),
-                                OrderChildLogEnum.CreateType.OWNER.getCode(), 0L, OrderChildLogEnum.CreateType.OWNER.getMsg()
-                        );
-                    }
-                    orderChildDao.batchUpdateOrderChildStatus(
-                            OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),"系统取消",
-                            now, now, childNoList);
-                    orderChildList.removeAll(filterOrderChildList);
-                    if (CollectionUtil.isNotEmpty(orderChildList)) {
-                        orderGoodsStatus = OrderGoodsStatusEnum.Status.COMPLETED.getCode();
-                    }
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单已产生运单");
         }
-
-                residueWeight = orderGoods.getResidueTransportWeight().add(sum);
+        BigDecimal residueWeight = dto.getOrderGoods().getResidueTransportWeight();
         param.setResidueWeight(residueWeight);
         param.setOrderNo(orderGoods.getOrderNo());
         if (!orderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
@@ -637,34 +691,16 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
             }
         }
-                orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoods.getOrderGoodsNo(), OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
 
         log.info("取消货单,参数：{}", JSONUtil.parse(param));
         if (orderFeign.rollbackOrderWeight(param).succeed()) {
-                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(orderGoods.getResidueTransportWeight(), sum, orderGoodsStatus, orderGoods.getId());
-                }
-                break;
-            default:
-                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数类型有误");
-
-        }
-        OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
-        orderCancelReasonParam.setOrderNo(goodsCancelParam.getOrderNo());
-        orderCancelReasonParam.setOrderGoodsNo(goodsCancelParam.getOrderGoodsNo());
-        orderCancelReasonParam.setReason(goodsCancelParam.getCancelReason());
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
-        orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
-        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
-
-        orderFeign.orderCancelReason(orderCancelReasonParam);
-
-        for (String childNo : childNoList) {
-            // 货单取消
-            orderChildPostService.orderGoodsCancel(childNo);
+            OrderGoods update = new OrderGoods();
+            update.setId(orderGoods.getId());
+            update.setResidueTransportWeight(BigDecimal.ZERO);
+            update.setOrderGoodsStatus(dto.getOrderGoodsStatus());
+            orderGoodsDao.updateEntityByKey(update);
         }
-        orderGoodsLogService.saveLog(orderGoodsNo, loginUserInfo.getUserNo(), loginUserInfo.getUserName(), OrderGoodsLogsEnum.Type.CANCEL.getName(), "");
-
     }
 
     /**
@@ -811,4 +847,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         List<Integer> collect = list.stream().map(OrderGoods::getId).collect(Collectors.toList());
         orderGoodsDao.batchUpdateResidueWeight(collect,BigDecimal.ZERO);
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        orderGoodsCancelMap.put(1, this::cancelOperateOneTypeStrategy);
+        orderGoodsCancelMap.put(2, this::cancelOperateTwoTypeStrategy);
+        orderGoodsCancelMap.put(3, this::cancelOperateThreeTypeStrategy);
+
+    }
 }