From b60f4d92101f755bfd5e3e5c434439610e840551 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 21 Oct 2025 11:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=83=BD=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=EF=BC=8C=E5=85=B3=E8=81=94=E5=88=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopOrderBaseServiceImpl.java |  6 +++++-
 .../service/impl/ShopOrderReturnServiceImpl.java     | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index a2eea4a7..3c3c94bb 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -670,6 +670,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         Integer user_id = user.getId();
         log.debug("当前用户ID: {}", user_id);
 
+
         QueryWrapper<ShopDistributionUserOrder> userOrderQueryWrapper = new QueryWrapper<>();
         userOrderQueryWrapper.eq("user_id", user_id).in("order_id", order_ids);
         ShopDistributionUserOrder distributionUserOrder = shopDistributionUserOrderService.findOne(userOrderQueryWrapper);
@@ -761,11 +762,14 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
             throw new ApiException(I18nUtil._("无该订单访问权限！"));
         }
 
+        // 是否禁止退款
+        int isOrderDenyReturn = shopOrderReturnService.isOrderDenyReturn(order_id) ? 1 : 2;
+        data.put("is_deny_return", isOrderDenyReturn);
+
         log.info("订单详情获取完成，订单ID: {}", order_id);
         return data;
     }
 
-
     /**
      * @param order_id
      * @param base_row shopOrderBase
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index 4035bf4a..0c6b99d3 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -2117,6 +2117,12 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             return true;
         }
 
+        if (orderStateId.intValue() == StateCode.ORDER_STATE_CANCEL ||
+                orderStateId.intValue() == StateCode.ORDER_STATE_WAIT_PAY) {
+            log.debug("[是否禁止退货] 订单已取消或未支付，order_id: {}", orderId);
+            return true;
+        }
+
         // 2. 先判断整个订单是否可以退货（订单级别检查）
         // 2.1 检查订单状态是否为已收货或已完成
         if (orderStateId.intValue() == StateCode.ORDER_STATE_RECEIVED ||
@@ -2239,6 +2245,12 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                 return true;
             }
 
+            if (orderStateId.intValue() == StateCode.ORDER_STATE_CANCEL ||
+                    orderStateId.intValue() == StateCode.ORDER_STATE_WAIT_PAY) {
+                log.debug("[是否禁止退货] 订单已取消或未支付，order_id: {}", orderId);
+                return true;
+            }
+
             if (orderStateId.intValue() == StateCode.ORDER_STATE_RECEIVED ||
                     orderStateId.intValue() == StateCode.ORDER_STATE_FINISH) {