From 5162402e60a06ddcf1df7ce9f7cce073f341eb94 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:57:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java b/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
index 7f258a0..ec40325 100644
--- a/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
+++ b/ruoyi-service/ruoyi-account/src/test/java/com/ruoyi/order/account/RuoYiAccountApplicationTests.java
@@ -24,10 +24,10 @@
List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
.ne(AppUser::getStatus, 3)
.eq(AppUser::getDelFlag, 0));
- AppUser user = appUserService.getById(1879046499735789569L);
+ AppUser user = appUserService.getById(1879047378761244673L);
ArrayList<Long> userIds = new ArrayList<>();
- userIds.add(1879046499735789569L);
- getUserAncestorList(user,userIds, appUserList);
+ userIds.add(1879047378761244673L);
+ getUserAncestorList(user,userIds, new ArrayList<>(),appUserList);
System.err.println(user.getCount1());
System.err.println(user.getCount2());
System.err.println(user.getCount3());
@@ -36,8 +36,8 @@
System.err.println(user.getCount6());
System.err.println(user.getCount7());
}
- public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> list) {
- List<AppUser> children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
+ public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {
+ children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(children)){
user.setCount1((user.getCount1() == null ? 0L : user.getCount1()) + children.stream().filter(e->e.getVipId() == 1).count());
user.setCount2((user.getCount2() == null ? 0L : user.getCount2()) + children.stream().filter(e->e.getVipId() == 2).count());
@@ -47,7 +47,7 @@
user.setCount6((user.getCount6() == null ? 0L : user.getCount6()) + children.stream().filter(e->e.getVipId() == 6).count());
user.setCount7((user.getCount7() == null ? 0L : user.getCount7()) + children.stream().filter(e->e.getVipId() == 7).count());
List<Long> userIdList = children.stream().map(AppUser::getId).collect(Collectors.toList());
- getUserAncestorList(user,userIdList, children);
+ getUserAncestorList(user,userIdList, children,list);
}
}
--
Gitblit v1.7.1