From c36907d3f3696b7f3e7ad9f0c63a1ea79c4941e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 24 Mar 2025 15:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=8E=B7=E5=8F=96bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/user/UShopUserController.java  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java
index c374b6438..2b7e63fb0 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java
@@ -4,6 +4,7 @@ import com.czg.account.dto.shopuser.ShopUserAddDTO;
 import com.czg.account.dto.shopuser.ShopUserDetailDTO;
 import com.czg.account.dto.shopuser.ShopUserVipCardDTO;
 import com.czg.account.entity.PointsExchangeRecord;
+import com.czg.account.entity.ShopUser;
 import com.czg.account.entity.ShopUserFlow;
 import com.czg.account.service.PointsExchangeRecordService;
 import com.czg.account.service.ShopUserFlowService;
@@ -15,9 +16,14 @@ import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashSet;
+import java.util.Objects;
+
 /**
  * 店铺会员相关
  *
@@ -103,8 +109,9 @@ public class UShopUserController {
      */
     @GetMapping("/pointsRecord")
     public CzgResult<Page<PointsExchangeRecord>> getPointsRecord() {
+        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, StpKit.USER.getLoginIdAsLong()));
         return CzgResult.success(pointsExchangeRecordService.page(PageUtil.buildPage(), new QueryWrapper().eq(PointsExchangeRecord::getShopId, StpKit.USER.getShopId())
-                .eq(PointsExchangeRecord::getShopUserId, StpKit.USER.getLoginIdAsLong()).orderBy(PointsExchangeRecord::getId, false)));
+                .eq(PointsExchangeRecord::getShopUserId, shopUser.getId()).orderBy(PointsExchangeRecord::getId, false)));
     }
 
     /**
@@ -114,9 +121,13 @@ public class UShopUserController {
      */
     @GetMapping("/pointsRecord/detail")
     public CzgResult<PointsExchangeRecord> getPointsRecordDetail(@RequestParam Long id) {
+        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, StpKit.USER.getLoginIdAsLong()));
         return CzgResult.success(pointsExchangeRecordService.getOne(new QueryWrapper().eq(PointsExchangeRecord::getShopId, StpKit.USER.getShopId())
-                .eq(PointsExchangeRecord::getShopUserId, StpKit.USER.getLoginIdAsLong()).eq(PointsExchangeRecord::getId, id)));
+                .eq(PointsExchangeRecord::getShopUserId, shopUser.getId()).eq(PointsExchangeRecord::getId, id)));
     }
 
 
+    public static void main(String[] args) {
+
+    }
 }