合伙人详情代码优化

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

@@ -1160,225 +1160,144 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         PartnerInfoFreeVo partnerInfoFreeVo = new PartnerInfoFreeVo();
         List<PartnerInfoVo> partnerInfoVoList = new ArrayList<>();
         String loginId = BaseController.getUserId();
-        //合伙人：1；工作室：2
-        Integer type = partnerGradeInfo.getType();
-        if (type == 1) {
-            List<String> partnerIds = partnerGradeInfo.getPartnerIds();
-            if (CollectionUtil.isEmpty(partnerIds)) {
-                return partnerInfoFreeVo;
-            }
-            //合伙人的直接工作室贡献的费用
-            List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                    .in(SysRelationPerson::getSuggestId, partnerIds)
-                    .eq(SysRelationPerson::getDelFlag, 1)
-                    .eq(SysRelationPerson::getSource, 0)
-                    .eq(SysRelationPerson::getType, 1));
-            //工作室下所有的人
-            List<SysRelationPerson> sysRelationPersons1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                    .in(SysRelationPerson::getSuggestId, partnerIds)
-                    .eq(SysRelationPerson::getDelFlag, 1)
-                    .eq(SysRelationPerson::getType, 1));
-            List<String> userIds = getUserIds(sysRelationPersons1);
-            BigDecimal sumPremium = BigDecimal.ZERO;
-            BigDecimal extractFee = BigDecimal.ZERO;
-            if (CollectionUtil.isNotEmpty(userIds)) {
-                for (String userId : userIds) {
-
-                    //费用
-                    List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                            .eq(SysPremiumDetails::getUserId, loginId)
-                            .eq(SysPremiumDetails::getIssuerId,userId)
-                            .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                                    SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                            .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector())
-                            .eq(SysPremiumDetails::getStatus, 1));
-                    if (CollectionUtil.isNotEmpty(sysPremiumDetails)) {
-                        Map<String, List<SysPremiumDetails>> map = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
-                                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
-                        for (String s : map.keySet()) {
-                            List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
-                            sumPremium = sumPremium.add(sysPremiumDetails1.get(0).getSumpremium());
-                        }
-
-//                        sumPremium = sumPremium.add(sysPremiumDetails.get(0).getSumpremium());
-                        BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        extractFee = extractFee.add(reduce);
+        List<String> partnerIds = partnerGradeInfo.getPartnerIds();
+        if (CollectionUtil.isEmpty(partnerIds)) {
+            return partnerInfoFreeVo;
+        }
+        //关联工作室下所有的人
+        List<SysRelationPerson> sysRelationPersons1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                .in(SysRelationPerson::getSuggestId, partnerIds)
+                .eq(SysRelationPerson::getDelFlag, 1)
+                .eq(SysRelationPerson::getType, 1));
+        List<String> userIds = getUserIds(sysRelationPersons1);
+        BigDecimal sumPremium = BigDecimal.ZERO;
+        BigDecimal extractFee = BigDecimal.ZERO;
+        if (CollectionUtil.isNotEmpty(userIds)) {
+            for (String userId : userIds) {
+                //费用
+                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                        .eq(SysPremiumDetails::getUserId, loginId)
+                        .eq(SysPremiumDetails::getIssuerId,userId)
+                        .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
+                                SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
+                        .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector())
+                        .eq(SysPremiumDetails::getStatus, 1));
+                if (CollectionUtil.isNotEmpty(sysPremiumDetails)) {
+                    Map<String, List<SysPremiumDetails>> map = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                            .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+                    for (String s : map.keySet()) {
+                        List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+                        sumPremium = sumPremium.add(sysPremiumDetails1.get(0).getSumpremium());
                     }
 
+//                        sumPremium = sumPremium.add(sysPremiumDetails.get(0).getSumpremium());
+                    BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    extractFee = extractFee.add(reduce);
                 }
