From b075056e19b8f59f61fce3433aa04ffed3d746a4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Nov 2022 09:07:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 d10d5ee..eafaa5d 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
@@ -16,8 +16,10 @@
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;
@@ -51,6 +53,7 @@
private final RedisUtils redisUtils;
private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -133,10 +136,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 +147,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 +294,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";
// 若没有推荐人，则直接激活
@@ -335,9 +342,35 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.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);
+ }
+
public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) {
List<DappAchieveMemberTreeEntity> childNodes = dappAchieveMemberTreeDao.selectMatrixChildNode(node.getTopNode(), node.getTreeNode());
--
Gitblit v1.9.1