From 6c4ca033bf15f7bb6fa01f15e06212ad5ba0868d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 15 May 2021 17:59:26 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index 110354e..074e5a6 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -602,27 +602,57 @@
log.info("获取团队信息");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
+// Long memberId = 444L;
+// MemberEntity memberEntity = memberDao.selectById(memberId);
/**
* 获取团队总人数，总购买数
* 详细列表
*
*/
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);
@@ -635,7 +665,6 @@
}
}
}
- teamVo.setTeamInfoVos(records);
return Result.ok(teamVo);
}
--
Gitblit v1.9.1