From 08d5c76dc776c64efeb2a7d8fa33f90ee5132bfe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 04 Sep 2022 12:10:36 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 e39ba60..2d637ea 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
@@ -133,16 +133,18 @@
throw new FebsException("recommender is not exist");
}
- List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1);
+ List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null);
if (child.size() == 6) {
throw new FebsException("Invite Code is Invalid");
}
+ } else {
+ connectDto.setInviteId(null);
}
- member = insertMember(connectDto.getAddress(), null);
+ member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
- redisUtils.set(connectDto.getAddress(), member);
+ redisUtils.hset(AppContants.REDIS_KEY_MEMBER_INFO, connectDto.getAddress(), member);
Map<Object, Object> keys = redisUtils.hmget(AppContants.REDIS_KEY_SIGN);
if (keys == null) {
@@ -282,14 +284,16 @@
member.setChainType(chainType);
member.setAccountType(accountType);
member.setActiveStatus(2);
- member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
- member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
dappMemberDao.insert(member);
DappWalletCoinEntity walletCoin = new DappWalletCoinEntity();
walletCoin.setMemberId(member.getId());
dappWalletCoinDao.insert(walletCoin);
+
+ DappWalletMineEntity walletMine = new DappWalletMineEntity();
+ walletMine.setMemberId(member.getId());
+ dappWalletMineDao.insert(walletMine);
if (StrUtil.isEmpty(refererId)) {
refererId = "0";
@@ -303,19 +307,12 @@
boolean flag = false;
String parentId = refererId;
String ids = "";
- String feeProfitIds = "";
while (!flag && StringUtils.isNotBlank(parentId)) {
if (StrUtil.isBlank(ids)) {
ids += parentId;
} else {
ids += ("," + parentId);
- }
-
- if (StrUtil.isBlank(feeProfitIds)) {
- feeProfitIds += parentId;
- } else {
- feeProfitIds += ("," + parentId);
}
DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(parentId);
@@ -331,7 +328,6 @@
}
}
member.setRefererIds(ids);
- member.setFeeProfitIds(feeProfitIds);
}
dappMemberDao.updateById(member);
@@ -339,10 +335,13 @@
}
@Override
- public TeamListVo findTeamList(TeamListDto teamListDto) {
+ public TeamListVo findTeamList() {
DappMemberEntity member = LoginUserUtil.getAppUser();
DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
+ if (topNode == null) {
+ return null;
+ }
return buildTeamMatrix(topNode);
}
@@ -361,6 +360,7 @@
for (DappAchieveMemberTreeEntity childNode : childNodes) {
list.add(buildTeamMatrix(childNode));
}
+ teamListVo.setChildren(list);
return teamListVo;
}
}
--
Gitblit v1.9.1