-            }
-            partnerInfoFreeVo.setSumPremium(sumPremium);
-            partnerInfoFreeVo.setExtractFee(extractFee);
-
-            //合伙人
-            List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
-                    .in(SysPartner::getUserId, partnerGradeInfo.getPartnerIds()).eq(SysPartner::getDelFlag, 1));
-            if (sysPartnerList.size() > 0) {
-                for (SysPartner sysPartner : sysPartnerList) {
-                    PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
-                    partnerInfoVo.setLevel(sysPartner.getType());
-                    String userId = sysPartner.getUserId();
-                    partnerInfoVo.setUserId(userId);
-                    SysUser sysUser = sysUserMapper.selectById(userId);
-                    partnerInfoVo.setUserName(sysUser.getName());
-                    SysUser sysUser1 = sysUserMapper.selectById(sysPartner.getSuggestId());
-                    partnerInfoVo.setSuggestName(sysUser1.getName());
-                    //直接合伙人
-                    List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                            .eq(SysRelationPerson::getSuggestId, userId)
-                            .eq(SysRelationPerson::getDelFlag, 1)
-                            .eq(SysRelationPerson::getType, 0)
-                            .eq(SysRelationPerson::getSource, 0));
-                    List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                    partnerInfoVo.setPartnerIds(collect);
-                    partnerInfoVo.setPartnerNumber(collect.size());
-
-                    //直接管理员
-                    List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                            .eq(SysRelationPerson::getSuggestId, userId)
-                            .eq(SysRelationPerson::getDelFlag, 1)
-                            .eq(SysRelationPerson::getType, 1)
-                            .eq(SysRelationPerson::getSource, 0));
-
-                    List<String> collects = sysRelationPersonList1.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                    partnerInfoVo.setLeaderIds(collects);
-                    partnerInfoVo.setWorkNumber(collects.size());
-                    //所有贡献费用
-                    //合伙人下所有工作室数 核算总代理人数
-                    List<SysRelationPerson> sysRelationPersonList2 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                            .eq(SysRelationPerson::getSuggestId, userId)
-                            .eq(SysRelationPerson::getDelFlag, 1)
-                            .eq(SysRelationPerson::getType, 1));
 
-                    List<String> userIds1 = getUserIds(sysRelationPersonList2);
-                    BigDecimal sumPremium1 = BigDecimal.ZERO;
-                    BigDecimal extractFee1 = BigDecimal.ZERO;
-                    if (CollectionUtil.isNotEmpty(userIds1)) {
-                        for (String id : userIds1) {
-                            //费用
-                            List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                                    .eq(SysPremiumDetails::getUserId, loginId)
-                                    .eq(SysPremiumDetails::getIssuerId,id)
-                                    .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                                            SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                                    .eq(SysPremiumDetails::getStatus, 1)
-                                    .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
+            }
+        }
+        partnerInfoFreeVo.setSumPremium(sumPremium);
+        partnerInfoFreeVo.setExtractFee(extractFee);
 
-                            if (CollectionUtil.isNotEmpty(sysPremiumDetail)) {
-                                Map<String, List<SysPremiumDetails>> map = sysPremiumDetail.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
-                                        .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
-                                for (String s : map.keySet()) {
-                                    List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
-                                    sumPremium1 = sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
-                                }
+        //合伙人
+        List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
+                .in(SysPartner::getUserId, partnerGradeInfo.getPartnerIds()).eq(SysPartner::getDelFlag, 1));
+        if (sysPartnerList.size() > 0) {
+            for (SysPartner sysPartner : sysPartnerList) {
+                PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
+                partnerInfoVo.setLevel(sysPartner.getType());
+                String userId = sysPartner.getUserId();
+                partnerInfoVo.setUserId(userId);
+                SysUser sysUser = sysUserMapper.selectById(userId);
+                partnerInfoVo.setUserName(sysUser.getName());
+                SysUser sysUser1 = sysUserMapper.selectById(sysPartner.getSuggestId());
+                partnerInfoVo.setSuggestName(sysUser1.getName());
+                //直接合伙人
+                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getSuggestId, userId)
+                        .eq(SysRelationPerson::getDelFlag, 1)
+                        .eq(SysRelationPerson::getType, 0)
+                        .eq(SysRelationPerson::getSource, 0));
+                List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+                partnerInfoVo.setPartnerIds(collect);
+                partnerInfoVo.setPartnerNumber(collect.size());
 
-//                                sumPremium1 = sumPremium1.add(sysPremiumDetail.get(0).getSumpremium());
-                                BigDecimal reduce = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                extractFee1 = extractFee1.add(reduce);
-                            }
-                        }
+                //直接管理员
+                List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getSuggestId, userId)
+                        .eq(SysRelationPerson::getDelFlag, 1)
+                        .eq(SysRelationPerson::getType, 1)
+                        .eq(SysRelationPerson::getSource, 0));
 
