From 8fca992e37d7ac05e6dc0ca1484d615d9859aa41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 6 May 2026 17:06:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(shopOrder):=20=E6=94=AF=E6=8C=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8B=92=E7=BB=9D=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改退款操作接口，增加对拒绝退款状态（orderStatus=5）的支持
- 更新接口描述，明确支持申请、拒绝、同意及客户端申请退款四种状态
- 优化校验逻辑，确保orderStatus只能为4、5、6或7
- 完善参数非空判断并返回相应失败信息
---
 .../shop/controller/ShopOrderController.java      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
index d156858..5d31c71 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
@@ -441,15 +441,16 @@ public class ShopOrderController extends BaseController {
     }
 
     @PreAuthorize("hasAuthority('shop:shopOrder:refund')")
-    @Operation(summary = "订单退款操作(申请退款/同意退款)", description = "orderStatus=4 申请退款；orderStatus=6 同意退款并发起原路退款")
+    @Operation(summary = "订单退款操作(申请退款/同意退款/拒绝退款)", description = "orderStatus=4 申请退款；orderStatus=5 拒绝退款；orderStatus=6 同意退款并发起原路退款；orderStatus=7 客户端申请退款")
     @PutMapping("/refund")
     public ApiResult<?> refund(@RequestBody ShopOrder req) {
-        if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) {
-            return fail("orderId 和 orderStatus 不能为空");
-        }
-        if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) {
-            return fail("orderStatus 仅支持 4(申请退款) 或 6(同意退款) 或 7(客户端申请退款)");
-        }
+      if (req == null || req.getOrderId() == null || req.getOrderStatus() == null) {
+        return fail("orderId 和 orderStatus 不能为空");
+      }
+      if (!Objects.equals(req.getOrderStatus(), 4) && !Objects.equals(req.getOrderStatus(), 5)
+        && !Objects.equals(req.getOrderStatus(), 6) && !Objects.equals(req.getOrderStatus(), 7)) {
+        return fail("orderStatus 仅支持 4(申请退款)、5(拒绝退款)、6(同意退款)、7(客户端申请退款)");
+      }
 
         ShopOrder current = shopOrderService.getById(req.getOrderId());
         if (current == null) {