From 1953bad578860fa72169e8b76afd0de0792df511 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 19 Dec 2023 14:15:57 +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=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserMemberController.java      | 20 ++++++++++++++++++-
 .../service/IWxUserMemberService.java         |  1 -
 .../service/impl/WxUserMemberServiceImpl.java |  7 +++----
 3 files changed, 22 insertions(+), 6 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 4d8c28f..69ffcfe 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
@@ -1,14 +1,19 @@
 package com.flossom.miniProgram.controller;
 
+import com.flossom.common.core.constant.Constants;
 import com.flossom.common.core.domain.R;
+import com.flossom.common.core.domain.SysFile;
+import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
 import com.flossom.miniProgram.service.IWxUserMemberService;
+import com.flossom.system.api.RemoteFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -20,6 +25,9 @@ public class UserMemberController extends BaseController {
     @Autowired
     private IWxUserMemberService wxUserMemberService;
 
+    @Autowired
+    private RemoteFileService remoteFileService;
+
     /**
      * 登录接口
      *
@@ -59,7 +67,17 @@ public class UserMemberController extends BaseController {
      * @return
      */
     @PostMapping("/updateUser")
-    public R updateUser(@RequestBody @Validated UserMemberUpdateVo userMemberUpdateVo) {
+    public R updateUser(@RequestParam(value = "file", required = false) MultipartFile file, @Validated UserMemberUpdateVo userMemberUpdateVo) {
+        if (file != null) {
+            R<SysFile> result = remoteFileService.upload(file);
+            if (result.getCode() != Constants.SUCCESS) {
+                logger.error("上传头像失败");
+                throw new ServiceException("上传头像失败");
+            }
+            userMemberUpdateVo.setHeadimg(result.getData().getUrl());
+        } else {
+            userMemberUpdateVo.setHeadimg(null);
+        }
         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 f6535be..aecfad0 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
@@ -1,6 +1,5 @@
 package com.flossom.miniProgram.service;
 
-import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.miniProgram.domain.vo.LoginUserVo;
 import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
 
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 f00ccb9..491475e 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
@@ -115,10 +115,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     @Override
     public LoginUserVo updateUser(UserMemberUpdateVo userMemberUpdateVo) {
         // 完善用户信息, 判断是否标记完善信息
-        WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
-        if (wxUserMember.getIsCompleteInformation() == null ||
-                wxUserMember.getIsCompleteInformation() == 0) {
-            // 修改完善
+        WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(SecurityUtils.getLoginUser().getWxUserMember().getOpenid());
+        if (wxUserMember.getIsCompleteInformation() == null || wxUserMember.getIsCompleteInformation() == 0) {
+            // 修改完善状态
             wxUserMember.setIsCompleteInformation(1);
             // TODO： 首次完善，增加加分 (未完成)