From 2830c205c640dc4b7d502618ad107e44c975241a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 24 Jun 2024 16:21:55 +0800
Subject: [PATCH] 后台矩阵列表
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 0cd9300..d4bb23e 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
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author
@@ -69,9 +70,10 @@
walletInfo.setDirectCnt(CollUtil.isEmpty(direct) ? 0 : direct.size());
walletInfo.setInviteCnt(CollUtil.isEmpty(inviteList) ? 0 : inviteList.size());
- 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());
+ List<DappMemberEntity> collect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
+ walletInfo.setActiveDirect(CollUtil.isEmpty(collect) ? 0 : collect.size());
+ List<DappMemberEntity> collectTeam = direct.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
+ walletInfo.setActiveCnt(CollUtil.isEmpty(collectTeam) ? 0 : collectTeam.size());
// walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
walletInfo.setInviteId(member.getInviteId());
walletInfo.setBalance(walletCoin.getAvailableAmount());
@@ -267,10 +269,6 @@
updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
// updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2);
-
-
- DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 20, 2, null, null);
- dappFundFlowDao.insert(feeFlow);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 1, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
@@ -606,7 +604,6 @@
QueryWrapper<MemberCoinWithdrawEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("flow_id",id);
MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectOne(objectQueryWrapper);
-// MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id);
if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
throw new FebsException("刷新页面重试");
}
@@ -620,6 +617,9 @@
DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(memberCoinWithdrawEntity.getFlowId());
dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(dappFundFlowEntity);
+
+ DappFundFlowEntity feeFlow = new DappFundFlowEntity(dappFundFlowEntity.getMemberId(), memberCoinWithdrawEntity.getFeeAmount().negate(), 20, 1, null, null);
+ dappFundFlowDao.insert(feeFlow);
return new FebsResponse().success();
}
@@ -649,7 +649,6 @@
dappFundFlowDao.updateById(dappFundFlowEntity);
this.updateWalletCoinWithLock(memberCoinWithdrawEntity.getAmount(), memberCoinWithdrawEntity.getMemberId(), 1);
-// this.updateWalletMineWithLock(memberCoinWithdrawEntity.getFeeAmount(), memberCoinWithdrawEntity.getMemberId(), 1);
DappFundFlowEntity feeFlow = new DappFundFlowEntity(memberCoinWithdrawEntity.getMemberId(), memberCoinWithdrawEntity.getAmount(), 22, 2, null, null);
dappFundFlowDao.insert(feeFlow);
@@ -670,7 +669,7 @@
QueryWrapper<DbMemberNode> childQuery = new QueryWrapper<>();
childQuery.eq("parent_node",id);
childQuery.eq("type", dbMemberNode.getType());
- childQuery.eq("work_state", DbMemberNode.STATE_ONE);
+// childQuery.eq("work_state", DbMemberNode.STATE_ONE);
List<DbMemberNode> childrenNode = dbMemberNodeMapper.selectList(childQuery);
if(CollUtil.isEmpty(childrenNode)){
return memberNodeVo;
--
Gitblit v1.9.1