优化代码

performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java

@@ -55,7 +55,27 @@ public enum OwnerAccountEnum {
         ;
         private final Integer code;
         private final String msg;
+        public String getMsg() {
+            return this.msg;
+        }
 
+        public Integer getCode() {
+            return this.code;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum OrderChildTypeStatus {
+        ORDINARY(1, "普通单"),
+        NETWORK(2, "网运单"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public Integer getCode() {
+            return this.code;
+        }
     }
 
     @Getter

performance-api/src/main/java/com/clx/performance/param/pc/owner/ThawAccountParam.java

@@ -16,5 +16,5 @@ public class ThawAccountParam {
     private String orderNo;
 
     // 1: 普通单  2：网运单
-    private String orderType;
+    private Integer orderType;
 }

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

+package com.clx.performance.component;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
+import com.clx.order.enums.OrderEnum;
+import com.clx.order.feign.OrderFeign;
+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.PendingOrderWayStatusEnum;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.extranal.user.DriverService;
+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.user.enums.driver.DriverInfoEnum;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.common.result.Result;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+@AllArgsConstructor
+public class OrderCancelComponent {
+
+    private final OrderChildDao orderChildDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
+    private final OrderChildService orderChildService;
+
+    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+
+    private final OrderFeign orderFeign;
+
+    private final DriverService driverService;
+
+    public void ownerProcess(OrderCancelParam param){
+        String orderNo = param.getOrderNo();
+        List<OrderGoods> orderGoodsList = null;
+        Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
+
+        switch (param.getCancelType()) {
+            case 1: //单纯取消订单
+                log.info("1:货主单纯取消订单");
+                if (CollectionUtil.isNotEmpty(orderChildDao.getOrderChildByOrderNo(orderNo))) {
+                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单已发生变化,请重新选择取消方式");
+                }
+
+                orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+                if (CollectionUtil.isNotEmpty(orderGoodsList)) {
+                    List<Integer> ids = new LinkedList<>();
+                    for (OrderGoods orderGoods : orderGoodsList) {
+                        if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                            orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                        }
+                        goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
+                        ids.add(orderGoods.getId());
+                    }
+                    orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
+                            ids);
+                }
+                break;
+            case 2: //取消未拉运吨数的货单
+                log.info("2:货主取消未拉运吨数的货单");
+
+                orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+
+                for (OrderGoods orderGoods : orderGoodsList) {
+                    OrderGoods update = new OrderGoods();
+                    update.setId(orderGoods.getId());
+                    if (orderGoods.getResidueTransportWeight().compareTo(orderGoods.getExtractWeight()) == 0) {
+                        update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
+                    } else {
+                        orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
+                        update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+                    }
+                    if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                    }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
+                    orderGoodsDao.updateEntityByKey(update);
+                }
+
+                break;
+
+            case 3: //取消未拉运+未到达货源地吨数
+                log.info("3:货主取消未拉运+未到达货源地吨数");
+
+                List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
+                log.info("执行货主取消未拉运+未到达货源地吨数,当前运单个数"+ orderChildren.size());
+                List<Integer> ids = new LinkedList<>();
+                for (OrderChild orderChild : orderChildren) {
+                    log.info("取消的运单：{}", JSONUtil.parse(orderChild));
+                    //释放车辆
+                    driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                    ids.add(orderChild.getId());
+                }
+
+                Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    log.info("ids:{}", ids);
+                    orderChildDao.batchUpdateOrderChildStatus(
+                            OrderChildEnum.Status.OWNER_CANCEL.getCode(), "货主取消",
+                            ids);
+                    orderChildMap = orderChildren.stream()
+                            .collect(Collectors.groupingBy(OrderChild::getOrderGoodsNo));
+
+                }
+                orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+
+                for (OrderGoods orderGoods : orderGoodsList) {
+                    OrderGoods update = new OrderGoods();
+                    update.setId(orderGoods.getId());
+                    if (CollectionUtil.isEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
+                        update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
+                    } else {
+                        BigDecimal reduce = BigDecimal.ZERO;
+                        for (OrderChild orderChild : orderChildMap.get(orderGoods.getOrderGoodsNo())) {
+                            reduce = reduce.add(orderChild.getWeight());
+                        }
+
+                        if (orderGoods.getExtractWeight().compareTo(orderGoods.getResidueTransportWeight().add(reduce)) == 0) {
+                            update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
+                        } else {
+                            orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
+                            update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+                        }
+                    }
+                    if (orderGoods.getPendingOrderWay().equals(PendingOrderWayStatusEnum.Status.DX.getCode())) {
+                        orderChildService.updateCancelTruckBind(orderGoods.getOrderGoodsNo());
+                    }
+                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoods.getOrderGoodsNo());
+
+                    orderGoodsDao.updateEntityByKey(update);
+                }
+
+                break;
+
+            default:
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");
+
+        }
+        log.info("执行货主取消订单更改状态");
+        if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");
+        }
+    }
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OrderCancelFeignController.java

@@ -34,7 +34,7 @@ public class OrderCancelFeignController {
 //        cancelParam.setCancelType(3);
 //        cancelParam.setCreateByType(1);
 //        orderCancelService.platformCancelOrderPrePC(cancelParam);
-        orderCancelService.ownerCancelOrderPre(param.getOrderNo());
+        orderCancelService.ownerConfirmCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }
 }

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

@@ -4,13 +4,13 @@ import com.clx.performance.param.pc.OrderCancelParam;
 
 public interface OrderCancelService {
 
-//    void platformCancelOrderPre(String orderNo);
-//
-//    void platformCancelOrder(String orderNo);
-//
-    void ownerCancelOrderPre(String orderNo);
-//
-    void ownerCancelOrder(String orderNo);
+    /**
+     * 承运端取消订单，货主同意调用此接口
+     * @param orderNo
+     */
+    void ownerConfirmCancelOrderPre(String orderNo);
+
+    void ownerConfirmCancelProcess(String orderNo);
 
     /**
      * 货主取消订单前置（只修改订单状态）

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

@@ -782,7 +782,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerAccountThaw(ThawAccountParam param) {
         String orderNo = param.getOrderNo();
-        if (StringUtils.equals(param.getOrderType(), "1")) {
+        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
             List<OwnerRunningWaterRecord> list = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
             if (null == list || list.size() != 2) {
                 log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));