运单流程

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -75,7 +75,7 @@ public class CarrierOrderChildController {
     @ApiOperation(value = "取消运单", notes = "<br>By:艾庆国")
     @PostMapping("/updateCancel")
     public Result<Void> updateCarrierCancel(@RequestBody @Validated OrderChildCarrierCancelParam param) {
-        orderChildPoundAuditService.updateCarrierCancel(param);
+        orderChildService.updateCarrierCancel(param);
 
         return Result.ok();
     }

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

 package com.clx.performance.service;
 
 
-import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 
@@ -17,6 +16,5 @@ public interface OrderChildPoundAuditService  {
 
 
     void updatePoundAudit(PoundAuditParam param);
-    void updateCarrierCancel(OrderChildCarrierCancelParam param);
 
 }

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

@@ -2,6 +2,7 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.*;
@@ -38,6 +39,8 @@ public interface OrderChildService {
     void updateDriverConfirm(OrderChildDriverConfirmParam param);
     void updateDriverCancel(OrderChildDriverCancelParam param);
 
+    void updateCarrierCancel(OrderChildCarrierCancelParam param);
+
     OrderChildVO getOrderChildInfo(String childNo);
 
     IPage<OrderChildVO> pageOrderChild(PageOrderChildOfDriverParam param);

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

@@ -119,85 +119,4 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
 
     }
 
-    @Override
-    public void updateCarrierCancel(OrderChildCarrierCancelParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        Long userNo = loginUserInfo.getUserNo();
-
-        String childNo = param.getChildNo();
-        LocalDateTime now = LocalDateTime.now();
-
-        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-
-        if (OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
-            return;
-        }
-
-        // 禁止取消 (卸车前取消)
-        if (orderChild.getStatus()>=OrderChildEnum.Status.UNLOAD.getCode()) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
-        }
-
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
-        // 定向
-        OrderGoodsTruckBind orderGoodsTruckBind = null;
-        if (Objects.equals(orderGoods.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())){
-            orderGoodsTruckBind = orderGoodsTruckBindDao.getByOrderGoodsNoAndTruckNo(orderGoods.getOrderGoodsNo(), orderChild.getTruckNo())
-                    .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        }
-
-        orderChild.setCancelRemark(param.getRemark());
-        orderChild.setCancelTime(now);
-        orderChild.setFinishTime(now);
-        orderChild.setStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
-
-        orderChildDao.updateCancel(orderChild);
-
-        // 返回吨数
-        updateOrderGoodsAmountReturn(orderChild, orderGoods);
-
-        // 取消定向
-        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
-
-        // 释放司机、车辆
-        releaseDriver(orderChild.getDriverUserNo());
-        releaseTruck(orderChild.getTruckId());
-
-        // 日志
-        orderChildLogService.saveCarrierOrderChildLog(childNo, OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(),
-                loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-    }
-
-    /**
-     * 取消返吨数
-     */
-    private void updateOrderGoodsAmountReturn(OrderChild orderChild, OrderGoods orderGoods){
-        orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight().negate());
-    }
-
-    /**
-     * 更新定向派单状态 (取消)
-     */
-    private void updateOrderGoodsDirectCancel(OrderGoodsTruckBind orderGoodsTruckBind){
-        if (orderGoodsTruckBind == null) {return;}
-
-        orderGoodsTruckBind.setStatus(OrderGoodsTruckBind.Status.CANCEL.getCode());
-        orderGoodsTruckBindDao.updateStatus(orderGoodsTruckBind);
-    }
-
-    /**
-     * 释放司机
-     */
-    private void releaseDriver(Long driverNo){
-
-    }
-
-    /**
-     * 释放车辆
-     */
-    private void releaseTruck(Integer truckId){
-
-    }
-
 }

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

@@ -8,6 +8,7 @@ import com.clx.performance.extranal.user.AddressService;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.*;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
@@ -687,20 +688,71 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setFinishTime(now);
         orderChild.setStatus(OrderChildEnum.Status.DRIVER_CANCEL.getCode());
 
+        // 返回吨数
+        updateOrderGoodsAmountReturn(orderChild, orderGoods);
+
+        // 取消定向
+        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+
         orderChildDao.updateCancel(orderChild);
 
+        // 释放司机、车辆
+        releaseDriver(orderChild.getDriverUserNo());
+        releaseTruck(orderChild.getTruckId());
+
+        // 日志
+        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CANCEL.getMsg(),
+                loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+    }
+
+    @Override
+    public void updateCarrierCancel(OrderChildCarrierCancelParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        String childNo = param.getChildNo();
+        LocalDateTime now = LocalDateTime.now();
+
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+
+        if (OrderChildEnum.CANCEL_lIST.contains(orderChild.getStatus())){
+            return;
+        }
+
+        // 禁止取消 (卸车前取消)
+        if (orderChild.getStatus()>=OrderChildEnum.Status.UNLOAD.getCode()) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
+        }
+
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        // 定向
+        OrderGoodsTruckBind orderGoodsTruckBind = null;
+        if (Objects.equals(orderGoods.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())){
+            orderGoodsTruckBind = orderGoodsTruckBindDao.getByOrderGoodsNoAndTruckNo(orderGoods.getOrderGoodsNo(), orderChild.getTruckNo())
+                    .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+
+        orderChild.setCancelRemark(param.getRemark());
+        orderChild.setCancelTime(now);
+        orderChild.setFinishTime(now);
+        orderChild.setStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
+
+
         // 返回吨数
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
         // 取消定向
         updateOrderGoodsDirectCancel(orderGoodsTruckBind);
 
+        orderChildDao.updateCancel(orderChild);
+
         // 释放司机、车辆
         releaseDriver(orderChild.getDriverUserNo());
         releaseTruck(orderChild.getTruckId());
 
         // 日志
-        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CANCEL.getMsg(),
+        orderChildLogService.saveCarrierOrderChildLog(childNo, OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(),
                 loginUserInfo.getUserNo(), loginUserInfo.getUserName());
     }