From 3f75c6f191a3170d8eb58ecd3ebf82c87caf582b Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 21 Oct 2025 11:15:20 +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/controller/admin/ShopOrderBaseController.java  | 1 +
 .../order/service/impl/ShopOrderBaseServiceImpl.java     | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
index 37287b1c..6a7145d8 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/controller/admin/ShopOrderBaseController.java
@@ -391,6 +391,7 @@ public class ShopOrderBaseController extends BaseControllerImpl {
                 return CommonResult.failed(ResultCode.FORBIDDEN);
             }
 
+
             // 5. 返回结果
             return CommonResult.success(mchOrderInfoDTO);
         } catch (Exception e) {
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 3c3c94bb..99202c21 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
@@ -9058,6 +9058,15 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         // 格式化取货号
         orderDetail.setOrder_pickup_num_str(fmtPickNum(orderDetail.getOrder_pickup_num()));
 
+        // 订单是否禁止退款
+        int isOrderDenyReturn = shopOrderReturnService.isOrderDenyReturn(orderId) ? 1 : 2;
+        orderDetail.setIs_deny_return(isOrderDenyReturn);
+
+        // 订单商品列表是否禁止退款
+        orderDetail.getOrder_items().forEach(item -> {
+            item.setIs_deny_return(isOrderDenyReturn);
+        });
+
         return orderDetail;
     }