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); }