diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 573f85ffb..1aa5a7e75 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -885,6 +885,11 @@ public class OrderServiceImpl implements OrderService { if (orderDO == null) { throw new ServiceException(ORDER_NOT_EXISTS); } + // 状态校验 + if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.EMPTY.getStatus()) && + !Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) { + throw new ServiceException(ORDER_CAN_NOT_CANCEL); + } // 是否主单 boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus()); @@ -916,11 +921,6 @@ public class OrderServiceImpl implements OrderService { } } - // 状态排除 - if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.EMPTY.getStatus()) && - !Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) { - throw new ServiceException(ORDER_CAN_NOT_CANCEL); - } return orderMapper.update(new LambdaUpdateWrapper() .eq(OrderDO::getId, orderId) .eq(OrderDO::getDeleted, notDeletedStatus)