From fe0837c4869fd9e8ff7ed14bf4c2756baaad1ccc Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Sat, 16 Dec 2023 14:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=8E=B7=E5=8F=96=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/miniProgram/controller/UserMemberController.java | 3 +--
 .../flossom/miniProgram/service/IWxUserMemberService.java    | 2 +-
 .../miniProgram/service/impl/WxUserMemberServiceImpl.java    | 5 +++--
 .../java/com/flossom/miniProgram/utils/MiniProgramUtils.java | 2 +-
 flossom-ui/package.json                                      | 2 +-
 5 files changed, 7 insertions(+), 7 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 ff47d40..c21f86d 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
@@ -36,8 +36,7 @@ public class UserMemberController extends BaseController {
      */
     @PostMapping("/upgradeMember")
     public AjaxResult upgradeMember(@RequestParam(value = "code") String code) throws Exception {
-        wxUserMemberService.upgradeMember(code);
-        return AjaxResult.success();
+        return AjaxResult.success("获取成功", wxUserMemberService.upgradeMember(code));
     }
 
     /**
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 2419195..b54128e 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
@@ -8,7 +8,7 @@ public interface IWxUserMemberService {
 
     LoginUserVo login(String code) throws Exception;
 
-    void upgradeMember(String code) throws Exception;
+    String upgradeMember(String code) throws Exception;
 
     void updateUser(UserMemberUpdateVo 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 7720cf1..1ee250c 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
@@ -99,7 +99,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     }
 
     @Override
-    public void upgradeMember(String code) throws Exception {
+    public String upgradeMember(String code) throws Exception {
         String accessToken = MiniProgramUtils.getAccessToken(SecurityUtils.getLoginUser().getWxUserMember().getOpenid());
         if (StringUtils.isBlank(accessToken)) {
             throw new ServiceException("获取用户手机号码失败");
@@ -109,11 +109,12 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
         String result = MiniProgramUtils.getPhone(code, accessToken);
         logger.info("请求微信服务器获取手机号码返回结果：{}", result);
         WxCode2PhoneRet wxCode2PhoneRet = JSON.parseObject(result, WxCode2PhoneRet.class);
-        if (wxCode2PhoneRet.getErrcode() != null) {
+        if (wxCode2PhoneRet.getErrcode() != 0) {
             logger.error("获取用户手机号码失败: {}", wxCode2PhoneRet.getErrmsg());
             throw new ServiceException("获取用户手机号码失败");
         }
         wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue());
+        return wxCode2PhoneRet.getPhoneInfo().getPhoneNumber();
     }
 
     @Override
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
index d589999..c8f70ad 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
@@ -107,7 +107,7 @@ public class MiniProgramUtils {
     public static String getPhone(String code, String accessToken) throws Exception {
         Map<String, String> params = new HashMap();
         params.put("code", code);
-        return HttpClientUtils.postParameters(wxConfig.getObtainPhoneUrl() + "?access_token=" + accessToken, params);
+        return HttpClientUtils.postParameters(wxConfig.getObtainPhoneUrl() + "?access_token=" + accessToken, JSON.toJSONString(params));
     }
 
     public static String getAccessToken(String openid) throws Exception {
diff --git a/flossom-ui/package.json b/flossom-ui/package.json
index 2827a72..10bd79a 100644
--- a/flossom-ui/package.json
+++ b/flossom-ui/package.json
@@ -5,7 +5,7 @@
   "author": "花至",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",