bug修复

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

@@ -1146,8 +1146,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public void updateCarrierCancel(OrderChildCarrierCancelParam param) {
-//        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-//        Long userNo = loginUserInfo.getUserNo();
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
 
         String childNo = param.getChildNo();
         LocalDateTime now = LocalDateTime.now();
@@ -1155,25 +1155,25 @@ public class OrderChildServiceImpl implements OrderChildService {
         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);
-//        }
+        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);
-//        }
+        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(LocalDateTime.now());
@@ -1184,23 +1184,23 @@ public class OrderChildServiceImpl implements OrderChildService {
         updateOrderGoodsAmountReturn(orderChild, orderGoods);
 
         // 取消定向
-//        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
-//
-//        orderChildDao.updateCancel(orderChild);
-//
-//        // 更新出车状态
-//        updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
+        updateOrderGoodsDirectCancel(orderGoodsTruckBind);
+
+        orderChildDao.updateCancel(orderChild);
+
+        // 更新出车状态
+        updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
 
         // 日志
-//        orderChildLogService.saveCarrierOrderChildLog(childNo, OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
-//                OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), loginUserInfo.getUserNo(),
-//                loginUserInfo.getUserName());
-//
-//        // 运单结束
-//        orderChildFinish(orderChild);
-//
-//        // 发送mq （运单取消）
-//        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+        orderChildLogService.saveCarrierOrderChildLog(childNo, OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
+                OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), loginUserInfo.getUserNo(),
+                loginUserInfo.getUserName());
+
+        // 运单结束
+        orderChildFinish(orderChild);
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
     }