From ecd3e29dd40060fc9fc73807740a868c397b8462 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jul 2022 18:59:14 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index d4aff8c..fca3d0f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -124,12 +124,12 @@
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
- DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- if (parent == null) {
- throw new FebsException("邀请人不存在");
- }
+// DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// if (parent == null) {
+// throw new FebsException("邀请人不存在");
+// }
- member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+ member = insertMember(connectDto.getAddress(), null);
}
// if (member.getActiveStatus() == 2) {
@@ -276,8 +276,7 @@
member.setAddress(address);
member.setChainType(chainType);
member.setAccountType(accountType);
- // 如果有推荐人，则需要推荐人转币后激活
- member.setActiveStatus(2);
+ member.setActiveStatus(1);
member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
@@ -290,8 +289,11 @@
} else {
member.setNodeType(2);
}
-
dappMemberDao.insert(member);
+
+ DappWalletCoinEntity walletCoin = new DappWalletCoinEntity();
+ walletCoin.setMemberId(member.getId());
+ dappWalletCoinDao.insert(walletCoin);
if (StrUtil.isEmpty(refererId)) {
refererId = "0";
@@ -305,6 +307,10 @@
boolean flag = false;
String parentId = refererId;
String ids = "";
+ String feeProfitIds = "";
+
+ int i = 1;
+ List<DataDictionaryCustom> feeProfitDic = dataDictionaryCustomMapper.selectDicByType(AppContants.DIC_TYPE_DISTRIBUTE_PROP);
while (!flag && StringUtils.isNotBlank(parentId)) {
if (StrUtil.isBlank(ids)) {
ids += parentId;
@@ -312,12 +318,21 @@
ids += ("," + parentId);
}
+ if (i <= feeProfitDic.size()) {
+ if (StrUtil.isBlank(feeProfitIds)) {
+ feeProfitIds += parentId;
+ } else {
+ feeProfitIds += ("," + parentId);
+ }
+ }
+
+ i++;
DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(parentId);
if (parentMember == null) {
break;
}
parentId = parentMember.getRefererId();
- if(StringUtils.isBlank(parentId)){
+ if(StringUtils.isBlank(parentId) || "0".equals(parentId)){
break;
}
if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -325,6 +340,7 @@
}
}
member.setRefererIds(ids);
+ member.setFeeProfitIds(feeProfitIds);
}
dappMemberDao.updateById(member);
@@ -333,7 +349,9 @@
@Override
public List<TeamListVo> findTeamList(TeamListDto teamListDto) {
-
- return new ArrayList<>();
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Page<TeamListDto> page = new Page<>(teamListDto.getPageNum(), teamListDto.getPageSize());
+ teamListDto.setInviteId(member.getInviteId());
+ return dappMemberDao.selectTeamListInPage(teamListDto, page).getRecords();
}
}
--
Gitblit v1.9.1