From 809b41916cbf53219aca69d94e45effae5ac160b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 May 2021 10:16:51 +0800
Subject: [PATCH] 20210527 不显示合伙人
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 12d3ea6..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
@@ -1,7 +1,6 @@
package com.xcong.excoin.modules.yunding.service.Impl;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -42,7 +41,6 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -453,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减少
@@ -599,6 +597,56 @@
return Result.ok(xchNewPrices);
}
+ @Override
+ public Result getTeamList(TeamInfoDto teamInfoDto) {
+ 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;
+ 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);
+ //详细列表
+ 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.getInvitephone();
+ if(StrUtil.isNotEmpty(phone)){
+ 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