From 43d87784776fc8d9d43b214dad910e14aa64282c Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 29 May 2022 16:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/yixiang/modules/services/AuthService.java     | 12 ++++++++----
 yshop-common/pom.xml                                 |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
index 72f798ff..1d57cb60 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
@@ -217,13 +217,16 @@ public class AuthService {
             WxOAuth2UserInfo wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, null);
             String openid = wxMpUser.getOpenid();
 
+            WxMaService wxMaService = WxMaConfiguration.getWxMaService();
+            WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
+                    .getNewPhoneNoInfo(code);
             //如果开启了UnionId
             if (StrUtil.isNotBlank(wxMpUser.getUnionId())) {
                 openid = wxMpUser.getUnionId();
             }
 
             YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery()
-                    .eq(YxUser::getUsername, openid), false);
+                    .eq(YxUser::getPhone, phoneNoInfo.getPhoneNumber()), false);
 
             //long uid = 0;
             YxUser returnUser = null;
@@ -234,7 +237,8 @@ public class AuthService {
                 //用户保存
                 String ip = IpUtil.getRequestIp();
                 YxUser user = YxUser.builder()
-                        .username(openid)
+                        .username(phoneNoInfo.getPhoneNumber())
+                        .phone(phoneNoInfo.getPhoneNumber())
                         .nickname(nickname)
                         .avatar(wxMpUser.getHeadImgUrl())
                         .addIp(ip)
@@ -245,8 +249,8 @@ public class AuthService {
                 //构建微信用户
                 WechatUserDto wechatUserDTO = WechatUserDto.builder()
                         .nickname(nickname)
-                        .openid(wxMpUser.getOpenid())
-                        .unionId(wxMpUser.getUnionId())
+                        .openid(openid)
+                        .unionId(openid)
                         .language("")
                         .headimgurl(wxMpUser.getHeadImgUrl())
                         .subscribe(false)
diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml
index 54601282..85b675c4 100644
--- a/yshop-common/pom.xml
+++ b/yshop-common/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>yshop-common</artifactId>
     <name>公共模块</name>
     <properties>
-        <weixin-java.version>4.2.0</weixin-java.version>
+        <weixin-java.version>4.3.0</weixin-java.version>
     </properties>
     <dependencies>
         <dependency>