From 21df2614d8fa8013bce2f560de20438cba825816 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 02 二月 2026 12:57:29 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 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 0885b03..6865e1a 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
@@ -274,15 +274,6 @@
userInfo.setOnconUUID(onconUUID);
}
- //用户所属企业
- if(null != registAreaCode){
- Company query = companyCityService.query(registAreaCode);
- userInfo.setCompanyId(null != query ? query.getId() : 1);
- userInfo.setRegistAreaCode(registAreaCode);
- }else {
- userInfo.setCompanyId(1);
- }
-
this.insert(userInfo);
this.addCoupon(userInfo);//添加优惠券
@@ -299,6 +290,16 @@
}).start();
}
+ //用户所属企业
+ if(null != registAreaCode){
+ Company query = companyCityService.query(registAreaCode);
+ userInfo.setCompanyId(null != query ? query.getId() : 1);
+ userInfo.setRegistAreaCode(registAreaCode);
+ }else {
+ userInfo.setCompanyId(1);
+ }
+ this.updateById(userInfo);
+
if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
@@ -372,15 +373,6 @@
userInfo.setBalance(0D);
userInfo.setState(1);
userInfo.setOnconUUID(onconUUID);
-
- //用户所属企业
- if(null != registAreaCode){
- Company query = companyCityService.query(registAreaCode);
- userInfo.setCompanyId(null != query ? query.getId() : 1);
- userInfo.setRegistAreaCode(registAreaCode);
- }else {
- userInfo.setCompanyId(1);
- }
this.insert(userInfo);
this.addCoupon(userInfo);//添加优惠券
@@ -397,6 +389,18 @@
}).start();
}
+
+ //用户所属企业
+ if(null != registAreaCode){
+ Company query = companyCityService.query(registAreaCode);
+ userInfo.setCompanyId(null != query ? query.getId() : 1);
+ userInfo.setRegistAreaCode(registAreaCode);
+ }else {
+ userInfo.setCompanyId(1);
+ }
+ this.updateById(userInfo);
+
+
if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
@@ -571,15 +575,7 @@
userInfo.setConsumption(0D);
userInfo.setBalance(0D);
userInfo.setState(1);
- //用户所属企业
- if(ToolUtil.isNotEmpty(registAreaCode)){
- Company query = companyCityService.query(registAreaCode);
- userInfo.setCompanyId(null != query ? query.getId() : 1);
- userInfo.setRegistAreaCode(registAreaCode);
- }else {
- userInfo.setCompanyId(1);
- }
- this.insert(userInfo);
+
this.addCoupon(userInfo);//添加优惠券
@@ -597,6 +593,17 @@
if (userInfo.getState() == 2) {
return ResultUtil.error("账号被冻结");
}
+
+ //用户所属企业
+ if(ToolUtil.isNotEmpty(registAreaCode)){
+ Company query = companyCityService.query(registAreaCode);
+ userInfo.setCompanyId(null != query ? query.getId() : 1);
+ userInfo.setRegistAreaCode(registAreaCode);
+ }else {
+ userInfo.setCompanyId(1);
+ }
+ this.updateById(userInfo);
+
if (type == 2) {//小程序登录
//调用单点登录的逻辑
--
Gitblit v1.7.1