From 4f714c015214752e61ecaef580868385bc86cde0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Jun 2024 14:51:38 +0800
Subject: [PATCH] 后台
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 2c805e3..506e990 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -29,7 +29,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @author
@@ -60,7 +59,7 @@
DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- List<DappMemberEntity> inviteList = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
+ List<DappMemberEntity> inviteList = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, null);
List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2, null);
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
@@ -69,7 +68,8 @@
walletInfo.setDirectCnt(CollUtil.isEmpty(direct) ? 0 : direct.size());
walletInfo.setInviteCnt(CollUtil.isEmpty(inviteList) ? 0 : inviteList.size());
- List<DappMemberEntity> collect = direct.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
+ List<DappMemberEntity> collect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2, 1);
+// List<DappMemberEntity> collect = direct.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
walletInfo.setActiveCnt(CollUtil.isEmpty(collect) ? 0 : collect.size());
// walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
walletInfo.setInviteId(member.getInviteId());
@@ -102,6 +102,27 @@
BigDecimal bigDecimal = dappFundFlowDao.selectSumAmountByMemberIdAndType(member.getId(), 14);
walletInfo.setBuyNodePerk(bigDecimal);
+
+ int i = memberInfo.getBuyNode() * 2000;
+ int teamCnt = CollUtil.isEmpty(direct) ? 0 : direct.size();
+ int i1 = teamCnt * 15;
+ QueryWrapper<DbMemberNode> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id",member.getId());
+ List<DbMemberNode> dbMemberNodes1 = dbMemberNodeMapper.selectList(objectQueryWrapper);
+ walletInfo.setScoreCnt(i+i1+(CollUtil.isEmpty(dbMemberNodes1) ? 0 : dbMemberNodes1.size())*300);
+// Integer activeStatus = ObjectUtil.isEmpty(member.getActiveStatus()) ? 2 : member.getActiveStatus();
+// if(1 == activeStatus){
+// int i = memberInfo.getBuyNode() * 2000;
+// int teamCnt = CollUtil.isEmpty(direct) ? 0 : direct.size();
+// int i1 = teamCnt * 15;
+// QueryWrapper<DbMemberNode> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("member_id",member.getId());
+// List<DbMemberNode> dbMemberNodes1 = dbMemberNodeMapper.selectList(objectQueryWrapper);
+// walletInfo.setScoreCnt(i+i1+(CollUtil.isEmpty(dbMemberNodes1) ? 0 : dbMemberNodes1.size())*300);
+// }else{
+// walletInfo.setScoreCnt(0);
+// }
+
return walletInfo;
}
@@ -394,9 +415,11 @@
int perKNum = Integer.parseInt(ObjectUtil.isEmpty(perKNumDic) ? "200" : perKNumDic.getValue());
List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(null);
- int sum1 = dappMemberEntities.stream().mapToInt(DappMemberEntity::getBuyNode).sum();
- if(perKNum < sum1 + 1){
- throw new FebsException("节点已售完");
+ if(CollUtil.isNotEmpty(dappMemberEntities)){
+ int sum1 = dappMemberEntities.stream().mapToInt(DappMemberEntity::getBuyNode).sum();
+ if(perKNum < sum1 + 1){
+ throw new FebsException("节点已售完");
+ }
}
if (ObjectUtil.isEmpty(transferDto.getId())) {
--
Gitblit v1.9.1