From d151432ad7c2117e95c174d0440b8962c27aec3b 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 16:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/user/UserController.java     |  2 +-
 .../com/czg/account/service/UserInfoService.java    |  2 +-
 .../account/service/impl/UserInfoServiceImpl.java   | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java
index ea022636..cc422f9a 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java
@@ -38,7 +38,7 @@ public class UserController {
      */
     @PutMapping
     public CzgResult<Boolean> update(@RequestBody UserInfoEditDTO userInfoEditDTO) {
-        return CzgResult.success(userInfoService.updateInfo( StpKit.USER.getLoginIdAsLong(), userInfoEditDTO));
+        return CzgResult.success(userInfoService.updateInfo(StpKit.USER.getShopId(-1L), StpKit.USER.getLoginIdAsLong(), userInfoEditDTO));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java
index 8372c506..07814ba1 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java
@@ -16,7 +16,7 @@ public interface UserInfoService extends IService<UserInfo> {
 
     UserInfoDTO getInfo(long userInfoId);
 
-    Boolean updateInfo(long userId, UserInfoEditDTO userInfoEditDTO);
+    Boolean updateInfo(long shopId, long userId, UserInfoEditDTO userInfoEditDTO);
 
     Boolean updatePwd(long userId, UserInfoPwdEditDTO userInfoPwdEditDTO);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
index 729b0786..8dda23a9 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
@@ -8,6 +8,7 @@ import com.czg.account.dto.user.userinfo.UserInfoAssetsSummaryDTO;
 import com.czg.account.dto.user.userinfo.UserInfoDTO;
 import com.czg.account.dto.user.userinfo.UserInfoEditDTO;
 import com.czg.account.dto.user.userinfo.UserInfoPwdEditDTO;
+import com.czg.account.entity.ShopUser;
 import com.czg.account.entity.UserInfo;
 import com.czg.account.service.UserInfoService;
 import com.czg.config.RedisCst;
@@ -16,6 +17,7 @@ import com.czg.service.RedisService;
 import com.czg.service.account.mapper.ShopUserMapper;
 import com.czg.service.account.mapper.UserInfoMapper;
 import com.czg.system.service.SmsService;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -51,10 +53,17 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
     }
 
     @Override
-    public Boolean updateInfo(long userId, UserInfoEditDTO userInfoEditDTO) {
+    public Boolean updateInfo(long shopId, long userId, UserInfoEditDTO userInfoEditDTO) {
         UserInfo userInfo = getById(userId);
         BeanUtil.copyProperties(userInfoEditDTO, userInfo);
-        return save(userInfo);
+        if (save(userInfo)) {
+            if (shopId != -1L) {
+                ShopUser shopUser = BeanUtil.copyProperties(userInfo, ShopUser.class);
+                return shopUserMapper.updateByQuery(shopUser, new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId)) > 0;
+            }
+            return true;
+        }
+        return false;
     }
 
     @Override