From 5c0febbb9a2a3f73465e937ed88aadf7a4cb7d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Mar 2025 17:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/account/service/impl/ShopUserServiceImpl.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
index ed3bdf1f2..c4f6b222f 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
@@ -252,17 +252,16 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
         userInfoService.updateById(userInfo);
 
         ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId));
-        if (shopUser != null) {
+        if (shopUser != null && shopUser.getIsVip() == 1) {
             throw new ApiNotPrintException("您已加入店铺会员");
         }
-
         shopUser = BeanUtil.copyProperties(shopUserAddDTO, ShopUser.class);
         shopUser.setIsVip(1);
         shopUser.setCode(generateCode(shopId));
         shopUser.setJoinTime(DateUtil.date().toLocalDateTime());
         shopUser.setShopId(shopId);
         shopUser.setUserId(userId);
-        return save(shopUser);
+        return saveOrUpdate(shopUser);
     }
 
     @Override