From 3fa5d937555dc2bff1210271566c81519241f14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 15:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=A7=AF=E5=88=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UShopUserController.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 18a765b3..0c312e7d 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 @@ -82,8 +82,8 @@ public class UShopUserController { * @return 分页数据 */ @GetMapping("/moneyRecord") - public CzgResult> getMoneyRecord() { - return CzgResult.success(shopUserFlowService.page(PageUtil.buildPage(), new QueryWrapper().eq(ShopUserFlow::getShopId, StpKit.USER.getShopId()) + public CzgResult> getMoneyRecord(@RequestParam Long shopId) { + return CzgResult.success(shopUserFlowService.page(PageUtil.buildPage(), new QueryWrapper().eq(ShopUserFlow::getShopId, shopId) .eq(ShopUserFlow::getUserId, StpKit.USER.getLoginIdAsLong()).orderBy(ShopUserFlow::getId, false))); } @@ -93,8 +93,8 @@ public class UShopUserController { * @return 明细数据 */ @GetMapping("/moneyRecord/detail") - public CzgResult getMoneyRecordDetail(@RequestParam Long id) { - return CzgResult.success(shopUserFlowService.getOne(new QueryWrapper().eq(ShopUserFlow::getShopId, StpKit.USER.getShopId()) + public CzgResult getMoneyRecordDetail(@RequestParam Long id, @RequestParam Long shopId) { + return CzgResult.success(shopUserFlowService.getOne(new QueryWrapper().eq(ShopUserFlow::getShopId, shopId) .eq(ShopUserFlow::getUserId, StpKit.USER.getLoginIdAsLong()).eq(ShopUserFlow::getId, id))); } @@ -103,9 +103,9 @@ public class UShopUserController { * @return 分页数据 */ @GetMapping("/pointsRecord") - public CzgResult> getPointsRecord() { - ShopUser shopUser = shopUserService.getShopUserInfo(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong()); - return CzgResult.success(memberPointsLogService.page(PageUtil.buildPage(), new QueryWrapper().eq(MemberPointsLog::getShopId, StpKit.USER.getShopId()) + public CzgResult> getPointsRecord(@RequestParam Long shopId) { + ShopUser shopUser = shopUserService.getShopUserInfo(shopId, StpKit.USER.getLoginIdAsLong()); + return CzgResult.success(memberPointsLogService.page(PageUtil.buildPage(), new QueryWrapper().eq(MemberPointsLog::getShopId, shopId) .eq(MemberPointsLog::getShopUserId, shopUser.getId()).orderBy(MemberPointsLog::getId, false))); } @@ -115,9 +115,9 @@ public class UShopUserController { * @return 明细数据 */ @GetMapping("/pointsRecord/detail") - public CzgResult getPointsRecordDetail(@RequestParam Long id) { - ShopUser shopUser = shopUserService.getShopUserInfo(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong()); - return CzgResult.success(memberPointsLogService.getOne(new QueryWrapper().eq(MemberPointsLog::getShopId, StpKit.USER.getShopId()) + public CzgResult getPointsRecordDetail(@RequestParam Long id,@RequestParam Long shopId) { + ShopUser shopUser = shopUserService.getShopUserInfo(shopId, StpKit.USER.getLoginIdAsLong()); + return CzgResult.success(memberPointsLogService.getOne(new QueryWrapper().eq(MemberPointsLog::getShopId, shopId) .eq(MemberPointsLog::getShopUserId, shopUser.getId()).eq(MemberPointsLog::getId, id))); } }