-                    }
-                    partnerInfoVo.setSumPremium(sumPremium1);
-                    partnerInfoVo.setExtractFee(extractFee1);
+                List<String> collects = sysRelationPersonList1.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+                partnerInfoVo.setLeaderIds(collects);
+                partnerInfoVo.setWorkNumber(collects.size());
+                //所有贡献费用
+                //合伙人下所有工作室数 核算总代理人数
+                List<SysRelationPerson> sysRelationPersonList2 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getSuggestId, userId)
+                        .eq(SysRelationPerson::getDelFlag, 1)
+                        .eq(SysRelationPerson::getType, 1));
 
-                    int deptManNum = 0;
-                    if (sysRelationPersonList2.size() > 0) {
-                        List<String> idList = sysRelationPersonList2.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                        List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                                .in(SysAgencyLeader::getUserId, idList).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));
-                                        deptManNum = deptManNum + sysUsers.size();
+                List<String> userIds1 = getUserIds(sysRelationPersonList2);
+                BigDecimal sumPremium1 = BigDecimal.ZERO;
+                BigDecimal extractFee1 = BigDecimal.ZERO;
+                if (CollectionUtil.isNotEmpty(userIds1)) {
+                    for (String id : userIds1) {
+                        //费用
+                        List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                                .eq(SysPremiumDetails::getUserId, loginId)
+                                .eq(SysPremiumDetails::getIssuerId,id)
+                                .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
+                                        SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
+                                .eq(SysPremiumDetails::getStatus, 1)
+                                .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
 
-                                    }
-                                }
+                        if (CollectionUtil.isNotEmpty(sysPremiumDetail)) {
+                            Map<String, List<SysPremiumDetails>> map = sysPremiumDetail.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                                    .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+                            for (String s : map.keySet()) {
+                                List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+                                sumPremium1 = sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
                             }
+
+//                                sumPremium1 = sumPremium1.add(sysPremiumDetail.get(0).getSumpremium());
+                            BigDecimal reduce = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                            extractFee1 = extractFee1.add(reduce);
                         }
                     }
-                    partnerInfoVo.setTeamManNum(deptManNum);
-
-                    partnerInfoVoList.add(partnerInfoVo);
                 }
-
-                partnerInfoFreeVo.setPartnerInfoVoList(partnerInfoVoList);
-            }
-        } else {
-            //工作室
-            List<String> leaderIds = partnerGradeInfo.getLeaderIds();
-            if (CollectionUtil.isEmpty(leaderIds)) {
-                return partnerInfoFreeVo;
-            }
-            //费用
-            List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .in(SysPremiumDetails::getUserId, leaderIds)
-                    .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                            SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                    .eq(SysPremiumDetails::getStatus, 1)
-                    .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
-            BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-            partnerInfoFreeVo.setSumPremium(sumPremium);
-            partnerInfoFreeVo.setExtractFee(extractFee);
-
-
-            List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                    .in(SysAgencyLeader::getUserId, leaderIds).eq(SysAgencyLeader::getDelFlag, 1));
-
-            for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
-
-                String userId = sysAgencyLeader.getUserId();
-                partnerInfoVo.setUserId(userId);
-                SysUser sysUser = sysUserMapper.selectById(userId);
-                partnerInfoVo.setUserName(sysUser.getName());
-                SysUser sysUser1 = sysUserMapper.selectById(sysAgencyLeader.getSuggestId());
-                partnerInfoVo.setSuggestName(sysUser1.getName());
-
-                //费用
-                List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .eq(SysPremiumDetails::getUserId, userId)
-                        .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                                SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                        .eq(SysPremiumDetails::getStatus, 1)
-                        .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
-                BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
                 partnerInfoVo.setSumPremium(sumPremium1);
                 partnerInfoVo.setExtractFee(extractFee1);
 
                 int deptManNum = 0;
-                //获取机构下的团队
-                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()));
-
-                partnerInfoVo.setDeptNum(sysDeptList.size());
-                List<String> collect = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
-                partnerInfoVo.setDeptIds(collect);
-                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));
-                        deptManNum = deptManNum + sysUsers.size();
+                if (sysRelationPersonList2.size() > 0) {
+                    List<String> idList = sysRelationPersonList2.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+                    List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
+                            .in(SysAgencyLeader::getUserId, idList).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));
+                                    deptManNum = deptManNum + sysUsers.size();
 
+                                }
+                            }
+                        }
                     }
                 }
                 partnerInfoVo.setTeamManNum(deptManNum);
 
                 partnerInfoVoList.add(partnerInfoVo);
             }
-
         }
         int sum = partnerInfoVoList.stream().mapToInt(PartnerInfoVo::getTeamManNum).sum();
         partnerInfoFreeVo.setTeamManNum(sum);