From a4b8bc1b7d84d6c68dbd70d8cb654023825c43ce Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Aug 2022 14:59:55 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 5 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 2 -
src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java | 5 ++
src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java | 2 +
src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java | 24 ++++++++++++
src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java | 9 ++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 6 ++
src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java | 9 ++--
src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java | 7 +++
src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java | 18 +++++++++
10 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java
new file mode 100644
index 0000000..9a2497d
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieveTreeEntity.java
@@ -0,0 +1,24 @@
+package cc.mrbird.febs.dapp.entity;
+
+import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2022-08-25
+ **/
+@Data
+@TableName("dapp_achieve_tree")
+public class DappAchieveTreeEntity extends BaseEntity {
+
+ private Long midNode;
+
+ private Long leftNode;
+
+ private Long rightNode;
+
+ private int batchNo;
+
+ private int validState;
+}
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 33731b8..6955a64 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappSystemService.java
@@ -55,4 +55,6 @@
BigDecimal newestPrice();
boolean hasProfit(String address);
+
+ void achieveTree(Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index b3299b2..a689831 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -68,8 +68,6 @@
return;
}
- DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
-
BigInteger tokens = e.tokens;
BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
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 b9d38ab..ce7042d 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
@@ -131,8 +131,12 @@
if (parent == null) {
throw new FebsException("recommender is not exist");
}
- }
+ List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1);
+ if (child.size() == 6) {
+ throw new FebsException("Invite Code is Invalid");
+ }
+ }
member = insertMember(connectDto.getAddress(), null);
}
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 9fc1c1c..c6db697 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
@@ -725,4 +725,9 @@
return true;
}
+
+ @Override
+ public synchronized void achieveTree(Long memberId) {
+
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java b/src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java
index 64b41f2..087e911 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/QueueConstants.java
@@ -6,8 +6,9 @@
**/
public class QueueConstants {
- public static final String ONLINE_TRANSFER = "queue_online_transfer";
- public static final String DISTRIB_PROFIT = "queue_distrib_profit";
- public static final String USER_BUY_REWARD = "queue_user_buy_reward";
- public static final String NFT_BOX = "queue_nft_box";
+ public static final String ONLINE_TRANSFER = "queue_sdm_online_transfer";
+ public static final String DISTRIB_PROFIT = "queue_sdm_distrib_profit";
+ public static final String USER_BUY_REWARD = "queue_sdm_user_buy_reward";
+ public static final String NFT_BOX = "queue_sdm_nft_box";
+ public static final String ACHIEVE_TREE = "queue_sdm_achieve_tree";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java b/src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java
index 1a739d5..c4a20cc 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/QueueEnum.java
@@ -6,10 +6,11 @@
@Getter
public enum QueueEnum {
- ONLINE_TRANSFER("exchange_online_transfer", "route_key_online_transfer", "queue_online_transfer"),
- DISTRIB_PROFIT("exchange_distrib_profit", "route_key_distrib_profit", "queue_distrib_profit"),
- USER_BUY_REWARD("exchange_user_buy_reward", "route_key_user_buy_reward", "queue_user_buy_reward"),
- NFT_BOX("exchange_nft_box", "route_key_nft_box", "queue_nft_box");
+ ONLINE_TRANSFER("exchange_sdm_online_transfer", "route_key_sdm_online_transfer", "queue_sdm_online_transfer"),
+ DISTRIB_PROFIT("exchange_sdm_distrib_profit", "route_key_sdm_distrib_profit", "queue_sdm_distrib_profit"),
+ USER_BUY_REWARD("exchange_sdm_user_buy_reward", "route_key_sdm_user_buy_reward", "queue_sdm_user_buy_reward"),
+ NFT_BOX("exchange_sdm_nft_box", "route_key_sdm_nft_box", "queue_sdm_nft_box"),
+ ACHIEVE_TREE("exchange_sdm_achieve_tree", "route_key_sdm_achieve_tree", "queue_sdm_achieve_tree");
private String exchange;
diff --git a/src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java b/src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java
index 0e6c190..95cd88d 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/RabbitConfiguration.java
@@ -93,4 +93,22 @@
return BindingBuilder.bind(nftBoxQueue()).to(nftBoxExchange()).with(QueueEnum.NFT_BOX.getRoute());
}
// === nft卡牌盲盒 end ===
+
+
+ // === 业绩树 start ===
+ @Bean
+ public DirectExchange achieveTreeExchange() {
+ return new DirectExchange(QueueEnum.ACHIEVE_TREE.getExchange());
+ }
+
+ @Bean
+ public Queue achieveTreeQueue() {
+ return new Queue(QueueEnum.ACHIEVE_TREE.getQueue());
+ }
+
+ @Bean
+ public Binding achieveTreeBind() {
+ return BindingBuilder.bind(achieveTreeQueue()).to(achieveTreeExchange()).with(QueueEnum.ACHIEVE_TREE.getRoute());
+ }
+ // === 业绩树 end ===
}
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 3c9172b..5d63022 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/ChainConsumer.java
@@ -45,4 +45,9 @@
log.info("收到nft盲盒消息:{}", id);
dappSystemService.boxCnt(Long.parseLong(id));
}
+
+ @RabbitListener(queues = QueueConstants.ACHIEVE_TREE)
+ public void achieveTree(String id) {
+ log.info("收到业绩树消息");
+ }
}
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 e2da47e..748b28d 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
@@ -56,4 +56,11 @@
CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
rabbitTemplate.convertAndSend(QueueEnum.NFT_BOX.getExchange(), QueueEnum.NFT_BOX.getRoute(), id, correlationData);
}
+
+
+ public void sendAchieveTreeMsg(Long id) {
+ log.info("发送业绩树消息:{}", id);
+ CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
+ rabbitTemplate.convertAndSend(QueueEnum.ACHIEVE_TREE.getExchange(), QueueEnum.ACHIEVE_TREE.getRoute(), id, correlationData);
+ }
}
--
Gitblit v1.9.1