From 3db83ef4add286feabba2d5db4eabfa27d5fc5f1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 17:13:24 +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 | 51 +++++++++++++++------------------------------------
1 files changed, 15 insertions(+), 36 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 074e5a6..ab06c0e 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
@@ -451,13 +451,13 @@
MemberWalletCoinEntity xch = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "XCH");
BigDecimal totalBalance = xch.getTotalBalance();
BigDecimal subtractTotalBalance = totalBalance.subtract(xchNum);
- if(BigDecimal.ZERO.compareTo(subtractTotalBalance) >= 0){
+ if(BigDecimal.ZERO.compareTo(subtractTotalBalance) > 0){
return Result.fail("XCH数量不足");
}
BigDecimal availableBalance = xch.getAvailableBalance();
BigDecimal subtractAvailableBalance = availableBalance.subtract(xchNum);
- if(BigDecimal.ZERO.compareTo(subtractAvailableBalance) >= 0){
+ if(BigDecimal.ZERO.compareTo(subtractAvailableBalance) > 0){
return Result.fail("XCH数量不足");
}
//xch减少
@@ -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);
}
--
Gitblit v1.9.1