From b3b3baf9a3b0147ca38476450ca1823c291abd20 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 21 Jun 2024 23:02:46 +0800
Subject: [PATCH] 后台矩阵列表
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 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 2511380..732eece 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,6 +1,5 @@
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;
@@ -8,20 +7,22 @@
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.dto.TeamListDto;
import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo;
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.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,6 +52,9 @@
private final RedisUtils redisUtils;
private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final DappFundFlowDao dappFundFlowDao;
+ private final DbMemberNodeMapper dbMemberNodeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -133,10 +137,10 @@
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");
- }
+// List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null);
+// if (child.size() == 6) {
+// throw new FebsException("Invite Code is Invalid");
+// }
} else {
connectDto.setInviteId(null);
}
@@ -144,7 +148,7 @@
}
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) {
@@ -291,6 +295,10 @@
walletCoin.setMemberId(member.getId());
dappWalletCoinDao.insert(walletCoin);
+ DappWalletMineEntity walletMine = new DappWalletMineEntity();
+ walletMine.setMemberId(member.getId());
+ dappWalletMineDao.insert(walletMine);
+
if (StrUtil.isEmpty(refererId)) {
refererId = "0";
// 若没有推荐人，则直接激活
@@ -331,11 +339,55 @@
}
@Override
- public TeamListVo findTeamList(TeamListDto teamListDto) {
+ public TeamListVo findTeamList() {
DappMemberEntity member = LoginUserUtil.getAppUser();
- DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
+// DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
+// if (topNode == null) {
+// return null;
+// }
+// return buildTeamMatrix(topNode);
+ QueryWrapper<DappFundFlowEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id", member.getId());
+ objectQueryWrapper.orderByDesc("create_time");
+ List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectList(objectQueryWrapper);
+ if(ObjectUtil.isEmpty(dappFundFlowEntities)){
+ return null;
+ }
+ DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(dappFundFlowEntities.get(0).getId(), 1);
+ if (topNode == null) {
+ return null;
+ }
return buildTeamMatrix(topNode);
+ }
+
+ @Override
+ public void setSystemFee(AdminSystemFeeVo adminSystemFeeVo) {
+ String rebatePercent = adminSystemFeeVo.getRebatePercent();
+ DataDictionaryCustom rebateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.REBATE_PERCENT.getType(), DataDictionaryEnum.REBATE_PERCENT.getCode());
+ rebateDic.setValue(rebatePercent);
+ dataDictionaryCustomMapper.updateById(rebateDic);
+
+ String serviceFee = adminSystemFeeVo.getServiceFee();
+ DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
+ serviceFeeDic.setValue(serviceFee);
+ dataDictionaryCustomMapper.updateById(serviceFeeDic);
+
+ String memberFee = adminSystemFeeVo.getMemberFee();
+ DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
+ memberFeeDic.setValue(memberFee);
+ dataDictionaryCustomMapper.updateById(memberFeeDic);
+
+ String symbolPrice = adminSystemFeeVo.getSymbolPrice();
+ DataDictionaryCustom symbolPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
+ symbolPriceDic.setValue(symbolPrice);
+ dataDictionaryCustomMapper.updateById(symbolPriceDic);
+ }
+
+ @Override
+ public IPage<DbMemberNode> memberNodeList(DbMemberNode dbMemberNode, QueryRequest request) {
+ Page<DbMemberNode> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return dbMemberNodeMapper.selectListInPage(dbMemberNode, page);
}
public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) {
@@ -353,6 +405,7 @@
for (DappAchieveMemberTreeEntity childNode : childNodes) {
list.add(buildTeamMatrix(childNode));
}
+ teamListVo.setChildren(list);
return teamListVo;
}
}
--
Gitblit v1.9.1