From 62ec992865fed22bde33d226be277732b21f265b Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 26 Jun 2026 11:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BD=9C=E5=BA=9F=20?= =?UTF-8?q?=E4=B8=BB=E5=8D=95=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/order/OrderServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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)