From 94f18c6cae352c9ccb7ea4abceef6db586709dcf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 18:28:49 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 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 17ae581..209b953 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
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
@@ -59,6 +60,9 @@
private final DappSystemProfitDao dappSystemProfitDao;
private final ChainProducer chainProducer;
private final DappFundFlowDao dappFundFlowDao;
+
+ private final DappNodeOrderMapper dappNodeOrderMapper;
+ private final DappMemberNodeMapper dappMemberNodeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -150,8 +154,8 @@
}
member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
//升级用户的代理等级
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
+// DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -206,15 +210,21 @@
if(CollUtil.isNotEmpty(records)){
for(DappMemberEntity memberEntity : records){
Long memberId = memberEntity.getId();
-
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberId,DappSystemProfit.STATE_IN);
- memberEntity.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
+ //直推收益
BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,3,2);
memberEntity.setDirectProfit(directProfit);
- BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,4,2);
- memberEntity.setLevelProfit(levelProfit);
- BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,7,2);
- memberEntity.setLuckyProfit(luckyProfit);
+ //购买节点数量
+ List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(memberId);
+ memberEntity.setMemberNodeCnt(CollUtil.isEmpty(dappMemberNodeVos) ? 0 : dappMemberNodeVos.size());
+
+ BigDecimal memberNodeSumPrice = BigDecimal.ZERO;
+ if(CollUtil.isNotEmpty(dappMemberNodeVos)){
+ for(DappMemberNodeVo dappMemberNodeVo : dappMemberNodeVos){
+ BigDecimal nodePrice = dappMemberNodeVo.getNodePrice();
+ memberNodeSumPrice = memberNodeSumPrice.add(nodePrice);
+ }
+ }
+ memberEntity.setMemberNodeSumPrice(memberNodeSumPrice.setScale(8,BigDecimal.ROUND_DOWN));
}
}
return dappMemberEntityIPage;
@@ -369,6 +379,9 @@
if(ObjectUtil.isEmpty(dappSystemProfit)){
return null;
}
+ //升级用户的代理等级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+ chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
return buildTeamMatrix(member.getId());
}
@@ -393,6 +406,12 @@
DataDictionaryCustom symbolPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
symbolPriceDic.setValue(symbolPrice);
dataDictionaryCustomMapper.updateById(symbolPriceDic);
+
+ String directProfit = adminSystemFeeVo.getDirectProfit();
+ DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+ directProfitDic.setValue(directProfit);
+ dataDictionaryCustomMapper.updateById(directProfitDic);
}
@Override
@@ -403,7 +422,7 @@
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)){
+ if(StrUtil.isBlank(memberOutCount)|| !queueCount.equals(memberOutCount)){
redisUtils.set(redisKey,queueCount,0L);
memberOutCount = queueCount;
}
@@ -421,8 +440,11 @@
objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
//实际投资人数
Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
- BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
- apiRunListInfoVo.setRunPercent(runPercent);
+ int runPercentNum = memberCount - selectCount;
+ runPercentNum = 5-runPercentNum > 0 ? 5-runPercentNum : 1;
+ apiRunListInfoVo.setRunPercent(new BigDecimal(runPercentNum).multiply(new BigDecimal(0.4)).setScale(BigDecimal.ROUND_DOWN,1));
+// BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+// apiRunListInfoVo.setRunPercent(runPercent);
//实际投资人数小于出局条件人数
//符合则出局 实际投资人数等于出局条件人数
DappSystemProfit dappSystemProfitIn = dappSystemProfitDao.selectSystemProfitInByState(DappSystemProfit.STATE_IN);
@@ -468,6 +490,32 @@
return adminTeamInfoVoIPage;
}
+ @Override
+ public FebsResponse getNodeInfo() {
+ List<DappNodeOrderVo> dappNodeOrderVos = dappNodeOrderMapper.selectNodeOrderList();
+ return new FebsResponse().success().data(dappNodeOrderVos);
+ }
+
+ @Override
+ public FebsResponse getMemberNode() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(member.getId());
+ return new FebsResponse().success().data(dappMemberNodeVos);
+ }
+
+ @Override
+ public FebsResponse getMemberInfo() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMemberInfoVo dappMemberInfoVo = dappMemberDao.selectByMemberId(member.getId());
+ return new FebsResponse().success().data(dappMemberInfoVo);
+ }
+
+ @Override
+ public IPage<DappMemberNodeVo> getMemberNodeInfo(DappMemberEntity dappMemberEntity, QueryRequest request) {
+ Page<DappMemberNodeVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return dappMemberNodeMapper.findMemberNodeInPage(page, dappMemberEntity);
+ }
+
public TeamListVo buildTeamMatrix(Long memberId) {
DappMemberEntity member = dappMemberDao.selectById(memberId);
TeamListVo teamListVo = new TeamListVo();
--
Gitblit v1.9.1