1

dd

2025-10-27 11ffae1ecbe3d26863fd51262d7ffb043eb089da

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java

@@ -14,11 +14,13 @@
import com.ruoyi.im.out.UserAccountOut;
import com.ruoyi.im.service.ImApiServcie;
import com.ruoyi.im.service.UserKycService;
import com.ruoyi.im.service.UserPolicyService;
import com.ruoyi.im.util.ConverterUtil;
import com.ruoyi.im.util.PhoneNumberValidatorUtil;
import com.ruoyi.im.util.SymmetricCryptoUtil;
import com.ruoyi.system.domain.UserAccount;
import com.ruoyi.system.domain.UserKyc;
import com.ruoyi.system.domain.UserPolicy;
import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
import com.ruoyi.system.domain.vo.UserAccountVo;
import com.ruoyi.system.service.UserAccountService;
@@ -46,6 +48,9 @@
    @Autowired
    private UserKycService userKycService;

    @Autowired
    UserPolicyService userPolicyService;

    /**
     * 获取会员列表
     */
@@ -54,6 +59,22 @@
    {
        // 创建查询条件包装器
        LambdaQueryWrapper<UserAccount> queryWrapper = new LambdaQueryWrapper<>();


        LambdaQueryWrapper<UserPolicy> userPolicyWrapper = new LambdaQueryWrapper<>();
        userPolicyWrapper
                .eq(UserPolicy::getApprovalStatus, 1)
                .eq(UserPolicy::getPayStatus,2)
                .select(UserPolicy::getUserId);
        List<UserPolicy> userPolicies = userPolicyService.list(userPolicyWrapper);
        List<Integer> userIds = userPolicies.stream()
                .map(UserPolicy::getUserId)
                .collect(Collectors.toList());
        if(null != vo.getActivate() && vo.getActivate()){
            queryWrapper.in(UserAccount::getId,userIds);
        }else if(null != vo.getActivate() && !vo.getActivate()){
            queryWrapper.notIn(UserAccount::getId,userIds);
        }

        if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
            String keywords = vo.getKeywords().trim();
@@ -126,9 +147,34 @@
        if (ObjectUtil.isEmpty(userAccounts) || maxLevel <= 0) {
            return new ArrayList<>();
        }
        // 收集用户ID用于查询激活状态
        List<Integer> idList = userAccounts.stream()
                .map(UserAccount::getId)
                .filter(ObjectUtil::isNotEmpty)
                .collect(Collectors.toList());

        // 先转换基础信息
        List<UserAccountOut> result = ConverterUtil.convertToList(userAccounts, UserAccountOut.class);
        // 批量查询激活状态
        Set<Integer> activatedUserIds = Collections.emptySet();
        if (!idList.isEmpty()) {
            LambdaQueryWrapper<UserPolicy> userPolicyWrapper = new LambdaQueryWrapper<>();
            userPolicyWrapper.in(UserPolicy::getUserId, idList)
                    .eq(UserPolicy::getApprovalStatus, 1)
                    .select(UserPolicy::getUserId);

            List<UserPolicy> policyList = userPolicyService.list(userPolicyWrapper);
            activatedUserIds = policyList.stream()
                    .map(UserPolicy::getUserId)
                    .collect(Collectors.toSet());
        }

        // 转换基础信息并设置激活状态
        List<UserAccountOut> result = new ArrayList<>();
        for (UserAccount user : userAccounts) {
            UserAccountOut out = ConverterUtil.convert(user, UserAccountOut.class);
            // 设置激活状态
            out.setActivate(activatedUserIds.contains(user.getId()));
            result.add(out);
        }

        // 递归加载下级用户
        loadSubordinateUsersRecursive(result, maxLevel);
@@ -182,6 +228,10 @@
        // 转换为输出对象
        List<UserAccountOut> allSubordinateOuts = ConverterUtil.convertToList(allSubordinates, UserAccountOut.class);

        // === 新增：为下级用户设置激活状态 ===
        setActivateStatusForUsers(allSubordinateOuts);
        // =================================

        // 收集所有需要设置 KYC 的用户（当前层级 + 下级）
        List<UserAccountOut> allUsers = new ArrayList<>();
        allUsers.addAll(userAccountOuts);
@@ -204,6 +254,41 @@
                user.setSubordinateList(new ArrayList<>());
            }
        }
    }

    /**
     * 为用户列表设置激活状态
     */
    private void setActivateStatusForUsers(List<UserAccountOut> users) {
        if (ObjectUtil.isEmpty(users)) {
            return;
        }

        // 收集用户ID
        List<Integer> idList = users.stream()
                .map(UserAccountOut::getId)
                .filter(ObjectUtil::isNotEmpty)
                .collect(Collectors.toList());

        if (idList.isEmpty()) {
            return;
        }

        // 批量查询激活状态
        LambdaQueryWrapper<UserPolicy> userPolicyWrapper = new LambdaQueryWrapper<>();
        userPolicyWrapper.in(UserPolicy::getUserId, idList)
                .eq(UserPolicy::getApprovalStatus, 1)
                .select(UserPolicy::getUserId);

        List<UserPolicy> policyList = userPolicyService.list(userPolicyWrapper);
        Set<Integer> activatedUserIds = policyList.stream()
                .map(UserPolicy::getUserId)
                .collect(Collectors.toSet());

        // 设置激活状态
        users.forEach(user -> {
            user.setActivate(activatedUserIds.contains(user.getId()));
        });
    }

    /**
@@ -290,7 +375,6 @@
            List<UserAccount> subordinates = userAccountService.list(queryWrapper);

            List<UserAccountOut> result = ConverterUtil.convertToList(subordinates, UserAccountOut.class);

            return AjaxResult.success(result);
        } catch (Exception e) {
            log.error("获取直接下级列表失败", e);
@@ -322,10 +406,10 @@
                    return AjaxResult.error("手机号格式不正确！");
                }
            }
            if(StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
            if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
                return AjaxResult.error("旧密码不能为空！");
            }
            if(StringUtils.isNotEmpty(vo.getPassword())){
            if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword())){
                String s = SymmetricCryptoUtil.decryptPassword(userAccount.getPassword());
                if(!vo.getOldPassword().equals(s)){
                    return AjaxResult.error("旧密码不正确！");