From a85ab71180fdcb02b3cae304ebc96bb2ca12423c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 17:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 da2a033..879ca16 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
@@ -46,17 +46,18 @@
TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getPhone, appletUserDecodeData.getPhoneNumber())
.isNull(TAppUser::getWxOpenid)
+ .eq(TAppUser::getStatus,1)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
// 先使用openId和当前手机号进行查询
appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getWxOpenid, appletUserDecodeData.getOpenId())
.eq(TAppUser::getPhone, appletUserDecodeData.getPhoneNumber())
+ .eq(TAppUser::getStatus,1)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(appletUserDecodeData.getPhoneNumber());
- appUser.setInviteUserId(inviteUserId);
}
}
if(Objects.nonNull(appUser.getStatus())){
@@ -71,7 +72,9 @@
break;
}
}
-
+ if(Objects.nonNull(inviteUserId)){
+ appUser.setInviteUserId(inviteUserId);
+ }
appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"http://221.182.45.100:8090/2024-10-26/logo.png");
appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName():RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
appUser.setCity(appletUserDecodeData.getCity());
@@ -90,17 +93,18 @@
TAppUser appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getPhone, phone)
.isNull(TAppUser::getAliOpenid)
+ .eq(TAppUser::getStatus,1)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
// 先使用openId和当前手机号进行查询
appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
.eq(TAppUser::getAliOpenid, response.getOpenId())
.eq(TAppUser::getPhone, phone)
+ .eq(TAppUser::getStatus,1)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(phone);
- appUser.setInviteUserId(inviteUserId);
}
}
if(Objects.nonNull(appUser.getStatus())){
@@ -115,6 +119,9 @@
break;
}
}
+ if(Objects.nonNull(inviteUserId)){
+ appUser.setInviteUserId(inviteUserId);
+ }
appUser.setAliOpenid(response.getOpenId());
appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"http://221.182.45.100:8090/2024-10-26/logo.png");
appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName():RptUtils.around(phone,3,4));
--
Gitblit v1.7.1