push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiCsfClientUserServiceImpl.java

@@ -221,12 +221,88 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
         //推荐列表
         List<ApiReferrerDTO> referrerDTOList = getReferrerDTOList(csfClientUser.getClientUserBizId());
         orgDTO.setReferrerDTOList(referrerDTOList);
-        //一级和二级列表 TODO
+        //一级和二级列表
+        //一级管理列表
+        List<ApiFirstLevelDTO> firstLevelDTOList = getFirstLevelDTOList(csfClientUser.getClientUserBizId());
+        orgDTO.setFirstLevelDTOList(firstLevelDTOList);
+        //二级管理列表
+        List<ApiSecondLevelDTO> secondLevelDTOList = getSecondLevelDTOList(csfClientUser.getClientUserBizId());
+        orgDTO.setSecondLevelDTOList(secondLevelDTOList);
         response.setOrgDTO(orgDTO);
         return Result.success(response);
     }
 
     /**
+     * 获取一级管理列表
+     * @param clientUserBizId
+     * @return
+     */
+    public List<ApiFirstLevelDTO> getFirstLevelDTOList(String clientUserBizId) {
+        List<ApiFirstLevelDTO> firstLevelDTOList = new ArrayList<>();
+        if (StringUtils.isBlank(clientUserBizId)) {
+            return firstLevelDTOList;
+        }
+        List<String> manageIdList = iAgentManageRelationService.lambdaQuery()
+                .select(AgentManageRelation::getManageId)
+                .eq(AgentManageRelation::getAgentId, clientUserBizId)
+                .list() // 返回 List<AgentTutoringRelation>
+                .stream()
+                .map(AgentManageRelation::getManageId)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(manageIdList)) {
+            return firstLevelDTOList;
+        }
+        List<CsfClientUser> manageList = csfClientUserService.lambdaQuery()
+                .in(CsfClientUser::getClientUserBizId,manageIdList)
+                .list();
+        if (CollectionUtils.isEmpty(manageList)) {
+            return firstLevelDTOList;
+        }
+
+        return manageList.stream().map(user -> {
+            ApiFirstLevelDTO dto = new ApiFirstLevelDTO();
+            BeanUtils.copyProperties(user, dto);
+            //TODO 设置等级名称
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 获取二级管理列表
+     * @param clientUserBizId
+     * @return
+     */
+    public List<ApiSecondLevelDTO> getSecondLevelDTOList(String clientUserBizId) {
+        List<ApiSecondLevelDTO> secondLevelDTOList = new ArrayList<>();
+        if (StringUtils.isBlank(clientUserBizId)) {
+            return secondLevelDTOList;
+        }
+        List<String> manageIdList = iAgentManageRelationService.lambdaQuery()
+                .select(AgentManageRelation::getSManageId)
+                .eq(AgentManageRelation::getAgentId, clientUserBizId)
+                .list() // 返回 List<AgentTutoringRelation>
+                .stream()
+                .map(AgentManageRelation::getSManageId)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(manageIdList)) {
+            return secondLevelDTOList;
+        }
+        List<CsfClientUser> manageList = csfClientUserService.lambdaQuery()
+                .in(CsfClientUser::getClientUserBizId,manageIdList)
+                .list();
+        if (CollectionUtils.isEmpty(manageList)) {
+            return secondLevelDTOList;
+        }
+
+        return manageList.stream().map(user -> {
+            ApiSecondLevelDTO dto = new ApiSecondLevelDTO();
+            BeanUtils.copyProperties(user, dto);
+            //TODO 设置等级名称
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
      * 获取推荐列表
      * @param clientUserBizId
      * @return

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionRuleConfigServiceImpl.java

@@ -52,7 +52,7 @@ public class CommissionRuleConfigServiceImpl extends ServiceImpl<CommissionRuleC
     @Override
     public List<CommissionRuleConfig> queryList(List<String> ruleBizIdList) {
         return this.baseMapper.selectList(new LambdaQueryWrapper<CommissionRuleConfig>()
-                .eq(CommissionRuleConfig::getRuleBizId,ruleBizIdList));
+                .in(CommissionRuleConfig::getRuleBizId,ruleBizIdList));
     }
 
     /**