合伙人的推荐人

src/main/java/com/ydtech/modules/admin/controller/APPPartnerController.java

@@ -200,6 +200,19 @@ public class APPPartnerController extends BaseController {
         return HttpResult.ok("success",this.sysPartnerService.getLevelPartner(type));
     }
 
+    /**
+     * 排行榜->查看详情
+     * @param userId
+     * @return
+     */
+    @GetMapping("/getLevelPartnerInfo")
+    @ApiOperation(value = "排行榜->查看详情")
+    public HttpResult<PartnerInfoFreeVo> getLevelPartnerInfo(@RequestParam("userId") String userId) {
+
+        return HttpResult.ok("success",this.sysPartnerService.getLevelPartnerInfo(userId));
+    }
+
+
     /**
      * 支付宝登录
      * @param alipayBindVo

src/main/java/com/ydtech/modules/admin/controller/SysPartnerController.java

@@ -75,10 +75,10 @@ public class SysPartnerController extends BaseController {
      * @param id 主键
      * @return 单条数据
      */
-    @GetMapping("/queryRecommendAndPartner/{id}")
+    @GetMapping("/queryRecommendAndPartner/{id}/{level}")
     @ApiOperation(value = "根据部门id查询配置的推荐人接口")
-    public HttpResult<List<SysPartner>> queryRecommendAndPartner(@PathVariable("id") @ApiParam("部门id") String id) {
-        return HttpResult.ok("success", this.sysPartnerService.queryRecommendAndPartner(id));
+    public HttpResult<List<SysPartner>> queryRecommendAndPartner(@PathVariable(value = "id") @ApiParam("部门id") String id,@PathVariable(value = "level") @ApiParam("合伙人等级") Integer level) {
+        return HttpResult.ok("success", this.sysPartnerService.queryRecommendAndPartner(id,level));
     }
 
     /**

src/main/java/com/ydtech/modules/admin/service/SysPartnerService.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface SysPartnerService extends IService<SysPartner> {
 
 
-    List<SysPartner> queryRecommendAndPartner(String id);
+    List<SysPartner> queryRecommendAndPartner(String id,Integer level);
 
     BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto);
 
@@ -86,4 +86,6 @@ public interface SysPartnerService extends IService<SysPartner> {
     HttpResult<Object> bindWechat(WechatBindVo wechatBindVo, String userId) throws WxErrorException;
 
     String checkBindWechat();
+
+    PartnerInfoFreeVo getLevelPartnerInfo(String userId);
 }

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

@@ -103,9 +103,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     private Map<String, WxMpService> wxMpService;
 
     @Override
-    public List<SysPartner> queryRecommendAndPartner(String id) {
+    public List<SysPartner> queryRecommendAndPartner(String id,Integer level) {
         List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
-                .likeRight(SysPartner::getUserId, id).orderByDesc(SysPartner::getId));
+                .likeRight(SysPartner::getUserId, id).lt(SysPartner::getType,level).orderByDesc(SysPartner::getId));
         if (sysPartnerList.size() > 0) {
             for (SysPartner sysPartner : sysPartnerList) {
                 SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
@@ -1979,37 +1979,38 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                     .eq(SysRelationPerson::getSuggestId, partner.getUserId())
                     .eq(SysRelationPerson::getDelFlag, 1)
-                    .eq(SysRelationPerson::getType, 1));
-            if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
-                List<String> collects = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                //查工作室下的团队
-                List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                        .eq(SysAgencyLeader::getDelFlag, 1).in(SysAgencyLeader::getUserId, collects));
-                int deptSum = 0;
-                int deptManSum = 0;
-                for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                    //根据机构id查下面团队
-                    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()));
-                    deptSum = deptSum + sysDeptList.size();
-                    if (sysDeptList.size() > 0) {
-                        for (SysDept sysDept : sysDeptList) {
-                            //团队下的人数
-                            List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                    .likeRight(SysUser::getId, sysDept.getId())
-                                    .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
-                            deptManSum = deptManSum + sysUserList.size();
-                        }
-                    }
-                }
-
-                levelPartnerVo.setDeptManNum(deptManSum);
-
-            } else {
-                levelPartnerVo.setDeptManNum(0);
-            }
+                    .eq(SysRelationPerson::getType, 0));
+            levelPartnerVo.setDeptManNum(sysRelationPersonList.size());
+//            if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
+//                List<String> collects = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+//                //查工作室下的团队
+//                List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
+//                        .eq(SysAgencyLeader::getDelFlag, 1).in(SysAgencyLeader::getUserId, collects));
+//                int deptSum = 0;
+//                int deptManSum = 0;
+//                for (SysAgencyLeader sysAgencyLeader : leaderList) {
+//                    //根据机构id查下面团队
+//                    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()));
+//                    deptSum = deptSum + sysDeptList.size();
+//                    if (sysDeptList.size() > 0) {
+//                        for (SysDept sysDept : sysDeptList) {
+//                            //团队下的人数
+//                            List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+//                                    .likeRight(SysUser::getId, sysDept.getId())
+//                                    .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+//                            deptManSum = deptManSum + sysUserList.size();
+//                        }
+//                    }
+//                }
+//
+//                levelPartnerVo.setDeptManNum(deptManSum);
+//
+//            } else {
+//                levelPartnerVo.setDeptManNum(0);
+//            }
 
             partnerVoList.add(levelPartnerVo);
         }
@@ -2194,5 +2195,18 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         return sysUser.getOpenid();
     }
 
+    @Override
+    public PartnerInfoFreeVo getLevelPartnerInfo(String userId) {
+        PartnerInfoFreeVo partnerInfoFreeVo = new PartnerInfoFreeVo();
+        List<PartnerInfoVo> partnerInfoVoList = new ArrayList<>();
+
+
+
+
+
+
+        return partnerInfoFreeVo;
+    }
+
 
 }

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

@@ -2470,7 +2470,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysAgencyLeaderDto.setSource(sysUser.getDeptSource());
             sysAgencyLeaderDto.setComlevel(sysDeptVo.getComlevel());
             sysAgencyLeaderDto.setSuggestId(sysUser.getReferrerId());
-            sysAgencyLeaderDto.setSuggestName(sysUser.getSuggestName());
+            SysUser sysUser1 = sysUserMapper.selectById(sysUser.getReferrerId());
+            if (sysUser1 != null) {
+                sysAgencyLeaderDto.setSuggestName(sysUser1.getName());
+            }
             sysAgencyLeaderDto.setSuggestLevel(sysUserReferrerId.getLevel());
 
             sysAgencyLeaderService.insert(sysAgencyLeaderDto);