参数处理

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

@@ -51,9 +51,9 @@ public class OrderCancelComponent implements InitializingBean {
 
     private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
 
-    public static Map<Integer,String> statusCodeMap = new HashMap<>();
+    public static Map<Integer, String> statusCodeMap = new HashMap<>();
 
-    public void ownerProcess(OrderCancelParam param){
+    public void ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
@@ -108,7 +108,7 @@ public class OrderCancelComponent implements InitializingBean {
                 log.info("3:货主取消未拉运+未到达货源地吨数");
 
                 List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-                log.info("执行货主取消未拉运+未到达货源地吨数,当前运单个数"+ orderChildren.size());
+                log.info("执行货主取消未拉运+未到达货源地吨数,当前运单个数" + orderChildren.size());
                 List<Integer> ids = new LinkedList<>();
                 for (OrderChild orderChild : orderChildren) {
                     log.info("取消的运单：{}", JSONUtil.parse(orderChild));
@@ -162,7 +162,7 @@ public class OrderCancelComponent implements InitializingBean {
 
         }
 
-        this.breakContractSettlementOwner(orderNo, orderStatusCode);
+        this.breakContractSettlementOwner(orderNo, orderStatusCode, param.getCancelType());
 
         log.info("执行货主取消订单更改状态");
         if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {
@@ -178,7 +178,7 @@ public class OrderCancelComponent implements InitializingBean {
         ) {
             Integer truckDemand = orderGoods.getTruckDemand();
             //返回到货单
-            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
+            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight, weight, orderGoods.getId());
 
             RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
             rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
@@ -190,7 +190,7 @@ public class OrderCancelComponent implements InitializingBean {
                 if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
-                }else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+                } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
                 }
@@ -206,6 +206,12 @@ public class OrderCancelComponent implements InitializingBean {
         }
     }
 
+    /**
+     * 客服取消归还吨数
+     *
+     * @param orderGoodsNo
+     * @param weight
+     */
     public void backFillTonnageForArtificial(String orderGoodsNo, BigDecimal weight) {
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
@@ -213,7 +219,7 @@ public class OrderCancelComponent implements InitializingBean {
         ) {
             Integer truckDemand = orderGoods.getTruckDemand();
             //返回到货单
-            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
+            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight, weight, orderGoods.getId());
 
             RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
             rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
@@ -225,7 +231,7 @@ public class OrderCancelComponent implements InitializingBean {
                 if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
-                }else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+                } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
                 }
@@ -240,22 +246,22 @@ public class OrderCancelComponent implements InitializingBean {
             }
         } else {
             //返回到货单
-            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight,weight, orderGoods.getId());
+            orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(weight, weight, orderGoods.getId());
 
         }
     }
 
 
-    public void breakContractSettlementOwner(String orderNo, Integer updateStatus) {
+    public void breakContractSettlementOwner(String orderNo, Integer updateStatus, Integer cancelType) {
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         Integer orderStatus = orderInfoFeign.getOrderStatus();
         log.info("执行处理违约,订单号：{}, updateStatus:{}, 订单状态{}", orderNo, updateStatus, orderStatus);
         if (OrderEnum.Status.COMPLETED.getCode().equals(updateStatus) || statusCodeMap.containsKey(orderStatus)) {
             try {
-                breakContractSettlementOwnerService.saveSettlementOwnerForCancelOrder(orderInfoFeign.getTransportWeight(),orderInfoFeign.getValidFreightPrice(),orderNo,2);
+                breakContractSettlementOwnerService.saveSettlementOwnerForCancelOrder(orderInfoFeign.getTransportWeight(), orderInfoFeign.getValidFreightPrice(), orderNo, cancelType);
                 log.info("执行处理违约完毕");
 
-            }catch (Exception e) {
+            } catch (Exception e) {
                 log.info("执行处理违约失败{}", e.getMessage());
             }
         }

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

@@ -30,6 +30,10 @@ public interface OrderCancelService {
      */
     void orderCancelProcess(OrderCancelParam param);
 
+    /**
+     * 客服取消
+     * @param orderChildNo
+     */
     void artificialCancelOrder(String orderChildNo);
 
 }

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

@@ -69,7 +69,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     private final OrderCancelComponent orderCancelComponent;
 
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void ownerConfirmCancelOrderPre(String orderNo) {
@@ -342,6 +341,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     /**
      * 平台取消订单前置(只修改订单相关状态)
+     *
      * @param param
      */
     @Override
@@ -478,6 +478,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     /**
      * 执行订单取消后归还吨数
+     *
      * @param param
      */
     @Override
@@ -663,9 +664,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         }
 
 
-        try {
-            Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
-            if (!result.succeed()) {
+        if (!orderFeign.rollbackOrderWeight(rollbackOrderWeightParam).succeed()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
         }
 
@@ -673,10 +672,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
         }
 
-        } catch (Exception e) {
-            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
-
-        }
     }
 
     @Override