From 064fad7914360e15db42162560da26f88c8ced9e Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Thu, 24 Apr 2025 18:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=80=9A=E5=91=8A=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java       | 4 ++--
 .../com/ruoyi/member/service/IMemberUserService.java     | 2 +-
 .../ruoyi/member/service/impl/MemberUserServiceImpl.java | 9 ++++++++-
 .../ruoyi/web/controller/system/SysLoginController.java  | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
index 111a7cb..4e476f4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
@@ -33,9 +33,9 @@ public class WxApi {
 
     @GetMapping("/getCodeUrl")
     @Anonymous
-    public Map<String, String> getCodeUrl(String userType) {
+    public Map<String, String> getCodeUrl(String userType,String url) {
         Map<String, String> res = new HashMap<>();
-        res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType));
+        res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/"+url, userType));
         return  res;
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
index 12129c0..3ca7ce7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
@@ -67,7 +67,7 @@ public interface IMemberUserService extends IService<MemberUser> {
      * @author vinjor-M
      * @date 15:55 2025/3/26
      **/
-    String wxLogin(String openid, String decryptResult);
+    String wxLogin(String openid, String decryptResult,String unionId);
 
     /**
      * uniApp保存会员信息
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
index dc2fa33..2f3e8de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
@@ -160,7 +160,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String wxLogin(String openid, String decryptResult) {
+    public String wxLogin(String openid, String decryptResult,String unionid) {
         //字符串转json
         JSONObject jsonObject = JSONObject.parseObject(decryptResult);
         //手机号
@@ -171,6 +171,10 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
         if(null==wxUser){
             //根据openId没查到，再根据手机号查
             wxUser = userMapper.selectWxUserByOpenIdOrPhone(null,phone,null,null);
+            if(null==wxUser&& StringUtils.isNotEmpty(unionid)){
+                //根据openId没查到，再根据unionid查
+                wxUser = userMapper.selectWxUserByOpenIdOrPhone(null,null,null,unionid);
+            }
         }
         //如果查不到，则新增，查到了，则更新
         SysUser user = new SysUser();
@@ -183,6 +187,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
             user.setPhonenumber(phone);
             user.setSex("2");
             user.setCreateTime(DateUtils.getNowDate());
+            user.setUnionId(unionid);
             //新增 用户
             userMapper.insertUser(user);
             //插入用户扩展信息表数据
@@ -202,6 +207,8 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
             if(!openid.equals(user.getOpenId())){
                 user.setOpenId(openid);
                 user.setUpdateTime(DateUtils.getNowDate());
+                user.setUnionId(unionid);
+                user.setPhonenumber(phone);
                 userMapper.updateUser(user);
             }
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index fbe81e0..6a32cdb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -101,7 +101,7 @@ public class SysLoginController
 
         if (StringUtils.hasText(decryptResult)){
             //如果解析成功,获取token
-            String token = memberUserService.wxLogin(openid,decryptResult);
+            String token = memberUserService.wxLogin(openid,decryptResult,jsonObject.getString("unionid"));
             AjaxResult ajax = AjaxResult.success();
             ajax.put(Constants.TOKEN, token);
             return ajax;