From 4fdb8f2d4f3bb6f102514e346b7360f66d8e14d5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 21 Jan 2025 13:39:38 +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