From 291b4f3d27a700153af59130f12debcc99c0e310 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 24 Apr 2023 16:49:53 +0800
Subject: [PATCH] 资金流水

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 6ca5f55..25b7669 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -50,13 +50,22 @@
         List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
         List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
         for (MallMember parent : parentMembers) {
-            //level为v6,升级董事,则看团队下有没有两个V6
-            List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(parent.getInviteId());
-            if(CollUtil.isNotEmpty(mallMemberTeamMembers)){
-                List<MallMember> levelV6List = mallMemberTeamMembers.stream()
-                        .filter(teamMember -> teamMember.getLevel().equals(MemberLevelEnum.V6.getType()))
-                        .collect(Collectors.toList());
-                if(CollUtil.isNotEmpty(levelV6List) && levelV6List.size() >= 2){
+            //level为v6,升级董事,则看直属团队下有没有两个V6
+            List<MallMember> mallMemberChilds = memberMapper.selectByRefererId(parent.getInviteId());
+            int directorSize = 0;
+            if(CollUtil.isNotEmpty(mallMemberChilds)){
+                for(MallMember mallMemberChild : mallMemberChilds){
+                    List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(mallMemberChild.getInviteId());
+                    if(CollUtil.isNotEmpty(mallMemberTeamMembers)){
+                        List<MallMember> levelV6List = mallMemberTeamMembers.stream()
+                                .filter(teamMember -> teamMember.getLevel().equals(MemberLevelEnum.V6.getType()))
+                                .collect(Collectors.toList());
+                        if(CollUtil.isNotEmpty(levelV6List)){
+                            directorSize = directorSize +1;
+                        }
+                    }
+                }
+                if(directorSize >= 2){
                     parent.setLevel(MemberLevelEnum.V_DIRECTOR.getType());
                     parent.setDirector(AppContants.OPTION_YES);
                     memberMapper.updateById(parent);

--
Gitblit v1.9.1