Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

wzy

2021-05-15 6c4ca033bf15f7bb6fa01f15e06212ad5ba0868d

 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java

@@ -610,21 +610,49 @@
         *
         */
        TeamVo teamVo = new TeamVo();
//        //团队总人数
//        int memberNum = 0;
//        //直接下级
//        QueryWrapper<MemberEntity> objectQueryWrapper = new QueryWrapper<>();
//        objectQueryWrapper.eq("referer_id",memberEntity.getInviteId());
//        List<MemberEntity> memberEntities = memberDao.selectList(objectQueryWrapper);
//        if(CollUtil.isNotEmpty(memberEntities)){
//            memberNum = memberEntities.size();
//        }
//        teamVo.setMemberNum(memberNum);
//
//        //总购买数
//        int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(memberEntity.getInviteId());
//        teamVo.setAllPower(allPower);
//
//        //详细列表
//        Page<TeamInfoVo> page = new Page<>(teamInfoDto.getPageNum(), teamInfoDto.getPageSize());
//        IPage<TeamInfoVo> teamInfoVos = ydOrderDao.getTeamInfoList(page, memberEntity);
//        List<TeamInfoVo> records = teamInfoVos.getRecords();
//        if(CollUtil.isNotEmpty(records)){
//            for(TeamInfoVo teamInfoVo : records){
//                String phone = teamInfoVo.getPhone();
//                if(StrUtil.isNotEmpty(phone)){
//                    teamInfoVo.setPhone(StrUtil.subSufByLength(phone,4));
//                }
//            }
//        }
//        teamVo.setTeamInfoVos(records);
        //团队总人数
        int memberNum = 0;
        String inviteId = memberEntity.getInviteId();
        List<MemberEntity> memberEntityList = ydOrderDao.selectMemberByInviteId(inviteId);
        if(CollUtil.isNotEmpty(memberEntityList)){
            memberNum = memberEntityList.size();
        }
        teamVo.setMemberNum(memberNum);
        //购买总算力
        int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(inviteId);
        teamVo.setAllPower(allPower);
        //直接下级
        QueryWrapper<MemberEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("referer_id",memberEntity.getInviteId());
        List<MemberEntity> memberEntities = memberDao.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(memberEntities)){
            memberNum = memberEntities.size();
        }
        teamVo.setMemberNum(memberNum);

        //总购买数
        int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(memberEntity.getInviteId());
        teamVo.setAllPower(allPower);

        //详细列表
        Page<TeamInfoVo> page = new Page<>(teamInfoDto.getPageNum(), teamInfoDto.getPageSize());
        IPage<TeamInfoVo> teamInfoVos = ydOrderDao.getTeamInfoList(page, memberEntity);
@@ -637,7 +665,6 @@
                }
            }
        }
        teamVo.setTeamInfoVos(records);
        return Result.ok(teamVo);
    }