From d0dd32f897c2b6786f4da8b860b7dcb58a71ac62 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 16:11:44 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 131 ++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 29 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 6efb1dc..e39ba60 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;
@@ -7,20 +8,17 @@
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
+import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
import cc.mrbird.febs.dapp.dto.ConnectDto;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
-import cc.mrbird.febs.dapp.entity.DappMemberEntity;
-import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
-import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
-import cc.mrbird.febs.dapp.entity.DappWalletMineEntity;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappTransferRecordDao;
-import cc.mrbird.febs.dapp.mapper.DappWalletCoinDao;
-import cc.mrbird.febs.dapp.mapper.DappWalletMineDao;
+import cc.mrbird.febs.dapp.dto.TeamListDto;
+import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.vo.TeamListVo;
import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -33,11 +31,13 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
- * @author
+ * @author
* @date 2022-03-17
**/
@Service
@@ -49,6 +49,8 @@
private final DappWalletMineDao dappWalletMineDao;
private final DappTransferRecordDao dappTransferRecordDao;
private final RedisUtils redisUtils;
+
+ private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -77,7 +79,7 @@
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
member.setRefererId(approveDto.getRefererId());
- if (StrUtil.isNotBlank(approveDto.getRefererId())){
+ if (StrUtil.isNotBlank(approveDto.getRefererId())) {
boolean flag = false;
String parentId = approveDto.getRefererId();
String ids = "";
@@ -93,7 +95,7 @@
break;
}
parentId = parentMember.getRefererId();
- if(StringUtils.isBlank(parentId)){
+ if (StringUtils.isBlank(parentId)) {
break;
}
if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
@@ -120,19 +122,35 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void connect(ConnectDto connectDto) {
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
+ if (!"asdf4321".equals(connectDto.getInviteId())) {
+ DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+ if (parent == null) {
+ throw new FebsException("recommender is not exist");
+ }
+
+ List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1);
+ if (child.size() == 6) {
+ throw new FebsException("Invite Code is Invalid");
+ }
+ }
member = insertMember(connectDto.getAddress(), null);
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
redisUtils.set(connectDto.getAddress(), member);
- HashMap<String, String> map = new HashMap<>();
- map.put(connectDto.getAddress(), key);
- redisUtils.set(AppContants.REDIS_KEY_SIGN, map);
+ Map<Object, Object> keys = redisUtils.hmget(AppContants.REDIS_KEY_SIGN);
+ if (keys == null) {
+ keys = new HashMap<>();
+ }
+
+ keys.put(connectDto.getAddress(), key);
+ redisUtils.hmset(AppContants.REDIS_KEY_SIGN, keys);
}
@Override
@@ -225,24 +243,23 @@
@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
public IPage<DappTransferRecordEntity> selectTransferInPage(DappTransferRecordEntity transfer, QueryRequest request) {
Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
- return dappTransferRecordDao.selectInPage(transfer,page);
+ return dappTransferRecordDao.selectInPage(transfer, page);
}
@Override
@@ -254,17 +271,40 @@
@Override
public DappMemberEntity insertMember(String address, String refererId) {
+
+ return insertMember(address, refererId, "BSC", "normal");
+ }
+
+ @Override
+ public DappMemberEntity insertMember(String address, String refererId, String chainType, String accountType) {
DappMemberEntity member = new DappMemberEntity();
member.setAddress(address);
+ 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);
+
+ if (StrUtil.isEmpty(refererId)) {
+ refererId = "0";
+ // 若没有推荐人，则直接激活
+ member.setActiveStatus(2);
+ }
+
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
member.setRefererId(refererId);
- if (StrUtil.isNotBlank(refererId)){
+ if (StrUtil.isNotBlank(refererId)) {
boolean flag = false;
String parentId = refererId;
String ids = "";
+ String feeProfitIds = "";
+
while (!flag && StringUtils.isNotBlank(parentId)) {
if (StrUtil.isBlank(ids)) {
ids += parentId;
@@ -272,12 +312,18 @@
ids += ("," + parentId);
}
+ if (StrUtil.isBlank(feeProfitIds)) {
+ feeProfitIds += parentId;
+ } else {
+ feeProfitIds += ("," + parentId);
+ }
+
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())) {
@@ -285,9 +331,36 @@
}
}
member.setRefererIds(ids);
+ member.setFeeProfitIds(feeProfitIds);
}
dappMemberDao.updateById(member);
return member;
}
+
+ @Override
+ public TeamListVo findTeamList(TeamListDto teamListDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+
+ DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
+ return buildTeamMatrix(topNode);
+ }
+
+ public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) {
+ List<DappAchieveMemberTreeEntity> childNodes = dappAchieveMemberTreeDao.selectMatrixChildNode(node.getTopNode(), node.getTreeNode());
+
+ TeamListVo teamListVo = new TeamListVo();
+ teamListVo.setName(node.getInviteId());
+ teamListVo.setHasMoney(node.getHasMoney());
+
+ if (CollUtil.isEmpty(childNodes)) {
+ return teamListVo;
+ }
+
+ List<TeamListVo> list = new ArrayList<>();
+ for (DappAchieveMemberTreeEntity childNode : childNodes) {
+ list.add(buildTeamMatrix(childNode));
+ }
+ return teamListVo;
+ }
}
--
Gitblit v1.9.1