From fa91cc62d16b55c99d4cf6451ac6e2f1e0031dd5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 15 May 2021 18:35:15 +0800
Subject: [PATCH] 20210515 云顶
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 17 +-------
src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java | 2
src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java | 3 -
src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java | 1
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 47 ++++++-----------------
5 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
index b38e0f1..aad5bea 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
@@ -40,4 +40,5 @@
IPage<TeamInfoVo> getTeamInfoList(Page<TeamInfoVo> page, @Param("record")MemberEntity memberEntity);
List<MemberEntity> selectMemberByInviteId(@Param("inviteId")String inviteId);
+
}
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 074e5a6..820863f 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
@@ -610,34 +610,6 @@
*
*/
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();
@@ -649,22 +621,29 @@
//购买总算力
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);
//详细列表
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();
+ String phone = teamInfoVo.getInvitephone();
if(StrUtil.isNotEmpty(phone)){
- teamInfoVo.setPhone(StrUtil.subSufByLength(phone,4));
+ teamInfoVo.setInvitephone(StrUtil.subSufByLength(phone,4));
}
+ //下属团队人数
+ int memberNumInvite = 0;
+ List<MemberEntity> memberEntityInviteList = ydOrderDao.selectMemberByInviteId(phone);
+ if(CollUtil.isNotEmpty(memberEntityInviteList)){
+ memberNumInvite = memberEntityInviteList.size();
+ }
+ teamInfoVo.setMemberNum(memberNumInvite);
+ //下属团队总算力
+ int powerNum = ydOrderDao.selectAllPowerByMemberIdAndElse(phone);
+ teamInfoVo.setPowerNum(powerNum);
}
}
+ teamVo.setTeamInfoVos(records);
return Result.ok(teamVo);
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java b/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java
index 84abe87..18069dd 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java
@@ -10,7 +10,7 @@
public class TeamInfoVo {
@ApiModelProperty("账号")
- private String phone;
+ private String invitephone;
@ApiModelProperty("人数")
private Integer memberNum;
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java b/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java
index 5aca84d..a5943dc 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java
@@ -13,9 +13,6 @@
@ApiModelProperty("团队人数")
private Integer memberNum;
- @ApiModelProperty("团队业绩")
- private Integer allUSDT;
-
@ApiModelProperty("购买总算力")
private Integer allPower;
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 8045a9f..5ae37ff 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -106,33 +106,22 @@
<select id="selectAllPowerByMemberIdAndElse" resultType="java.lang.Integer">
select ifnull(sum(quantity),0) from yd_order where type = 1 and member_id in (
- select member_id from member
+ select id from member
where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
)
</select>
<select id="getTeamInfoList" resultType="com.xcong.excoin.modules.yunding.vo.TeamInfoVo">
SELECT
- a.phone phone,
- (
- SELECT
- IFNULL(sum(b.quantity),0)
- FROM
- yd_order b
- WHERE
- b.member_id = a.id
- AND b.type = 1
- ) powerNum
+ a.invite_id invitephone
FROM
member a
WHERE
a.referer_id = #{record.inviteId}
- ORDER BY
- powerNum DESC
</select>
<select id="selectMemberByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
select * from member
- where find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId}
+ where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1