From ac8d11bea72e17ba120b278fa6cd0684293415af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 27 Sep 2025 14:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UShopUserServiceImpl.java    |  8 +------
 .../service/impl/MemberOrderServiceImpl.java  | 23 ++++++++-----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
index e51b695e5..39156696b 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
@@ -153,13 +153,7 @@ public class UShopUserServiceImpl implements UShopUserService {
         Long mainId = shopInfoService.getMainIdByShopId(shopId);
         // 当前用户信息
         UserInfo userInfo = userInfoService.getById(userId);
-        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, shopId).eq(ShopUser::getUserId, userInfo.getId()));
-        if (shopUser == null) {
-            shopUser = new ShopUser();
-            shopUser.setUserId(userId);
-            shopUser.setSourceShopId(shopId);
-            shopUser.setMainShopId(mainId);
-        }
+        ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
 
         // 查询系统添加的会员
         UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone()));
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java
index 075967bde..c1e250b12 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java
@@ -75,19 +75,16 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
             userInfo.setBirthDay(orderDTO.getBirthDay());
         }
 
-        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getUserId, orderDTO.getUserId()).eq(ShopUser::getSourceShopId, orderDTO.getShopId()));
-        if (shopUser == null) {
-            uShopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO()
-                    .setPhone(userInfo.getPhone())
-                    .setSex(userInfo.getSex())
-                    .setHeadImg(userInfo.getHeadImg())
-                    .setAmount(BigDecimal.ZERO)
-                    .setBirthDay(userInfo.getBirthDay())
-                    .setIsVip(0)
-                    .setAccountPoints(0)
-                    .setNickName(userInfo.getNickName())
-            );
-        }
+        uShopUserService.join(orderDTO.getShopId(), orderDTO.getUserId(), new ShopUserAddDTO()
+                .setPhone(userInfo.getPhone())
+                .setSex(userInfo.getSex())
+                .setHeadImg(userInfo.getHeadImg())
+                .setAmount(BigDecimal.ZERO)
+                .setBirthDay(userInfo.getBirthDay())
+                .setIsVip(0)
+                .setAccountPoints(0)
+                .setNickName(userInfo.getNickName())
+        );
 
 
         if ("PAY".equals(memberConfigVO.getOpenType())){