From 0f79643e35af90cb63a4b3c67ee72abfe0e37770 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 01 八月 2025 12:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 37042ea..42947b9 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
@@ -27,7 +27,6 @@
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
-import org.apache.commons.lang.time.DateUtils;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
@@ -51,7 +50,6 @@
import java.net.URLConnection;
import java.security.spec.AlgorithmParameterSpec;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
@@ -236,6 +234,7 @@
}
//调中台接口查询用户
List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
if (null == infoByPhone || infoByPhone.isEmpty()) {
RegisterViaMobileRequest request = new RegisterViaMobileRequest();
request.setMobile(phone);
@@ -248,6 +247,7 @@
if (!"0".equals(register.getStatus())) {
return ResultUtil.error(register.getDesc());
}
+ onconUUID = register.getOnconUUID();
} else {
boolean b = this.checkCaptcha(phone, code);
if (!b) {
@@ -265,6 +265,9 @@
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
+ if(null != onconUUID){
+ userInfo.setOnconUUID(onconUUID);
+ }
//用户所属企业
if(null != registAreaCode){
@@ -868,7 +871,8 @@
nickName = userInfo.getNickName();
}
//调中台接口查询用户
- List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
+ String onconUUID = null;
+ List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
if (null == infoByPhone || infoByPhone.isEmpty()) {
RegisterViaMobileRequest request = new RegisterViaMobileRequest();
request.setMobile(phone);
@@ -881,6 +885,7 @@
if (!"0".equals(register.getStatus())) {
return ResultUtil.error(register.getDesc());
}
+ onconUUID = register.getOnconUUID();
} else {
boolean b = this.checkCaptcha(phone, code);
if (!b) {
@@ -895,6 +900,7 @@
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")) {//小程序登录后绑定手机号码
@@ -944,7 +950,7 @@
loginWarpper.setPhone(2);
return ResultUtil.success(loginWarpper);
}
-
+ userInfo.setOnconUUID(onconUUID);
userInfo.setPhone(phone);
userInfo.setUpdateTime(new Date());
userInfo.setUpdateUser(userInfo.getId());
--
Gitblit v1.7.1