From 52089a8cb9a328c3cfff68d02cb5a10d428e40ad Mon Sep 17 00:00:00 2001
From: gzlv <itxz09@163.com>
Date: Thu, 5 Aug 2021 16:55:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=85=BC=E5=AE=B9=E6=97=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yixiang/modules/services/AuthService.java | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 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 52396dab..b500db99 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
@@ -105,7 +105,6 @@ public class AuthService {
                 //过滤掉表情
                 String ip = IpUtil.getRequestIp();
                 yxUser = YxUser.builder()
-                        .username(wxMpUser.getNickName())
                         .nickname(wxMpUser.getNickName())
                         .avatar(wxMpUser.getAvatarUrl())
                         .addIp(ip)
@@ -170,26 +169,35 @@ public class AuthService {
 
             if (ObjectUtil.isNull(yxUser)) {
 
+                //兼容旧系统
+                yxUser = this.userService.getOne(Wrappers.<YxUser>lambdaQuery()
+                        .eq(YxUser::getUsername, session.getOpenid()), false);
 
-                //过滤掉表情
-                String ip = IpUtil.getRequestIp();
-                yxUser = YxUser.builder()
-                        .username(phoneNoInfo.getPhoneNumber())
-                        .phone(phoneNoInfo.getPhoneNumber())
-                        .addIp(ip)
-                        .lastIp(ip)
-                        .userType(AppFromEnum.ROUNTINE.getValue())
-                        .build();
+                if (ObjectUtil.isNull(yxUser)) {
+                    //过滤掉表情
+                    String ip = IpUtil.getRequestIp();
+                    yxUser = YxUser.builder()
+                            .username(phoneNoInfo.getPhoneNumber())
+                            .phone(phoneNoInfo.getPhoneNumber())
+                            .addIp(ip)
+                            .lastIp(ip)
+                            .userType(AppFromEnum.ROUNTINE.getValue())
+                            .build();
 
-                //构建微信用户
-                WechatUserDto wechatUserDTO = WechatUserDto.builder()
-                        .routineOpenid(session.getOpenid())
-                        .unionId(session.getUnionid())
-                        .build();
+                    //构建微信用户
+                    WechatUserDto wechatUserDTO = WechatUserDto.builder()
+                            .routineOpenid(session.getOpenid())
+                            .unionId(session.getUnionid())
+                            .build();
 
-                yxUser.setWxProfile(wechatUserDTO);
+                    yxUser.setWxProfile(wechatUserDTO);
 
-                this.userService.save(yxUser);
+                    this.userService.save(yxUser);
+                }else {
+                    yxUser.setUsername(phoneNoInfo.getPhoneNumber());
+                    yxUser.setPhone(phoneNoInfo.getPhoneNumber());
+                    this.userService.updateById(yxUser);
+                }
 
             } else {
                 WechatUserDto wechatUser = yxUser.getWxProfile();