From 5efd9f886ae578acf4c27b74d7f6f4c2861e983b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 14:25:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 d3351ef..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
@@ -49,8 +49,13 @@
.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())){
@@ -79,8 +84,13 @@
.eq(TAppUser::getPhone, phone)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
- appUser = new TAppUser();
- appUser.setPhone(phone);
+ 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);
+ }
}
}
if(Objects.nonNull(appUser.getStatus())){
@@ -104,8 +114,13 @@
// .eq(TAppUser::getPhone, userInfo.getMobile())
// .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(userInfo.getMobile());
+// }
// }
// }
// if(Objects.nonNull(appUser.getStatus())){
--
Gitblit v1.7.1