From aea4be235d49d8fe3030a1477d80d67b3fd2839e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:24:25 +0800
Subject: [PATCH] 登录添加openid判断
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
index f8cfe72..1630c25 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.service.impl;
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import com.alipay.api.response.AlipayUserInfoShareResponse;
import com.alipay.api.response.AlipayUserUserinfoShareResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -11,6 +12,7 @@
import com.ruoyi.account.service.TAppUserService;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.account.wx.pojo.AppletUserDecodeData;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUserApplet;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +49,17 @@
.eq(TAppUser::getPhone, appletUserDecodeData.getPhoneNumber())
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
- appUser = new TAppUser();
- appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
+ .eq(TAppUser::getWxOpenid, appletUserDecodeData.getOpenId())
+ .last("LIMIT 1"));
+ if(Objects.isNull(appUser)){
+ appUser = new TAppUser();
+ appUser.setPhone(appletUserDecodeData.getPhoneNumber());
+ }
}
+ }
+ if(Objects.nonNull(appUser.getStatus())){
+ throwInfo(appUser.getStatus());
}
appUser.setAvatar(appletUserDecodeData.getAvatarUrl());
appUser.setCity(appletUserDecodeData.getCity());
@@ -61,31 +71,69 @@
}
@Override
- public Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response, AlipayUserUserinfoShareResponse userInfo) {
+ public Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response,String phone) {
// 通过手机号查询用户，是否已存在手动导入用户，包含微信用户
TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
- .eq(TAppUser::getPhone, userInfo.getMobile())
+ .eq(TAppUser::getPhone, phone)
.isNull(TAppUser::getAliOpenid)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
// 先使用openId和当前手机号进行查询
appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getAliOpenid, response.getOpenId())
- .eq(TAppUser::getPhone, userInfo.getMobile())
+ .eq(TAppUser::getPhone, phone)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
- appUser = new TAppUser();
- appUser.setPhone(userInfo.getMobile());
+ appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
+ .eq(TAppUser::getAliOpenid, response.getOpenId())
+ .last("LIMIT 1"));
+ if(Objects.isNull(appUser)){
+ appUser = new TAppUser();
+ appUser.setPhone(phone);
+ }
}
}
- appUser.setAvatar(userInfo.getAvatar());
- appUser.setCity(userInfo.getCity());
- appUser.setName(userInfo.getNickName());
- appUser.setProvince(userInfo.getProvince());
+ if(Objects.nonNull(appUser.getStatus())){
+ throwInfo(appUser.getStatus());
+ }
appUser.setAliOpenid(response.getOpenId());
this.saveOrUpdate(appUser);
return this.getUserInfo(appUser);
}
+// @Override
+// public Map<String, Object> aliLogin(AlipaySystemOauthTokenResponse response, AlipayUserInfoShareResponse userInfo) {
+// // 通过手机号查询用户，是否已存在手动导入用户，包含微信用户
+// TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
+// .eq(TAppUser::getPhone, userInfo.getMobile())
+// .isNull(TAppUser::getAliOpenid)
+// .last("LIMIT 1"));
+// if(Objects.isNull(appUser)){
+// // 先使用openId和当前手机号进行查询
+// appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
+// .eq(TAppUser::getAliOpenid, response.getOpenId())
+// .eq(TAppUser::getPhone, userInfo.getMobile())
+// .last("LIMIT 1"));
+// if(Objects.isNull(appUser)){
+// appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
+// .eq(TAppUser::getAliOpenid, response.getOpenId())
+// .last("LIMIT 1"));
+// if(Objects.isNull(appUser)){
+// appUser = new TAppUser();
+// appUser.setPhone(userInfo.getMobile());
+// }
+// }
+// }
+// if(Objects.nonNull(appUser.getStatus())){
+// throwInfo(appUser.getStatus());
+// }
+// appUser.setAvatar(userInfo.getAvatar());
+// appUser.setCity(userInfo.getCity());
+// appUser.setName(userInfo.getNickName());
+// appUser.setProvince(userInfo.getProvince());
+// appUser.setAliOpenid(response.getOpenId());
+// this.saveOrUpdate(appUser);
+// return this.getUserInfo(appUser);
+// }
@Override
public Map<String, Object> getUserInfo(TAppUser appUser) {
@@ -102,4 +150,16 @@
tokenInfos.put("info",loginUserApplet);
return tokenInfos;
}
+
+ @Override
+ public void throwInfo(Integer status){
+ switch (status){
+ case 2:
+ throw new ServiceException("账号被冻结,请联系管理员");
+ case 3:
+ throw new ServiceException("账号已注销,请重新注册使用");
+ default:
+ break;
+ }
+ }
}
--
Gitblit v1.7.1