From ecedfccfa0a5161df4b3e2409e63850e25eb3c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Dec 2022 11:33:26 +0800
Subject: [PATCH] 20221216 常量初始化
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 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 17ae581..6d3256e 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
@@ -150,8 +150,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());
@@ -369,6 +369,9 @@
if(ObjectUtil.isEmpty(dappSystemProfit)){
return null;
}
+ //升级用户的代理等级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+ chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
return buildTeamMatrix(member.getId());
}
@@ -403,7 +406,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 +424,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);
--
Gitblit v1.9.1