App合伙人详情

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -166,9 +166,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysUser::getId, sysPartnerPageDto.getUserId());
         wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysUser::getName, sysPartnerPageDto.getUserName());
-        wrapper.eq(SysUser::getType,1);
-        wrapper.eq(sysPartnerPageDto.getLevel() !=null, SysUser::getLevel, sysPartnerPageDto.getLevel());
-        wrapper.in(SysUser::getStatus,Arrays.asList(1,4,5,6,7));
+        wrapper.eq(SysUser::getType, 1);
+        wrapper.eq(sysPartnerPageDto.getLevel() != null, SysUser::getLevel, sysPartnerPageDto.getLevel());
+        wrapper.in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7));
 
 
         Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
@@ -197,26 +197,26 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     int type = sysPartner.getType();
                     if (type == 1) {
                         SysProportionConfig sysProportionConfig = sysProportionConfigMapper.selectOne(new LambdaQueryWrapper<SysProportionConfig>()
-                                .eq(SysProportionConfig::getUserId,sysPartner.getUserId()));
+                                .eq(SysProportionConfig::getUserId, sysPartner.getUserId()));
                         if (sysProportionConfig == null) continue;
                         user.setProportional(sysProportionConfig.getOneProportion());
 
-                    }else {
+                    } else {
                         SysRelationPerson sysRelationPeople = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
                                 .eq(SysRelationPerson::getAgencyLeaderId, user.getId())
                                 .eq(SysRelationPerson::getType, 0)
-                                .eq(SysRelationPerson::getSuggestLevel,1));
+                                .eq(SysRelationPerson::getSuggestLevel, 1));
                         if (sysRelationPeople == null) continue;
                         SysProportionConfig sysProportionConfig = sysProportionConfigMapper.selectOne(new LambdaQueryWrapper<SysProportionConfig>()
-                                .eq(SysProportionConfig::getUserId,sysRelationPeople.getSuggestId()));
+                                .eq(SysProportionConfig::getUserId, sysRelationPeople.getSuggestId()));
                         if (sysProportionConfig == null) continue;
                         if (type == 2) {
                             user.setProportional(sysProportionConfig.getTwoProportion());
-                        }else if (type == 3) {
+                        } else if (type == 3) {
                             user.setProportional(sysProportionConfig.getThreeProportion());
-                        }else if (type == 4) {
+                        } else if (type == 4) {
                             user.setProportional(sysProportionConfig.getFourProportion());
-                        }else if (type == 5) {
+                        } else if (type == 5) {
                             user.setProportional(sysProportionConfig.getFiveProportion());
                         }
                     }
@@ -1025,7 +1025,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                     .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, userId));
             SysPartnerConfig sysPartnerConfig = sysPartnerConfigMapper.selectOne(new LambdaQueryWrapper<SysPartnerConfig>()
-                    .eq(SysPartnerConfig::getDelFlag,1).eq(SysPartnerConfig::getLevel,sysPartner.getType()));
+                    .eq(SysPartnerConfig::getDelFlag, 1).eq(SysPartnerConfig::getLevel, sysPartner.getType()));
 
             appUserInfoVo.setSysPartnerConfig(sysPartnerConfig);
             appUserInfoVo.setLevel(sysPartner.getType());
@@ -1065,10 +1065,11 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         //按等级查询
         Integer partnerType = partnerInfoDto.getPartnerType();
         if (partnerType != null) {
-            List<SysPartner> sysPartnerList1 = listMap.get(partnerType);
+            List<SysPartner> sysPartnerList1 = listMap.get(partnerType + 1);
 
             if (sysPartnerList1 != null) {
                 AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
+                appSysPartnerVo.setPartnerType(partnerType + 1);
                 //下级合伙人数
                 appSysPartnerVo.setPartnerNumber(sysPartnerList1.size());
                 List<String> ids = sysPartnerList1.stream().map(SysPartner::getUserId).collect(Collectors.toList());
@@ -1120,60 +1121,21 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 } else {
 
                     //获取上一级合伙人，查询工作室数量
-                    List<SysPartner> sysPartners = listMap.get(sysPartner.getType() + partnerType - 1);
-                    //上一级直接推荐的工作室数量
-                    List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-                    list.addAll(list1);
-                }
-                List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .in(CollectionUtil.isNotEmpty(list), SysRelationPerson::getSuggestId, list)
-                        .eq(SysRelationPerson::getDelFlag, 1)
-                        .eq(SysRelationPerson::getSource, 0)
-                        .eq(SysRelationPerson::getType, 1));
-                appSysPartnerVo.setWorkNumber(sysRelationPersons.size());
-                List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                appSysPartnerVo.setLeaderIds(list1);
-
-                //直接工作室保费
-                List<SysPremiumDetails> sysPremiumDetails1 = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysPremiumDetails::getUserId, list1)
-                        .between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
-                                SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
-                        .eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector()));
-                BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
-                appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
-                int leaderManNum=0;
-                //直接工作室总
-                List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                        .in(CollectionUtil.isNotEmpty(list1), SysAgencyLeader::getUserId, list1).eq(SysAgencyLeader::getDelFlag, 1));
-
-                if (leaderList.size() > 0) {
-                    for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                        //获取机构下的团队
-                        List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-                                .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
-                                .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
-                                .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
-                        if (sysDeptList.size() > 0) {
-                            for (SysDept sysDept : sysDeptList) {
-                                List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                        .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
-                                leaderManNum = leaderManNum + sysUsers.size();
+                    List<SysPartner> sysPartners = listMap.get(partnerType - 1);
+                    if (sysPartners != null) {
+                        //上一级直接推荐的工作室数量
+                        List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                        list.addAll(list1);
+                        extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
+                    } else {
+                        appSysPartnerVo.setTeamManNum(deptManNum);
 
-                            }
-                        }
+                        appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
                     }
                 }
 
