From db473725c214b39f79a40905930065fca7ec8408 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Aug 2022 19:21:30 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 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 acc3067..344baa4 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.service.impl;
+import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
@@ -120,16 +121,23 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void connect(ConnectDto connectDto) {
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
- member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+// DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// if (parent == null) {
+// throw new FebsException("邀请人不存在");
+// }
+
+ throw new FebsException(MessageSourceUtils.getString("system_regist_error"));
+// member = insertMember(connectDto.getAddress(), null);
}
- if (member.getActiveStatus() == 2) {
- throw new FebsException("账号暂未激活，请联系推荐人");
- }
+// if (member.getActiveStatus() == 2) {
+// throw new FebsException("注册成功，账号暂未激活，请联系推荐人");
+// }
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
redisUtils.set(connectDto.getAddress(), member);
@@ -233,18 +241,17 @@
@Override
public void transfer(String address, String chain) {
- BigDecimal balance = ChainService.getInstance(chain).balanceOf(address);
- String hash = ChainService.getInstance(chain).transfer(address, balance);
- if (StrUtil.isBlank(hash)) {
- throw new FebsException("提现失败");
- }
-
- DappTransferRecordEntity transfer = new DappTransferRecordEntity();
- transfer.setAddress(address);
- transfer.setAmount(balance);
- transfer.setHash(hash);
- transfer.setChainType(chain);
- dappTransferRecordDao.insert(transfer);
+// BigDecimal balance = ChainService.getInstance(chain).balanceOf(address);
+// String hash = ChainService.getInstance(chain).transfer(address, balance);
+// if (StrUtil.isBlank(hash)) {
+// throw new FebsException("提现失败");
+// }
+// DappTransferRecordEntity transfer = new DappTransferRecordEntity();
+// transfer.setAddress(address);
+// transfer.setAmount(balance);
+// transfer.setHash(hash);
+// transfer.setChainType(chain);
+// dappTransferRecordDao.insert(transfer);
}
@Override
@@ -272,8 +279,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));
@@ -286,8 +292,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";
@@ -301,6 +310,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;
@@ -308,12 +321,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())) {
@@ -321,6 +343,7 @@
}
}
member.setRefererIds(ids);
+ member.setFeeProfitIds(feeProfitIds);
}
dappMemberDao.updateById(member);
@@ -329,7 +352,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