From 81b6340bcbbb148b4d72da5223b1d82268508583 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 Jan 2025 17:49:59 +0800
Subject: [PATCH] refactor(测试用例):优化实体验证工具类并调整测试用例

---
 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