From 34ce46da72d7b0b707986ed0f2b6174021bc25ea Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Dec 2022 15:13:23 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 8a87b97..33b4b92 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -361,8 +361,8 @@
}
//如果还有剩余给技术方
if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
- BigDecimal avaProfit = levelProfitTotal.subtract(systemProfit);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(memberId, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+ BigDecimal avaProfit = levelProfitTotal.subtract(systemProfitTotal);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -383,7 +383,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;
}
@@ -477,9 +477,9 @@
}
@Override
- public void agentUp(String inviteId) {
+ public void agentUp(Long id) {
//根据邀请码获取用户信息
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
@@ -489,17 +489,19 @@
}
//当前为BOSS，且直推中有两个BOSS以上，则升级BIG_BOSS
if(DataDictionaryEnum.BOSS.getCode().equals(accountType)){
- Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),inviteId);
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getInviteId());
if(2 <= bossCount){
dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BIG_BOSS.getCode(),dappMemberEntity.getId());
}
+ return;
}
//当前为AGENT，且直推中有两个以上，则升级BOSS
if(DataDictionaryEnum.AGENT.getCode().equals(accountType)){
- Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,inviteId);
+ Integer bossCount = dappMemberDao.selectCountByAccountTypeAndRefererId(null,dappMemberEntity.getInviteId());
if(2 <= bossCount){
dappMemberDao.updateMemberAccountType(DataDictionaryEnum.BOSS.getCode(),dappMemberEntity.getId());
}
+ return;
}
}
--
Gitblit v1.9.1