From 5434f63ee4f08ef58530304e479f02a80c0c2bff Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 5 Dec 2025 18:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/service/MkShopCouponRecordService.java    | 2 +-
 .../czg/service/market/mapper/MkShopCouponRecordMapper.java  | 2 +-
 .../market/service/impl/MkShopCouponRecordServiceImpl.java   | 4 ++--
 .../service/market/service/impl/ShopCouponServiceImpl.java   | 5 +++--
 .../src/main/resources/mapper/MkShopCouponRecordMapper.xml   | 3 +++
 5 files changed, 10 insertions(+), 6 deletions(-)

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<MkShopCouponRecord>
 
     List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
 
-    List<UserCouponVO> findByUser(String name, List<Long> shopUserIds, Integer status);
+    List<UserCouponVO> findByUser(String name, List<Long> shopUserIds, Integer status,Long shopId);
 
     List<UserCouponVo> 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<MkShopCouponRecord>
 
     List<CouponReceiveVo> queryReceive(@Param("param") QueryReceiveDto param);
 
-    List<UserCouponVO> findCouponVOByUser(String name, List<Long> shopUserIds, Integer status);
+    List<UserCouponVO> findCouponVOByUser(String name, List<Long> shopUserIds, Integer status, Long shopId);
 
     List<UserCouponVo> 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<MkShopCouponRecor
     }
 
     @Override
-    public List<UserCouponVO> findByUser(String name, List<Long> shopUserIds, Integer status) {
-        return getMapper().findCouponVOByUser(name, shopUserIds, status);
+    public List<UserCouponVO> findByUser(String name, List<Long> 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<ShopCouponMapper, ShopCou
     @Override
     public Page<UserCouponVO> find(Long userId, String name, Long shopId, Integer status) {
         Page<Object> page = PageUtil.buildPage();
+        Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
         List<Long> 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<UserCouponVO> coupons = recordService.findByUser(name, shopUserIds, status);
+            List<UserCouponVO> 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 @@
         <foreach collection="shopUserIds" item="userId" open="(" separator="," close=")">
             #{userId}
         </foreach>
+        <if test="shopId != null">
+            and mk_shop_coupon_record.shop_id = #{shopId}
+        </if>
         <if test="name != null and name != ''">
             and mk_shop_coupon_record.name like concat('%', #{name}, '%')
         </if>