迭代版本：2.28

luofl

2025-03-07 faf27967a7f94a4ed03a179ec2670031576f4502

 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()
@@ -803,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);
            }
        }
    }
@@ -1056,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);
    }