From 39c9745f125980b8ae6c6d8882356213a4df8eff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Dec 2022 17:06:34 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 10 ++++++----
src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java | 8 ++++----
src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 3 ++-
src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java | 6 +++---
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
index 43a3356..aadd3f1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
@@ -31,5 +31,5 @@
//转账拨币
void bnbTransfer(Long id);
- void agentUp(String inviteId);
+ void agentUp(Long id);
}
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 dfc2076..0a132eb 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
@@ -151,7 +151,8 @@
}
member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
//升级用户的代理等级
- chainProducer.sendAgentUpMsg(connectDto.getInviteId());
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+ chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
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 5fcd4eb..7d1fbbc 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
@@ -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;
}
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java
index 141d89a..ae91478 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java
@@ -74,11 +74,11 @@
}
/**代理升级
- * @param inviteId
+ * @param id
*/
@RabbitListener(queues = QueueConstants.QUEUE_BNB_AGENT_UP)
- public void agentUp(String inviteId) {
- log.info("代理升级:{}", inviteId);
- dappSystemService.agentUp(inviteId);
+ public void agentUp(Long id) {
+ log.info("代理升级:{}", id);
+ dappSystemService.agentUp(id);
}
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java b/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
index c92878b..f03b2d2 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
@@ -95,9 +95,9 @@
/**
* 代理升级
*/
- public void sendAgentUpMsg(String inviteId) {
- log.info("代理升级:{}", inviteId);
+ public void sendAgentUpMsg(Long id) {
+ log.info("代理升级:{}", id);
CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
- rabbitTemplate.convertAndSend(QueueEnum.BNB_AGENT_UP.getExchange(), QueueEnum.BNB_AGENT_UP.getRoute(), inviteId, correlationData);
+ rabbitTemplate.convertAndSend(QueueEnum.BNB_AGENT_UP.getExchange(), QueueEnum.BNB_AGENT_UP.getRoute(), id, correlationData);
}
}
--
Gitblit v1.9.1