From 23d10238a19794d803cfa4ab9d5d475b0e69b04d Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Fri, 15 Nov 2024 10:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/member/enums/ErrorCodeConstants.java | 1 + .../member/service/storeorder/StoreOrderServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index c79c6787..f9dac0fe 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -116,6 +116,7 @@ public interface ErrorCodeConstants { ErrorCode AMOUNT_NOT_ENOUGH = new ErrorCode(1_007_904_008, "金额不足"); ErrorCode CODE_NOT_TIME = new ErrorCode(1_007_904_008, "二维码过期"); ErrorCode STATUS_ERROR = new ErrorCode(1_007_904_007, "订单已完成或已退款"); + ErrorCode STATUS_ERROR_CANCEL = new ErrorCode(1_007_904_007, "订单已取消"); ErrorCode ORDER_FAIL = new ErrorCode(1_007_904_008, "下单失败"); ErrorCode ORDER_CANCEL_FAIL = new ErrorCode(1_007_904_008, "订单取消失败"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java index 4c1a656c..e59bb207 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java @@ -464,7 +464,7 @@ public class StoreOrderServiceImpl implements StoreOrderService { public AddReqVO cancel(Integer orderId) { StoreOrderDO storeOrderDO; synchronized (getStoreOrderLock("cancel")) { - storeOrderDO = storeOrderMapper.selectById(orderId); + storeOrderDO = storeOrderMapper.selectById(orderId); if(ObjectUtil.isEmpty(storeOrderDO)){ throw exception(STORE_ORDER_NOT_EXISTS); } @@ -472,6 +472,9 @@ public class StoreOrderServiceImpl implements StoreOrderService { || storeOrderDO.getStatus().equals(StoreOrderStatusEnum.REFUND.getCode())){ throw exception(STATUS_ERROR); } + if(storeOrderDO.getStatus().equals(StoreOrderStatusEnum.CANCEL.getCode())){ + throw exception(STATUS_ERROR_CANCEL); + } } //修改状态