From d7f01edd56f2f8a822ceffa9240fa22e4763d7e4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 Jan 2025 15:42:40 +0800
Subject: [PATCH] refactor(mall): 重构订单发货相关代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 90cd291..c346f21 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -412,8 +412,9 @@
throw new FebsException("订单不存在");
}
- if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
- throw new FebsException("订单不是待付款, 无法取消");
+ if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()
+ && OrderStatusEnum.WAIT_SHIPPING.getValue() != orderInfo.getStatus() ) {
+ throw new FebsException("订单不是待付款或者待收货, 无法取消");
}
orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
--
Gitblit v1.9.1