From bf96ef67b00625fad6f8985c3d367e1ab60bbd1c Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 28 Apr 2025 10:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/order/service/impl/OrderInfoServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index dbb422f..e13ab43 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -299,9 +299,15 @@ public class OrderInfoServiceImpl implements IOrderInfoService log.info("退单处理中：{}", refundKey); throw new ServiceException("退单处理中"); } - if(orderInfo.getOrderState().equals(OrderRefundStateEnum.FINISH.getKey())) { + if(orderInfo.getOrderRefundState().equals(OrderRefundStateEnum.FINISH.getKey())) { throw new ServiceException("订单已退"); } + if(orderInfo.getOrderState().equals(OrderStateEnum.CANCEL.getKey())) { + throw new ServiceException("订单已取消"); + } + if(orderInfo.getOrderState().equals(OrderStateEnum.FINISH.getKey())) { + throw new ServiceException("订单已核销"); + } if(PayStateEnum.PAY_SUCC.getKey().equals(orderInfo.getPayState())) { List accTradeList = accTradeService.queryTradeAndWallerInfoByOrderNo (String.valueOf(orderId), AccTradeTypeEnum.CONSUME);