From 59e72b77145e288cd6822284604804918ad8cf87 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 17 Jun 2024 10:20:49 +0800
Subject: [PATCH] 节点限购200个

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    9 +++++++--
 src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java                    |    8 +++++++-
 2 files changed, 14 insertions(+), 3 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 806da59..2c805e3 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,6 +29,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author
@@ -59,13 +60,17 @@
 
         DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
         WalletInfoVo walletInfo = new WalletInfoVo();
-//        List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
+        List<DappMemberEntity> inviteList = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
         List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2, null);
         DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
         DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
 
         DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
-        walletInfo.setDirectCnt(direct.size());
+        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());
+        walletInfo.setActiveCnt(CollUtil.isEmpty(collect) ? 0 : collect.size());
 //        walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
         walletInfo.setInviteId(member.getInviteId());
         walletInfo.setBalance(walletCoin.getAvailableAmount());
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
index 00419d5..3eda72d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/WalletInfoVo.java
@@ -17,7 +17,7 @@
     @ApiModelProperty(value = "邀请码")
     private String inviteId;
 
-    @ApiModelProperty(value = "直推数量")
+    @ApiModelProperty(value = "粉丝")
     private Integer directCnt;
 
     @ApiModelProperty(value = "余额")
@@ -49,4 +49,10 @@
 
     @ApiModelProperty(value = "是否是节点 1-是 0-否")
     private Integer buyNode;
+
+    @ApiModelProperty(value = "直推数量")
+    private Integer inviteCnt;
+
+    @ApiModelProperty(value = "有效人数")
+    private Integer activeCnt;
 }

--
Gitblit v1.9.1