From 5595a8009b151bbd1471a25ce969fb0f27a18116 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 26 Dec 2025 11:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=20=E5=88=A4=E6=96=AD=20=E6=98=AF=E5=90=A6=E6=88=90=E4=B8=BA=20?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/service/impl/ShopUserServiceImpl.java   | 13 ++++++++++---
 .../account/service/impl/UShopUserServiceImpl.java  |  1 +
 2 files changed, 11 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 c3470c2b0..b7dd81f9c 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
@@ -22,6 +22,8 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MemberConfigVO;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.account.mapper.ShopUserMapper;
+import com.czg.service.account.util.FunUtil;
+import com.czg.utils.FunUtils;
 import com.czg.utils.PageUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -61,6 +63,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
     private MemberLevelConfigService memberLevelConfigService;
     @DubboReference
     private TbMemberConfigService memberConfigService;
+
     private ShopUser getUserInfo(Long shopUserId) {
         ShopUser shopUser = queryChain().eq(ShopUser::getId, shopUserId).one();
         if (shopUser == null) {
@@ -240,9 +243,13 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             shopUser.setBirthDay(null);
         }
         shopUser.setNickName(userInfo.getNickName());
-        if (shopUser.getJoinTime() == null) {
-            shopUser.setJoinTime(LocalDateTime.now());
+//        if (shopUser.getJoinTime() == null) {
+//            shopUser.setJoinTime(LocalDateTime.now());
+//        }
+        boolean b = saveOrUpdate(shopUser);
+        if (b) {
+            FunUtils.transactionSafeRun(() -> memberConfigService.joinMemberByCondition(shopId, userId, shopUser));
         }
-        return saveOrUpdate(shopUser);
+        return b;
     }
 }
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 ae979022e..b5ba1797a 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
@@ -14,6 +14,7 @@ import com.czg.market.entity.MkPointsUser;
 import com.czg.market.entity.MkShopCouponRecord;
 import com.czg.market.service.MkPointsUserService;
 import com.czg.market.service.MkShopCouponRecordService;
+import com.czg.market.service.TbMemberConfigService;
 import com.czg.resp.CzgResult;
 import com.czg.service.RedisService;
 import com.czg.service.account.mapper.ShopConfigMapper;