From a39df92a62edee1cee74c8aee97489dd16de5b66 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jul 2022 10:59:37 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 c92fb2c..d5a46b3 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
@@ -50,6 +50,8 @@
private final RedisUtils redisUtils;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final DappIdoAssetsDao dappIdoAssetsDao;
+
@Override
@Transactional(rollbackFor = Exception.class)
public void approve(ApproveDto approveDto) {
@@ -124,12 +126,21 @@
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
- DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- if (parent == null) {
- throw new FebsException("邀请人不存在");
+ if (StrUtil.isNotBlank(connectDto.getInviteId())) {
+ DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+ if (parent == null) {
+ throw new FebsException("邀请人不存在");
+ }
}
- member = insertMember(connectDto.getAddress(), null);
+ member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+
+ DappIdoAssetsEntity dappIdoAssetsEntity = new DappIdoAssetsEntity();
+ dappIdoAssetsEntity.setBoxCnt(0);
+ dappIdoAssetsEntity.setCoinAmount(BigDecimal.ZERO);
+ dappIdoAssetsEntity.setUsdtAmount(BigDecimal.ZERO);
+ dappIdoAssetsEntity.setMemberId(member.getId());
+ dappIdoAssetsDao.insert(dappIdoAssetsEntity);
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -273,8 +284,8 @@
member.setChainType(chainType);
member.setAccountType(accountType);
member.setActiveStatus(1);
- member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
- member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
+// member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address));
+// member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address));
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_NODE_CNT_LIMIT);
int nodeCntLimit = Integer.parseInt(dic.getValue());
@@ -286,12 +297,11 @@
member.setNodeType(2);
}
+ member.setActiveStatus(1);
dappMemberDao.insert(member);
if (StrUtil.isEmpty(refererId)) {
refererId = "0";
- // 若没有推荐人，则直接激活
- member.setActiveStatus(1);
}
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
--
Gitblit v1.9.1