From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 06 三月 2025 09:20:40 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index df64f87..9c9444c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,8 @@
package com.ruoyi.account.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -53,6 +55,8 @@
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
+import static com.ruoyi.common.core.constant.SecurityConstants.USER_APPLET_KEY;
/**
* <p>
@@ -291,6 +295,16 @@
}
}
+ if (user.getShopName() == null){
+ user.setShopName("");
+ }
+ if (user.getShopCover() == null){
+ user.setShopCover("");
+ }
+ if (user.getShopAddress() == null){
+ user.setShopAddress("");
+ }
+
//指导老师
allSuperiors.stream()
.filter(superiors -> superiors.getVipId() != null && superiors.getVipId() > 3)
@@ -300,12 +314,23 @@
user.setTeacherPhone(superiors.getPhone());
});
+ if (user.getTeacher() == null){
+ user.setTeacher("");
+ }
+ if (user.getTeacherPhone() == null){
+ user.setTeacherPhone("");
+ }
+
+
//获取绑定上级
if (user.getInviteUserId() != null) {
AppUser byId = appUserService.getById(user.getInviteUserId());
user.setTopUser(byId);
+ }else {
+ AppUser topUser = new AppUser();
+ user.setTopUser(topUser);
}
//获取绑定下级列表
List<AppUser> list = appUserService.lambdaQuery()
@@ -481,21 +506,13 @@
.ifPresent(superiors -> {
user.setTeacher(superiors.getName());
});
- //当前绑定门店的店铺信息（服务商）
- for (AppUser allSuperior : allSuperiors) {
- List<Shop> shopList = shopClient.getShopByUserId(allSuperior.getId()).getData();
- if (!CollectionUtils.isEmpty(shopList)){
- user.setShopName(shopList.get(0).getName());
- break;
- }
+
+ Shop shop1 = shopClient.getServiceProvider(userId).getData();
+ if(null != shop1){
+ user.setShopName(shop1.getName());
+ user.setShopId(shop1.getId());
}
-// if (user.getShopId() != null) {
-// R<Shop> storeById = shopClient.getShopById(user.getShopId());
-// if (storeById.getData() != null) {
-// Shop shop = storeById.getData();
-// user.setShopName(shop.getName());
-// }
-// }
+
ArrayList<Long> userIds = new ArrayList<>();
userIds.add(userId);
// 获取当前用户的所有下级
@@ -811,17 +828,17 @@
}
private void loginout(Long userId) {
+ // 获取所有符合模式的缓存键
Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
- if (!CollectionUtils.isEmpty(keys)) {
- for (String key : keys) {
- LoginUser user = redisService.getCacheObject(key);
- if (user == null || user.getUserid() == null) {
- continue;
- }
- if (user.getUserid().equals(userId)) {
- redisService.deleteObject(key);
- break;
- }
+ if (CollectionUtils.isEmpty(keys)) {
+ return; // 如果没有匹配的键，直接返回
+ }
+
+ // 遍历所有键并删除与指定用户ID相关的登录信息
+ for (String key : keys) {
+ LoginUser user = redisService.getCacheObject(key);
+ if (user != null && userId.equals(user.getUserid())) {
+ redisService.deleteObject(key);
}
}
}
@@ -891,11 +908,9 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
AppUser byId = appUserService.getById(id);
- if (byId.getShopId() != null) {
- R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
- if (shopById.getData() != null) {
- byId.setShopName(shopById.getData().getName());
- }
+ Shop shop1 = shopClient.getServiceProvider(id).getData();
+ if(null != shop1){
+ byId.setShopName(shop1.getName());
}
R<List<Shop>> shopByUserId = shopClient.getShopByUserId(id);
if (shopByUserId.getData() != null) {
@@ -1066,6 +1081,13 @@
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
+ List<Shop> shopList = shopClient.getAllShop().getData();
+ if (CollectionUtil.isNotEmpty(shopList)){
+ long count = shopList.stream().map(Shop::getAppUserId).distinct().count();
+ userStatistics.setShopUser((int) count);
+ }else {
+ userStatistics.setShopUser(0);
+ }
return R.ok(userStatistics);
}
--
Gitblit v1.7.1