From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 452 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 318 insertions(+), 134 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 403529c..6a2f842 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -16,7 +16,13 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.qianyuntong.AESUtils;
import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
+import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.RegisterViaMobile;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.RegisterViaMobileRequest;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.SendSmsRequest;
import com.stylefeng.guns.modular.system.warpper.LoginWarpper;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
@@ -52,25 +58,25 @@
@Service
public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements IUserInfoService {
-
+
@Resource
private UserInfoMapper userInfoMapper;
-
+
@Resource
private UserActivityInviteMapper userActivityInviteMapper;
- @Autowired
- private RedisTemplate redisTemplate;
-
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
@Autowired
private ALiSendSms aLiSendSms;
-
+
@Autowired
private WeChatUtil weChatUtil;
-
+
@Autowired
private IPaymentRecordService paymentRecordService;
-
+
@Autowired
private ICompanyCityService companyCityService;
@@ -119,6 +125,9 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
+
+
@Value("${callbackPath}")
private String callbackPath;
@@ -137,25 +146,25 @@
public ResultUtil queryCaptcha(String phone, Integer type) throws Exception {
Random random = new Random();
StringBuffer sb = new StringBuffer();
- for(int i = 0; i < 4; i++){
+ for (int i = 0; i < 4; i++) {
sb.append((int) (random.nextDouble() * 10));
}
String authCode = sb.toString();
- String templateCode = "";
- switch (type){
- case 1:
- templateCode = "SMS_154775435";//身份验证
- break;
- case 2:
- templateCode = "SMS_154775434";//登录确认
- break;
- case 3:
- templateCode = "SMS_154775432";//用户注册
- break;
- case 4:
- templateCode = "SMS_154775431";//修改密码
- break;
- }
+// String templateCode = "";
+// switch (type){
+// case 1:
+// templateCode = "SMS_154775435";//身份验证
+// break;
+// case 2:
+// templateCode = "SMS_154775434";//登录确认
+// break;
+// case 3:
+// templateCode = "SMS_154775432";//用户注册
+// break;
+// case 4:
+// templateCode = "SMS_154775431";//修改密码
+// break;
+// }
// String sData = aLiSendSms.sendSms(phone, "SMS_229715276", "{\"code\":\"" + authCode + "\"}");
// JSONObject jsonObject = JSON.parseObject(sData);
// String message = jsonObject.getString("Message");
@@ -163,11 +172,24 @@
// System.err.println(message);
// return ResultUtil.error(message);
// }
- SMSUtil.sendVerifyCode(phone);
- String sms = "短信验证码【" + authCode + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!";
- //发送验证码短信
- redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
- System.out.println("【" + phone + "】" + sms);
+
+ //中台没有用户数据，需要走注册接口，验证码校验走中台
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ SMSUtil.sendVerifyCode(phone);
+ } else {
+ SendSmsRequest request = new SendSmsRequest();
+ request.setDestAddress(phone);
+ request.setTemplateId("TPL202410290001");
+ Map<String, String> templateParams = new HashMap<>();
+ templateParams.put("code", authCode);
+ request.setTemplateParams(templateParams);
+ request.setCode("code");
+ request.setSpId("T8d5hdfg");
+ SMSUtil.sendSms(request);
+ //发送验证码短信
+ redisTemplate.opsForValue().set(phone, authCode, 5, TimeUnit.MINUTES);//设置五分钟过期
+ }
return ResultUtil.success();
}
@@ -181,16 +203,16 @@
*/
@Override
public boolean checkCaptcha(String phone, String code) throws Exception {
- Object value = redisTemplate.opsForValue().get(phone);
- if("1234".equals(code)){
+ if ("1234".equals(code)) {
return true;
}
- System.out.println("phone:"+phone);
- System.out.println("code:"+code);
- System.out.println("code---"+String.valueOf(value));
- if(null != value && code.equals(String.valueOf(value))){
+ Object value = redisTemplate.opsForValue().get(phone);
+ System.out.println("phone:" + phone);
+ System.out.println("code:" + code);
+ System.out.println("code---" + String.valueOf(value));
+ if (null != value && code.equals(String.valueOf(value))) {
return true;
- }else{
+ } else {
return false;
}
}
@@ -203,24 +225,50 @@
*/
@Override
public synchronized ResultUtil<LoginWarpper> captchaLogin(String phone, String code, String registIp, String registAreaCode,String loginType) throws Exception {
- boolean b = this.checkCaptcha(phone, code);
- if(!b){
- return ResultUtil.error("验证码无效");
- }
-
UserInfo userInfo = userInfoMapper.queryByPhone(phone);
- if(null == userInfo){
- ArrayList<UserBankAccount> userBankAccounts = new ArrayList<>();
-
+ String nickName = null;
+ if (null == userInfo) {
+ nickName = this.getDefaultName();
+ } else {
+ nickName = userInfo.getNickName();
+ }
+ //调中台接口查询用户
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ RegisterViaMobileRequest request = new RegisterViaMobileRequest();
+ request.setMobile(phone);
+ request.setEncryptType("aesbase64");
+ request.setPassword(AESUtils.encryptBase64("123456"));
+ request.setNickname(nickName);
+ request.setVerify_code(code);
+ request.setVerify_code_type("0");
+ RegisterViaMobile register = UserUtil.registerViaMobile(request);
+ if (!"0".equals(register.getStatus())) {
+ return ResultUtil.error(register.getDesc());
+ }
+ onconUUID = register.getOnconUUID();
+ } else {
+ boolean b = this.checkCaptcha(phone, code);
+ if (!b) {
+ return ResultUtil.error("验证码无效");
+ }
+ }
+
+ if (null == userInfo) {
userInfo = new UserInfo();
+ userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
userInfo.setPhone(phone);
userInfo.setPassWord(ShiroKit.md5("", salt));
- userInfo.setNickName(this.getDefaultName());
+ userInfo.setNickName(nickName);
userInfo.setRegistIp(registIp);
userInfo.setIsAuth(1);
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
+ if(null != onconUUID){
+ userInfo.setOnconUUID(onconUUID);
+ }
//用户所属企业
if(null != registAreaCode){
@@ -230,30 +278,31 @@
}else {
userInfo.setCompanyId(1);
}
+
this.insert(userInfo);
this.addCoupon(userInfo);//添加优惠券
-
+
UserInfo finalUserInfo = userInfo;
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){
+ if (pushMinistryOfTransport) {
//上传数据
pushMinistryOfTransportUtil.baseInfoPassenger(finalUserInfo.getId());
}
}
}).start();
-
+
}
- if(userInfo.getState() == 2){
+ if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
-
+
//调用单点登录的逻辑
- this.singlePointLogin(userInfo.getId(),loginType);
-
- String token = this.getToken(userInfo, "",loginType);
+ this.singlePointLogin(userInfo.getId(), loginType);
+
+ String token = this.getToken(userInfo, "", loginType);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(userInfo.getId());
loginWarpper.setToken(token);
@@ -261,40 +310,62 @@
loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
loginWarpper.setPhone(2);
-
+
smsrecordService.saveData(1, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success(loginWarpper);
}
/**
- * 手机验证码登录
+ * 手机一键登录
* @param accessToken
* @return
*/
@Override
public ResultUtil<LoginWarpper> oneClickLogin(String accessToken, String registIp, String registAreaCode,String loginType,String androidOrIos) throws Exception {
- String response = GetMobile.getPhone(accessToken,androidOrIos);
-
- if(response==null){
+ String response = GetMobile.getPhone(accessToken, androidOrIos);
+
+ if (response == null) {
return ResultUtil.error("登录失败");
}
- System.out.println( response);
+ System.out.println(response);
JSONObject json = JSONObject.parseObject(response);
- if(!json.getBoolean("success")){
+ if (!json.getBoolean("success")) {
return ResultUtil.error("登录失败");
}
String phone = json.getJSONObject("data").getString("mobile");
+
+ //调中台接口查询用户
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
+ String nickName = this.getDefaultName();
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ RegisterViaMobileRequest request = new RegisterViaMobileRequest();
+ request.setMobile(phone);
+ request.setEncryptType("aesbase64");
+ request.setPassword(AESUtils.encryptBase64("123456"));
+ request.setNickname(nickName);
+ RegisterViaMobile register = UserUtil.registerViaMobile(request);
+ if (!"0".equals(register.getStatus())) {
+ return ResultUtil.error(register.getDesc());
+ }
+ onconUUID = register.getOnconUUID();
+ }else{
+ onconUUID = UserUtil.getOnconUUIDByMobile(phone);
+ }
+
UserInfo userInfo = userInfoMapper.queryByPhone(phone);
- if(null == userInfo){
+ if (null == userInfo) {
userInfo = new UserInfo();
+ userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
userInfo.setPhone(phone);
userInfo.setPassWord(ShiroKit.md5("", salt));
- userInfo.setNickName(this.getDefaultName());
+ userInfo.setNickName(nickName);
userInfo.setRegistIp(registIp);
userInfo.setIsAuth(1);
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
-
+ userInfo.setOnconUUID(onconUUID);
+
//用户所属企业
if(null != registAreaCode){
Company query = companyCityService.query(registAreaCode);
@@ -311,22 +382,21 @@
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){
+ if (pushMinistryOfTransport) {
//上传数据
pushMinistryOfTransportUtil.baseInfoPassenger(finalUserInfo.getId());
}
}
}).start();
-
+
}
- if(userInfo.getState() == 2){
+ if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
-
//调用单点登录的逻辑
- this.singlePointLogin(userInfo.getId(),loginType);
-
- String token = this.getToken(userInfo, "",loginType);
+ this.singlePointLogin(userInfo.getId(), loginType);
+
+ String token = this.getToken(userInfo, "", loginType);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(userInfo.getId());
loginWarpper.setToken(token);
@@ -334,8 +404,6 @@
loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
loginWarpper.setPhone(2);
-
- //smsrecordService.saveData(1, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success(loginWarpper);
}
@Override
@@ -428,14 +496,20 @@
*/
@Override
public ResultUtil<LoginWarpper> userLogin(String phone, String password,String loginType) throws Exception {
- UserInfo userInfo = this.queryByPhone(phone);
- if(null == userInfo){
+ //调中台接口查询用户
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
return ResultUtil.error("账号无效");
}
- if(userInfo.getState() == 2){
+
+ UserInfo userInfo = this.queryByPhone(phone);
+ if (null == userInfo) {
+ return ResultUtil.error("账号无效");
+ }
+ if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
- if(!ShiroKit.md5(password, salt).equals(userInfo.getPassWord())){
+ if (!ShiroKit.md5(password, salt).equals(userInfo.getPassWord())) {
return ResultUtil.error("密码错误");
}
@@ -446,18 +520,22 @@
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(userInfo.getId());
loginWarpper.setToken(token);
+ loginWarpper.setExpirationTime(15552000L);
loginWarpper.setAppid(UUIDUtil.getRandomCode());
loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
return ResultUtil.success(loginWarpper);
}
+
+
+
@Override
public ResultUtil<LoginWarpper> wxLogin(Integer type, String openid, String unionid, String jscode, String registIp,
String registAreaCode, Integer sex, String nickName, String avatar,String loginType) throws Exception {
UserInfo userInfo = null;
- String sessionKey=null;
- if(type == 2){//小程序
- if(ToolUtil.isEmpty(jscode)){
+ String sessionKey = null;
+ if (type == 2) {//小程序
+ if (ToolUtil.isEmpty(jscode)) {
return ResultUtil.error("微信登录请求失败，请重试");
}
Map<String, String> map = weChatUtil.code2Session(jscode);
@@ -465,22 +543,20 @@
unionid = map.get("unionid");
sessionKey = map.get("sessionKey");
userInfo = userInfoMapper.queryByOpenid2(openid);
-
-
-
- }else{//APP
+ } else {//APP
userInfo = userInfoMapper.queryByOpenid(openid);
}
- if(null == userInfo){
+ if (null == userInfo) {
userInfo = new UserInfo();
+ userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
userInfo.setPassWord(ShiroKit.md5("", salt));
userInfo.setRegistIp(registIp);
userInfo.setSex(sex);
userInfo.setNickName(ToolUtil.isNotEmpty(nickName) ? nickName : this.getDefaultName());
userInfo.setAvatar(avatar);
- if(type == 2){
+ if (type == 2) {
userInfo.setAppletsOpenId(openid);
- }else{
+ } else {
userInfo.setOpenId(openid);
}
userInfo.setUnionid(unionid);
@@ -504,32 +580,48 @@
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){
+ if (pushMinistryOfTransport) {
//上传数据
pushMinistryOfTransportUtil.baseInfoPassenger(finalUserInfo.getId());
}
}
}).start();
}
- if(userInfo.getState() == 2){
+ if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
-
- if(type == 2){//小程序登录
+
+ if (type == 2) {//小程序登录
String value = (String) redisTemplate.opsForValue().get("appletOpenId");
JSONObject jsonObject = null;
- if(ToolUtil.isNotEmpty(value)){
+ if (ToolUtil.isNotEmpty(value)) {
jsonObject = JSON.parseObject(value);
- }else{
+ } else {
jsonObject = new JSONObject();
}
jsonObject.put(userInfo.getId().toString(), userInfo.getAppletsOpenId());
redisTemplate.opsForValue().set("appletOpenId", jsonObject.toJSONString());
+ //调用单点登录的逻辑
+ this.singlePointLogin(userInfo.getId(), loginType);
+ String token = this.getToken(userInfo, "", loginType);
+ redisTemplate.opsForValue().set(token.substring(token.length() - 32), String.valueOf(userInfo.getId()), 180, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getPhone(), token.substring(token.length() - 32));
+ redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getId(), token);
+
+ LoginWarpper loginWarpper = new LoginWarpper();
+ loginWarpper.setId(userInfo.getId());
+ loginWarpper.setToken(token);
+ loginWarpper.setAppid(UUIDUtil.getRandomCode());
+ loginWarpper.setPhone(ToolUtil.isNotEmpty(userInfo.getPhone()) ? 2 : 1);
+ loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
+ loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
+ return ResultUtil.success(loginWarpper);
}
-
+
+
//调用单点登录的逻辑
- this.singlePointLogin(userInfo.getId(),loginType);
- String token = this.getToken(userInfo, "",loginType);
+ this.singlePointLogin(userInfo.getId(), loginType);
+ String token = this.getToken(userInfo, "", loginType);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(userInfo.getId());
loginWarpper.setToken(token);
@@ -563,6 +655,10 @@
openid = map.get("openid");
unionid = map.get("unionid");
sessionKey = map.get("sessionKey");
+ if(ToolUtil.isEmpty(phone)){
+ phone = getPhone(sessionKey, encryptedData, iv);
+ }
+
if(ToolUtil.isNotEmpty(phone)){
List<UserInfo> phone1 = userInfoMapper.selectList(new EntityWrapper<UserInfo>().eq("phone", phone).eq("state",1).ne("flag",3));
if(phone1.size()>0){
@@ -574,24 +670,34 @@
}else {
userInfo = userInfoMapper.queryByOpenid2(openid);
}
- System.out.println(userInfo);
- if(ToolUtil.isEmpty(phone) && ToolUtil.isNotEmpty(userInfo) && ToolUtil.isEmpty(userInfo.getPhone())){
- String phone1 = getPhone(sessionKey, encryptedData, iv);
- userInfo.setPhone(phone1);
- userInfoMapper.updateById(userInfo);
- }
-
-
-
}else{//APP
userInfo = userInfoMapper.queryByOpenid(openid);
}
+ //调中台接口查询用户
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
+ nickName = this.getDefaultName();
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ RegisterViaMobileRequest request = new RegisterViaMobileRequest();
+ request.setMobile(phone);
+ request.setEncryptType("aesbase64");
+ request.setPassword(AESUtils.encryptBase64("123456"));
+ request.setNickname(nickName);
+ RegisterViaMobile register = UserUtil.registerViaMobile(request);
+ if (!"0".equals(register.getStatus())) {
+ return ResultUtil.error(register.getDesc());
+ }
+ onconUUID = register.getOnconUUID();
+ }else{
+ onconUUID = UserUtil.getOnconUUIDByMobile(phone);
+ }
+
int i =0;
if(null == userInfo){
userInfo = new UserInfo();
+ userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
if(ToolUtil.isEmpty(phone)){
- String phone2 = getPhone(sessionKey, encryptedData, iv);
- List<UserInfo> phone1 = userInfoMapper.selectList(new EntityWrapper<UserInfo>().eq("phone", phone2).eq("state",1).ne("flag",3));
+ List<UserInfo> phone1 = userInfoMapper.selectList(new EntityWrapper<UserInfo>().eq("phone", phone).eq("state",1).ne("flag",3));
if(phone1.size()>0){
userInfo = phone1.get(0);
userInfo.setUnionid(unionid);
@@ -599,7 +705,7 @@
userInfoMapper.updateById(userInfo);
i=1;
}else {
- userInfo.setPhone(phone2);
+ userInfo.setPhone(phone);
}
}else {
userInfo.setPhone(phone);
@@ -609,8 +715,9 @@
userInfo.setRegistIp(registIp);
userInfo.setSex(sex);
- userInfo.setNickName(ToolUtil.isNotEmpty(nickName) ? nickName : this.getDefaultName());
+ userInfo.setNickName(nickName);
userInfo.setAvatar(avatar);
+ userInfo.setOnconUUID(onconUUID);
if(type == 2){
userInfo.setAppletsOpenId(openid);
@@ -637,7 +744,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- if(pushMinistryOfTransport){
+ if (pushMinistryOfTransport) {
//上传数据
pushMinistryOfTransportUtil.baseInfoPassenger(finalUserInfo.getId());
}
@@ -645,23 +752,36 @@
}).start();
}
}
-
-
-
- if(userInfo.getState() == 2){
+
+ if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
-
- if(type == 2){//小程序登录
+
+ if (type == 2) {//小程序登录
String value = (String) redisTemplate.opsForValue().get("appletOpenId");
JSONObject jsonObject = null;
- if(ToolUtil.isNotEmpty(value)){
+ if (ToolUtil.isNotEmpty(value)) {
jsonObject = JSON.parseObject(value);
- }else{
+ } else {
jsonObject = new JSONObject();
}
jsonObject.put(userInfo.getId().toString(), userInfo.getAppletsOpenId());
redisTemplate.opsForValue().set("appletOpenId", jsonObject.toJSONString());
+ //调用单点登录的逻辑
+ this.singlePointLogin(userInfo.getId(), loginType);
+ String token = this.getToken(userInfo, "", loginType);
+ redisTemplate.opsForValue().set(token.substring(token.length() - 32), String.valueOf(userInfo.getId()), 180, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getPhone(), token.substring(token.length() - 32));
+ redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getId(), token);
+
+ LoginWarpper loginWarpper = new LoginWarpper();
+ loginWarpper.setId(userInfo.getId());
+ loginWarpper.setToken(token);
+ loginWarpper.setAppid(UUIDUtil.getRandomCode());
+ loginWarpper.setPhone(ToolUtil.isNotEmpty(userInfo.getPhone()) ? 2 : 1);
+ loginWarpper.setEmergencyContact(userInfo.getEmergencyContact());
+ loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber());
+ return ResultUtil.success(loginWarpper);
}
//调用单点登录的逻辑
@@ -783,28 +903,54 @@
*/
@Override
public ResultUtil bindingPhone(Integer uid, String phone, String code,String loginType) throws Exception {
- boolean b = this.checkCaptcha(phone, code);
- if(!b){
- return ResultUtil.error("验证码无效");
- }
UserInfo userInfo = this.selectById(uid);
+ String nickName = null;
+ if (null == userInfo) {
+ nickName = this.getDefaultName();
+ } else {
+ nickName = userInfo.getNickName();
+ }
+ //调中台接口查询用户
+ String onconUUID = null;
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ if (null == infoByPhone || infoByPhone.isEmpty()) {
+ RegisterViaMobileRequest request = new RegisterViaMobileRequest();
+ request.setMobile(phone);
+ request.setEncryptType("aesbase64");
+ request.setPassword(AESUtils.encryptBase64("123456"));
+ request.setNickname(nickName);
+ request.setVerify_code(code);
+ request.setVerify_code_type("0");
+ RegisterViaMobile register = UserUtil.registerViaMobile(request);
+ if (!"0".equals(register.getStatus())) {
+ return ResultUtil.error(register.getDesc());
+ }
+ onconUUID = register.getOnconUUID();
+ } else {
+ boolean b = this.checkCaptcha(phone, code);
+ if (!b) {
+ return ResultUtil.error("验证码无效");
+ }
+ onconUUID = UserUtil.getOnconUUIDByMobile(phone);
+ }
UserInfo userInfo1 = userInfoMapper.queryByPhone(phone);
- if(null != userInfo1){
+ if (null != userInfo1) {
userInfo1.setOpenId(userInfo.getOpenId());
userInfo1.setUnionid(userInfo.getUnionid());
userInfo1.setAppletsOpenId(userInfo.getAppletsOpenId());
userInfo1.setAvatar(userInfo.getAvatar());
userInfo1.setSex(userInfo.getSex());
userInfo1.setNickName(userInfo.getNickName());
+ userInfo1.setOnconUUID(onconUUID);
this.updateById(userInfo1);
-
- if(ToolUtil.isNotEmpty(loginType) && loginType.equals("Applets")){//小程序登录后绑定手机号码
+
+ if (ToolUtil.isNotEmpty(loginType) && loginType.equals("Applets")) {//小程序登录后绑定手机号码
String value = (String) redisTemplate.opsForValue().get("appletOpenId");
JSONObject jsonObject = null;
- if(ToolUtil.isNotEmpty(value)){
+ if (ToolUtil.isNotEmpty(value)) {
jsonObject = JSON.parseObject(value);
jsonObject.remove(userInfo.getId().toString());//删除原有账号缓存的数据
- }else{
+ } else {
jsonObject = new JSONObject();
}
jsonObject.put(userInfo1.getId().toString(), userInfo.getAppletsOpenId());
@@ -834,10 +980,10 @@
}
userCouponRecordService.deleteById(ucr.getId());
}
-
-
+
+
//获取新的token等数据
- String token = this.getToken(userInfo1, "",loginType);
+ String token = this.getToken(userInfo1, "", loginType);
LoginWarpper loginWarpper = new LoginWarpper();
loginWarpper.setId(userInfo1.getId());
loginWarpper.setToken(token);
@@ -845,12 +991,12 @@
loginWarpper.setPhone(2);
return ResultUtil.success(loginWarpper);
}
-
+ userInfo.setOnconUUID(onconUUID);
userInfo.setPhone(phone);
userInfo.setUpdateTime(new Date());
userInfo.setUpdateUser(userInfo.getId());
this.updateById(userInfo);
-
+
smsrecordService.saveData(2, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success(new LoginWarpper());
}
@@ -996,6 +1142,8 @@
if(!b){
return ResultUtil.error("验证码无效");
}
+
+
UserInfo userInfo = this.selectById(uid);
UserInfo userInfo1 = userInfoMapper.queryByPhone(phone);
if(null != userInfo1){
@@ -1004,7 +1152,6 @@
userInfo.setPhone(phone);
this.updateById(userInfo);
-// smsrecordService.saveData(2, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
return ResultUtil.success();
}
@@ -1348,7 +1495,7 @@
*/
public String getDefaultName(){
int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
- return "JYX" + String.valueOf(num).substring(1);
+ return "GRJY" + String.valueOf(num).substring(1);
}
/**
@@ -1452,7 +1599,7 @@
boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
usernamePasswordToken, simpleAuthenticationInfo);
String s = JwtTokenUtil.generateToken(String.valueOf(userInfo.getId()));
- redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 180, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getPhone(), s.substring(s.length() - 32));
redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getId(), s);
return s;
@@ -1527,4 +1674,41 @@
}
return ResultUtil.success(loginWarpper);
}
+
+
+ @Override
+ public String addAppUser(String phone, String code, String areaCode, String onconUUID) throws Exception {
+ UserInfo userInfo = userInfoMapper.queryByPhone(phone);
+ String nickName = null;
+ if (null == userInfo) {
+ nickName = this.getDefaultName();
+ } else {
+ nickName = userInfo.getNickName();
+ }
+ //调中台接口查询用户
+ if (null == userInfo) {
+ userInfo = new UserInfo();
+ userInfo.setAvatar("https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d081e7a9-13d4-4eec-afb6-afd10885a664.png");
+ userInfo.setPhone(phone);
+ userInfo.setPassWord(ShiroKit.md5("", salt));
+ userInfo.setNickName(nickName);
+ userInfo.setIsAuth(1);
+ userInfo.setConsumption(0D);
+ userInfo.setBalance(0D);
+ userInfo.setState(1);
+ userInfo.setOnconUUID(onconUUID);
+
+ //用户所属企业
+ if(null != areaCode){
+ Company query = companyCityService.query(areaCode);
+ userInfo.setCompanyId(null != query ? query.getId() : 1);
+ userInfo.setRegistAreaCode(areaCode);
+ }else {
+ userInfo.setCompanyId(1);
+ }
+
+ this.insert(userInfo);
+ }
+ return userInfo.getId().toString();
+ }
}
--
Gitblit v1.7.1