-                appSysPartnerVo.setTeamManNum(deptManNum+leaderManNum);
-
-                appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
-
                 //每一级存入map
-                appSysPartnerVo.setPartnerType(partnerType);
+
                 appSysPartnerVos.add(appSysPartnerVo);
             }
 
@@ -1237,18 +1199,18 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
                         //获取上一级合伙人，查询工作室数量
                         List<SysPartner> sysPartners = listMap.get(integer - 1);
-                        if (sysPartners == null) {
+                        if (sysPartners != null) {
                             //上一级直接推荐的工作室数量
                             List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
                             list.addAll(list1);
                             extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
-                        }else {
+                        } else {
                             appSysPartnerVo.setTeamManNum(deptManNum);
 
                             appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
                         }
                     }
-                }else if (type == 2) {
+                } else if (type == 2) {
                     if (integer == 3) {
                         //一级获取登陆人的之际工作室
                         list.add(userId);
@@ -1261,14 +1223,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                             List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
                             list.addAll(list1);
                             extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
-                        }else {
+                        } else {
                             appSysPartnerVo.setTeamManNum(deptManNum);
 
                             appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
                         }
                     }
 
-                }else if (type == 3) {
+                } else if (type == 3) {
                     if (integer == 4) {
                         //一级获取登陆人的之际工作室
                         list.add(userId);
@@ -1281,14 +1243,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                             List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
                             list.addAll(list1);
                             extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
-                        }else {
+                        } else {
                             appSysPartnerVo.setTeamManNum(deptManNum);
 
                             appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
                         }
                     }
 
-                }else if (type == 4) {
+                } else if (type == 4) {
                     if (integer == 5) {
                         //一级获取登陆人的之际工作室
                         list.add(userId);
@@ -1300,7 +1262,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                             List<String> list1 = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
                             list.addAll(list1);
                             extracted(partnerInfoDto, appSysPartnerVo, sumPremium, extractFee, deptManNum, list);
-                        }else {
+                        } else {
                             appSysPartnerVo.setTeamManNum(deptManNum);
 
                             appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber());
@@ -1341,11 +1303,11 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
             appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
             appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
-        }else {
+        } else {
             appSysPartnerVo.setSumPremium(sumPremium);
             appSysPartnerVo.setExtractFee(extractFee);
         }
-        int leaderManNum=0;
+        int leaderManNum = 0;
         //直接工作室总
         List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
                 .in(CollectionUtil.isNotEmpty(list1), SysAgencyLeader::getUserId, list1).eq(SysAgencyLeader::getDelFlag, 1));
@@ -1368,7 +1330,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             }
         }
 
-        appSysPartnerVo.setTeamManNum(deptManNum +leaderManNum);
+        appSysPartnerVo.setTeamManNum(deptManNum + leaderManNum);
 
         appSysPartnerVo.setNumber(appSysPartnerVo.getPartnerNumber() + appSysPartnerVo.getWorkNumber());
     }
@@ -1838,22 +1800,21 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                 .eq(SysPartner::getUserId, userId).eq(SysPartner::getDelFlag, 1));
         sysPartners.add(sysPartner);
-        List<String> ids =new ArrayList<>();
+        List<String> ids = new ArrayList<>();
         List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getAgencyLeaderId,userId).eq(SysRelationPerson::getType,0));
-        if (sysRelationPersonList.size()>0) {
+                .eq(SysRelationPerson::getAgencyLeaderId, userId).eq(SysRelationPerson::getType, 0));
+        if (sysRelationPersonList.size() > 0) {
             List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
-            if (collect.size()>0) {
+            if (collect.size() > 0) {
                 ids.addAll(collect);
             }
 
         }
 
 
-
         List<SysRelationPerson> sysRelationList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getSuggestId,userId).eq(SysRelationPerson::getType,0));
-        if (sysRelationList.size()>0) {
+                .eq(SysRelationPerson::getSuggestId, userId).eq(SysRelationPerson::getType, 0));
+        if (sysRelationList.size() > 0) {
 
             List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(collect1)) {