From 9b3a67db63c2a51c1e97501b9e73f792a5f55bf8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Dec 2022 12:06:28 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 78 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 16 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 667bd27..753a58c 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
@@ -20,10 +20,13 @@
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.ApiRunListInfoVo;
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;
@@ -54,6 +57,7 @@
private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final DappSystemProfitDao dappSystemProfitDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -136,10 +140,10 @@
throw new FebsException("recommender is not exist");
}
- List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null);
- 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);
}
@@ -277,7 +281,7 @@
@Override
public DappMemberEntity insertMember(String address, String refererId) {
- return insertMember(address, refererId, "BSC", "normal");
+ return insertMember(address, refererId, "BSC", DataDictionaryEnum.MEMBER.getCode());
}
@Override
@@ -340,12 +344,12 @@
@Override
public TeamListVo findTeamList() {
DappMemberEntity member = LoginUserUtil.getAppUser();
-
- DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1);
- if (topNode == null) {
+ //如果没有加入动能即返回null
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isEmpty(dappSystemProfit)){
return null;
}
- return buildTeamMatrix(topNode);
+ return buildTeamMatrix(member.getId());
}
@Override
@@ -364,22 +368,64 @@
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());
+ @Override
+ public ApiRunListInfoVo findRunListInfo() {
+ ApiRunListInfoVo apiRunListInfoVo = new ApiRunListInfoVo();
+ //获取当前是第几轮队列
+ String redisKey = "QUEUE_COUNT";
+ String memberOutCount = redisUtils.getString(redisKey);
+ DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
+ String queueCount = queueCountSet.getValue();
+ if(StrUtil.isBlank(memberOutCount)){
+ redisUtils.set(redisKey,queueCount,0L);
+ memberOutCount = queueCount;
+ }
+ //出局条件的人数
+ /**
+ * 初始大小 5+4*0
+ * 1 1,2,3,4,5 1出局 5+4*0
+ * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
+ * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
+ * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
+ */
+ Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
+ //判断当前是否符合出局条件
+ QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
+ //实际投资人数
+ Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+ //实际投资人数小于出局条件人数
+ //符合则出局 实际投资人数等于出局条件人数
+ DappSystemProfit dappSystemProfitIn = dappSystemProfitDao.selectSystemProfitInByState(DappSystemProfit.STATE_IN);
+ apiRunListInfoVo.setLuckyMemberNext(dappSystemProfitIn.getId());
+ DappSystemProfit dappSystemProfitOut = dappSystemProfitDao.selectSystemProfitOutByState(DappSystemProfit.STATE_OUT);
+ apiRunListInfoVo.setLuckyMember(dappSystemProfitOut.getId());
+ return apiRunListInfoVo;
+ }
+ public TeamListVo buildTeamMatrix(Long memberId) {
+ DappMemberEntity member = dappMemberDao.selectById(memberId);
TeamListVo teamListVo = new TeamListVo();
- teamListVo.setName(node.getInviteId());
- teamListVo.setHasMoney(node.getHasMoney());
+ teamListVo.setAddress(member.getAddress());
+ teamListVo.setAccountType(member.getAccountType());
+ teamListVo.setActiveStatus(member.getActiveStatus());
+ List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectMemberInfoByRefererId(member.getInviteId());
+ teamListVo.setDirectCnt(dappMemberEntities.size());
- if (CollUtil.isEmpty(childNodes)) {
+ if (CollUtil.isEmpty(dappMemberEntities)) {
return teamListVo;
}
List<TeamListVo> list = new ArrayList<>();
- for (DappAchieveMemberTreeEntity childNode : childNodes) {
- list.add(buildTeamMatrix(childNode));
+ for (DappMemberEntity childNode : dappMemberEntities) {
+ list.add(buildTeamMatrix(childNode.getId()));
}
teamListVo.setChildren(list);
return teamListVo;
--
Gitblit v1.9.1