From 15264625d6aadee29756f4dfb31e91858b89863b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 11 Dec 2025 17:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=80=E6=AC=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/PointsGoodsRecordController.java  | 2 +-
 .../java/com/czg/controller/user/UPointGoodsController.java    | 2 +-
 .../main/java/com/czg/market/service/MkPointsGoodsService.java | 2 +-
 .../service/market/service/impl/MkPointsGoodsServiceImpl.java  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java
index fb2371463..b30436e7a 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/PointsGoodsRecordController.java
@@ -80,7 +80,7 @@ public class PointsGoodsRecordController {
      */
     @PostMapping("/rejectRefund")
     public CzgResult<Boolean> rejectRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
-        return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong()));
+        return CzgResult.success(pointsGoodsService.cancelRefund(param, null, StpKit.USER.getShopId()));
     }
 
 }
\ No newline at end of file
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
index e517838f6..9e4536dd7 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
@@ -76,7 +76,7 @@ public class UPointGoodsController {
      */
     @PostMapping("/cancelRefund")
     public CzgResult<Boolean> cancelRefund(@RequestBody @Validated PointGoodsRefundDTO param) {
-        return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong()));
+        return CzgResult.success(pointsGoodsService.cancelRefund(param, StpKit.USER.getLoginIdAsLong(), null));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
index aed9f65ce..4bf05dec2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
@@ -26,7 +26,7 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
     //用户申请退款
     boolean applyRefund(PointGoodsRefundDTO param, Long userId);
 
-    boolean cancelRefund(PointGoodsRefundDTO param, Long userId);
+    boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId);
 
     /**
      * 更新商品数量
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
index ce68cbf8b..6f13dff56 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
@@ -125,7 +125,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
     }
 
     @Override
-    public boolean cancelRefund(PointGoodsRefundDTO param, Long userId) {
+    public boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId) {
         MkPointsGoodsRecord record1 = goodsRecordService.getById(param.getRecordId());
         if (record1 == null) {
             throw new CzgException("取消失败，订单不存在");
@@ -146,6 +146,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
                 .eq(MkPointsGoodsRecord::getId, param.getRecordId())
                 .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
                 .eq(MkPointsGoodsRecord::getUserId, userId)
+                .eq(MkPointsGoodsRecord::getShopId, shopId)
         );
     }