From b90bb6e1cedd0210c231a5485b29c5724078d9f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Aug 2022 17:14:38 +0800
Subject: [PATCH] fix:add matrixTree
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 88 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 21 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 7e41717..b9d38ab 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,7 +31,9 @@
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;
/**
@@ -49,6 +49,7 @@
private final DappWalletMineDao dappWalletMineDao;
private final DappTransferRecordDao dappTransferRecordDao;
private final RedisUtils redisUtils;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -120,10 +121,18 @@
}
@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");
+ }
+ }
+
member = insertMember(connectDto.getAddress(), null);
}
@@ -229,18 +238,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
@@ -258,10 +266,31 @@
@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(1);
+ 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(1);
+ }
member.setInviteId(ShareCodeUtil.toSerialCode(member.getId()));
member.setRefererId(refererId);
@@ -269,6 +298,8 @@
boolean flag = false;
String parentId = refererId;
String ids = "";
+ String feeProfitIds = "";
+
while (!flag && StringUtils.isNotBlank(parentId)) {
if (StrUtil.isBlank(ids)) {
ids += parentId;
@@ -276,12 +307,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())) {
@@ -289,9 +326,18 @@
}
}
member.setRefererIds(ids);
+ member.setFeeProfitIds(feeProfitIds);
}
dappMemberDao.updateById(member);
return member;
}
+
+ @Override
+ public List<TeamListVo> findTeamList(TeamListDto teamListDto) {
+ 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