From 526394d6b8bc93d3e06b59feb8bbc871403dc089 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Jun 2024 14:17:29 +0800
Subject: [PATCH] 后台

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 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 a21872d..5160cb4 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
@@ -102,14 +102,18 @@
 
         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;
     }
@@ -403,9 +407,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