From 850796d89bc2b7fb496630bb6c363695e67187d4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 05 八月 2025 17:52:10 +0800
Subject: [PATCH] 会员同步手机号

---
 framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index e270ab4..07587fc 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -14,6 +14,7 @@
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.token.Token;
 import cn.lili.common.utils.HttpUtils;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.utils.UuidUtils;
 import cn.lili.modules.connect.entity.Connect;
 import cn.lili.modules.connect.entity.dto.AuthToken;
@@ -87,8 +88,8 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Token unionLoginCallback(ConnectAuthUser authUser, String uuid) {
-        return this.unionLoginCallback(authUser, false);
+    public Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice) {
+        return this.unionLoginCallback(authUser, false,encryptTwice);
     }
 
     @Override
@@ -130,6 +131,7 @@
         Map<String, String> map = new HashMap<>(3);
         //寰楀埌寰俊灏忕▼搴忚仈鍚堢櫥闄嗕俊鎭�
         JSONObject json = this.getConnect(params.getCode());
+        System.out.println(json);
         //瀛樺偍session key 鍚庣画鐧诲綍鐢ㄥ緱鍒�
         String sessionKey = json.getStr("session_key");
         String unionId = json.getStr("unionid");
@@ -137,7 +139,7 @@
         map.put("sessionKey", sessionKey);
         map.put("unionId", unionId);
         map.put("openId", openId);
-
+        System.out.println(sessionKey);
         //寰俊鑱斿悎鐧婚檰鍙傛暟
         return phoneMpBindAndLogin(map.get("sessionKey"), params, map.get("openId"), map.get("unionId"));
     }
@@ -196,7 +198,7 @@
             AuthToken authToken = new AuthToken();
             authToken.setUnionId(unionId);
             connectAuthUser.setToken(authToken);
-            return this.unionLoginCallback(connectAuthUser, true);
+            return this.unionLoginCallback(connectAuthUser, true,true);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -259,7 +261,8 @@
             user.setUsername(UuidUtils.getUUID());
             user.setNickName("寰俊鐢ㄦ埛");
             user.setPassword(DEFAULT_PASSWORD);
-            user.setFace("https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png");
+            user.setFace("");
+            user.setDisabled(Boolean.TRUE);
             memberService.registerHandler(user);
         }
 
@@ -304,7 +307,7 @@
      * @return token
      * @throws NoPermissionException 涓嶅厑璁告搷浣�
      */
-    private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm) {
+    private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm,boolean encryptTwice) {
 
         try {
             Member member = null;
@@ -335,16 +338,22 @@
                 Connect connect = this.getOne(queryWrapper);
 
                 if (connect == null) {
-                    member = memberService.autoRegister(authUser);
+                    member = memberService.autoRegister(authUser,encryptTwice);
                 } else {
                     //鏌ヨ浼氬憳
                     member = memberService.getById(connect.getUserId());
                     //濡傛灉鏈粦瀹氫細鍛橈紝鍒欐妸鍒氭墠鏌ヨ鍒扮殑鑱斿悎鐧诲綍琛ㄦ暟鎹垹闄�
                     if (member == null) {
                         this.remove(queryWrapper);
-                        member = memberService.autoRegister(authUser);
+
+                        member = memberService.autoRegister(authUser,encryptTwice);
                     }
                 }
+            }else {
+                if (StringUtils.isBlank(member.getMobile())) {
+                    member.setMobile(authUser.getPhone());
+                    memberService.updateById(member);
+                }
             }
 
             //鍙戦�佺敤鎴风涓夋柟鐧诲綍娑堟伅

--
Gitblit v1.8.0