From acbd3466903da0546dc06e7aa9ba03fe7ebcab6d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 27 Feb 2025 17:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=94=A8=E6=88=B7Id=20?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/user/UserShopCouponController.java | 4 ++-- .../java/com/czg/account/service/ShopCouponService.java | 2 +- .../account/service/impl/ShopCouponServiceImpl.java | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java index 63126ef3..139db981 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java @@ -32,8 +32,8 @@ public class UserShopCouponController { public CzgResult> findByUserId( @RequestParam Long userId, @RequestParam(required = false) Integer status, - @RequestParam(required = false) Long orderId) { - return CzgResult.success(couponService.find(userId, orderId, status)); + @RequestParam(required = false) Long shopId) { + return CzgResult.success(couponService.find(userId, shopId, status)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java index f5a5e2e3..10c5d8ba 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java @@ -35,7 +35,7 @@ public interface ShopCouponService extends IService { Page queryReceive(QueryReceiveDto param); - Page find(Long userId, Long orderId, Integer status); + Page find(Long userId,Long shopId, Integer status); List findCoupon(Long shopId, Long shopUserId); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java index 37bd0ff0..38a8ff8c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java @@ -85,8 +85,11 @@ public class ShopCouponServiceImpl extends ServiceImpl find(Long userId, Long orderId, Integer status) { - List shopUserIds = shopUserService.queryChain().eq(ShopUser::getUserId, userId).select(ShopUser::getId).listAs(Long.class); + public Page find(Long userId, Long shopId, Integer status) { + List shopUserIds = shopUserService.queryChain() + .eq(ShopUser::getUserId, userId) + .eq(ShopUser::getShopId, shopId) + .select(ShopUser::getId).listAs(Long.class); if (CollectionUtil.isNotEmpty(shopUserIds)) { return couponRecordService.findByUser(PageUtil.buildPage(), shopUserIds, status); }