diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java index 32541c33c..4758dba9d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java @@ -24,7 +24,7 @@ public interface MkShopCouponRecordService extends IService List queryReceive(QueryReceiveDto param); - List findByUser(String name, List shopUserIds, Integer status); + List findByUser(String name, List shopUserIds, Integer status,Long shopId); List queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type, Integer isFood); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkShopCouponRecordMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkShopCouponRecordMapper.java index 51d02cb61..718b2a814 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkShopCouponRecordMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkShopCouponRecordMapper.java @@ -22,7 +22,7 @@ public interface MkShopCouponRecordMapper extends BaseMapper List queryReceive(@Param("param") QueryReceiveDto param); - List findCouponVOByUser(String name, List shopUserIds, Integer status); + List findCouponVOByUser(String name, List shopUserIds, Integer status, Long shopId); List queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type, Integer isFood); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index 90c8a9c9f..3ab5c8460 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -87,8 +87,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl findByUser(String name, List shopUserIds, Integer status) { - return getMapper().findCouponVOByUser(name, shopUserIds, status); + public List findByUser(String name, List shopUserIds, Integer status, Long shopId) { + return getMapper().findCouponVOByUser(name, shopUserIds, status, shopId); } @Override diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index 2e1f5540b..85afcf935 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -244,13 +244,14 @@ public class ShopCouponServiceImpl extends ServiceImpl find(Long userId, String name, Long shopId, Integer status) { Page page = PageUtil.buildPage(); + Long mainShopId = shopInfoService.getMainIdByShopId(shopId); List shopUserIds = shopUserService.listAs(new QueryWrapper().eq(ShopUser::getUserId, userId) - .eq(ShopUser::getSourceShopId, shopId) + .eq(ShopUser::getMainShopId, mainShopId) .select(ShopUser::getId), Long.class); if (CollectionUtil.isNotEmpty(shopUserIds)) { PageHelper.startPage(Math.toIntExact(page.getPageNumber()), Math.toIntExact(page.getPageSize())); - List coupons = recordService.findByUser(name, shopUserIds, status); + List coupons = recordService.findByUser(name, shopUserIds, status, shopId); for (UserCouponVO coupon : coupons) { int maxShow = 5; if (StrUtil.isNotBlank(coupon.getFoods())) { diff --git a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml index 433506d50..a9b093738 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml @@ -72,6 +72,9 @@ #{userId} + + and mk_shop_coupon_record.shop_id = #{shopId} + and mk_shop_coupon_record.name like concat('%', #{name}, '%')