From e5b775a834b0141ff18dd7ff0d10af1e4c21144c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Oct 2025 19:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopUserMapper.xml              | 2 +-
 .../market/service/impl/MkShopCouponRecordServiceImpl.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index b6262bfa2..63b2aab57 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -150,7 +150,7 @@
              LEFT JOIN `tb_order_info` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId}
              AND o.status = 'done'
          </if>
-         WHERE u.main_shop_id = #{mainShopId} and u.phone is not null
+         WHERE u.main_shop_id = #{mainShopId} and u.phone is not null and u.user_id is not null
          <!-- 性别筛选条件 -->
          <if test="!(param.sexMan == 1 and param.sexWoman == 1 and param.sexUnknown == 1)
           and (param.sexMan == 1 or param.sexWoman == 1 or param.sexUnknown == 1)">
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 23e44ce46..fde036055 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
@@ -265,8 +265,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
             });
             couponService.updateByQuery(newCoupon, queryWrapper);
         } else {
-            queryWrapper.eq(ShopCoupon::getId, coupon.getId());
-            couponService.update(coupon, true);
+            newCoupon.setId(coupon.getId());
+            couponService.update(newCoupon, true);
         }
     }