From 1ccd22706067b95141c83110c142c4a66306dd27 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:08:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index 89f8b03..b9b1ac1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -300,7 +300,7 @@
}
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
- loginVo.setFirstTime(null == appUser1 ? true : false);
+ loginVo.setFirstTime(null == appUser1);
loginVo.setPhone(appUser.getPhone());
//构建token
LoginUser loginUser = new LoginUser();
@@ -342,7 +342,7 @@
//使用地图获取省市区数据
String longitude = nearbyReferrer.getLongitude();
String latitude = nearbyReferrer.getLatitude();
- String cityCode = ""; // TODO 待完善
+ String cityCode = "510100"; // TODO 待完善
List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
return list;
}
@@ -380,4 +380,19 @@
return list;
}
+ @Override
+ public AppUser getSuperiorLeader(Long id) {
+ AppUser appUser = getById(id);
+ Long inviteUserId = appUser.getInviteUserId();
+ AppUser inviteUser = getById(inviteUserId);
+ if (inviteUser == null){
+ return null;
+ }
+ if (inviteUser.getVipId() > 3) {
+ return inviteUser;
+ }else {
+ getSuperiorLeader(inviteUserId);
+ }
+ return null;
+ }
}
--
Gitblit v1.7.1