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/resources/mapper/yunding/YdOrderDao.xml | 8 +++
src/main/java/com/xcong/excoin/modules/yunding/vo/TeamInfoVo.java | 3 +
src/main/java/com/xcong/excoin/modules/yunding/vo/TeamVo.java | 3 +
src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java | 2 +
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 47 ++++++++++++++++++-----
5 files changed, 52 insertions(+), 11 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 ee867a5..b38e0f1 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
@@ -38,4 +38,6 @@
int selectAllPowerByMemberIdAndElse(@Param("inviteId")String inviteId);
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 dd1a52a..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
@@ -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);
}
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 3a31437..84abe87 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
@@ -12,6 +12,9 @@
@ApiModelProperty("账号")
private String phone;
+ @ApiModelProperty("人数")
+ private Integer memberNum;
+
@ApiModelProperty("购买算力")
private Integer powerNum;
}
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 a5943dc..5aca84d 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,6 +13,9 @@
@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 f22bb8f..8045a9f 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -106,7 +106,8 @@
<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 where referer_id = #{inviteId}
+ select member_id from member
+ where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
)
</select>
@@ -129,4 +130,9 @@
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}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1