From 2f4e55aad3deaf55f814c1c07e879466c58a37ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 14 Mar 2025 16:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BC=9A=E5=91=98=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=90=8C=E8=B4=A6=E5=8F=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/account/service/impl/ShopUserServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 d6d5511b0..261fe3a8d 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
@@ -282,8 +282,10 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             BeanUtil.copyProperties(oriInfo, userInfo, "id", "alipayOpenId", "wechatOpenId");
 
             ShopUser oldUserInfo = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, oriInfo.getId()));
-            removeById(oldUserInfo.getId());
-            BeanUtil.copyProperties(oldUserInfo, shopUser, "id", "userId");
+            if (oldUserInfo != null) {
+                removeById(oldUserInfo.getId());
+                BeanUtil.copyProperties(oldUserInfo, shopUser, "id", "userId");
+            }
         }
 
         BeanUtil.copyProperties(shopUserAddDTO, shopUser);