From c50803ce54f33887e1980c32511275e4d13da181 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sat, 12 Jul 2025 10:23:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=B8=BB=E5=8A=A8=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopOrderReturnServiceImpl.java      | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

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 38122dfa..61a3cdef 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
@@ -2186,7 +2186,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
     }
 
     /**
-     * 商家处理退货退款（支持全单/部分商品退货）
+     * 商家处理退货退款不退货（支持全单/部分商品退货）
      *
      * @param requestParams JSON参数包含:
      *                      - order_id: 订单ID (必填)
@@ -2233,25 +2233,34 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
 
             // === 4. 处理退货商品信息 ===
             OrderReturnInputVo partialRefund = null;
+
+            // 不分退款？
             Boolean isPartialRefund = false;
+            int partialRefundItemCnt = 0;
             if (StrUtil.isNotBlank(requestParams.getStr("order_return_vo"))) {
                 try {
                     partialRefund = JSONUtil.toBean(requestParams.getStr("order_return_vo"), OrderReturnInputVo.class);
                     isPartialRefund = partialRefund != null && CollectionUtil.isNotEmpty(partialRefund.getReturn_items());
+                    partialRefundItemCnt = partialRefund.getReturn_items().size();
                 } catch (Exception e) {
                     return CommonResult.failed("退货商品参数格式错误");
                 }
             }
 
+            // 获取订单商品项
+            List<ShopOrderItem> orderItems = shopOrderItemService.find(
+                    new QueryWrapper<ShopOrderItem>().eq("order_id", orderId));
+            if (CollectionUtil.isEmpty(orderItems)) {
+                return CommonResult.failed("订单没有可退货的商品");
+            }
+
+            if (isPartialRefund && orderItems.size() == partialRefundItemCnt) {
+                isPartialRefund = false;
+            }
+
             // === 5. 创建退货单（如不存在） ===
             ShopOrderReturn refundOrder = null;
             if (!hasRefundRecord) {
-                // 5.1 获取订单商品项
-                List<ShopOrderItem> orderItems = shopOrderItemService.find(
-                        new QueryWrapper<ShopOrderItem>().eq("order_id", orderId));
-                if (CollectionUtil.isEmpty(orderItems)) {
-                    return CommonResult.failed("订单没有可退货的商品");
-                }
 
                 // 5.2 准备退货请求数据
                 OrderReturnInputVo refundRequest = new OrderReturnInputVo();