From 0eb071f2cac023b6cf29e15d0e9be953fdf9c093 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 19 Dec 2023 11:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AE=8C=E6=88=90=E5=90=8E=E5=88=B7=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../miniProgram/controller/UserMemberController.java   |  5 ++---
 .../miniProgram/service/IWxUserMemberService.java      |  2 +-
 .../service/impl/WxUserMemberServiceImpl.java          | 10 ++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
index a44c540..4d8c28f 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
@@ -59,9 +59,8 @@ public class UserMemberController extends BaseController {
      * @return
      */
     @PostMapping("/updateUser")
-    public AjaxResult updateUser(@RequestBody @Validated UserMemberUpdateVo userMemberUpdateVo) {
-        wxUserMemberService.updateUser(userMemberUpdateVo);
-        return AjaxResult.success();
+    public R updateUser(@RequestBody @Validated UserMemberUpdateVo userMemberUpdateVo) {
+        return R.ok(wxUserMemberService.updateUser(userMemberUpdateVo));
     }
 
     /**
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java
index 55c981a..f6535be 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java
@@ -10,7 +10,7 @@ public interface IWxUserMemberService {
 
     String upgradeMember(String code) throws Exception;
 
-    void updateUser(UserMemberUpdateVo userMemberUpdateVo);
+    LoginUserVo updateUser(UserMemberUpdateVo userMemberUpdateVo);
 
     LoginUserVo refreshWxUserInfo();
 
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
index 0bc8c0c..f00ccb9 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
@@ -9,7 +9,6 @@ import com.flossom.common.core.domain.entity.WxUserMember;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.mapper.WxUserMemberMapper;
 import com.flossom.common.core.utils.DateUtils;
-import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.utils.SecurityUtils;
 import com.flossom.miniProgram.domain.vo.*;
@@ -22,7 +21,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -115,22 +113,22 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     }
 
     @Override
-    public void updateUser(UserMemberUpdateVo userMemberUpdateVo) {
+    public LoginUserVo updateUser(UserMemberUpdateVo userMemberUpdateVo) {
         // 完善用户信息, 判断是否标记完善信息
         WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
         if (wxUserMember.getIsCompleteInformation() == null ||
                 wxUserMember.getIsCompleteInformation() == 0) {
             // 修改完善
             wxUserMember.setIsCompleteInformation(1);
-            // TODO： 首次完善，增加加分
+            // TODO： 首次完善，增加加分 (未完成)
 
         }
         BeanUtils.copyProperties(userMemberUpdateVo, wxUserMember);
         wxUserMember.setUpdateTime(DateUtils.getNowDate());
         wxUserMemberMapper.updateWxUserMember(wxUserMember);
 
-        // 重新构建用户信息缓存
-
+        // 刷新用户信息
+        return refreshWxUserInfo();
     }
 
     /**