From 1d0d712b4f2b489e020cbf23eaf20e386eee1561 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 01:46:42 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index 27a395d..eb08a01 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.mall.service.IAgentService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.service.IMatrixTreeNodeService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
import cc.mrbird.febs.rabbit.constants.QueueConstants;
import cc.mrbird.febs.rabbit.enumerates.RabbitQueueEnum;
@@ -29,12 +30,10 @@
@Autowired
private IMemberProfitService memberProfitService;
- @RabbitListener(queues = QueueConstants.QUEUE_DEFAULT)
- public void agentReturn(Message message, Channel channel) {
- log.info("消费者:{}", new String(message.getBody()));
- }
+ @Autowired
+ private IMatrixTreeNodeService matrixTreeNodeService;
- @RabbitListener(queues = "hlm_queue_order_delay")
+ @RabbitListener(queues = "meye_queue_order_delay")
public void orderCancelDelay(String id) {
try {
orderInfoService.autoCancelOrder(Long.parseLong(id));
@@ -45,21 +44,11 @@
@RabbitListener(queues = QueueConstants.AGENT_AUTO_LEVEL_UP)
public void agentAutoLevelUp(String id) {
- log.info("收到代理自动升级消息:{}", id);
+ log.info("收到合伙人自动升级消息:{}", id);
try {
agentService.autoUpAgentLevel(Long.parseLong(id));
} catch (Exception e) {
- log.error("代理自动升级异常", e);
- }
- }
-
- @RabbitListener(queues = QueueConstants.AGENT_RETURN_MONEY)
- public void agentReturnMoney(String orderId) {
- log.info("收到返利消息:{}", orderId);
- try {
- agentService.returnMoneyToAgent(Long.parseLong(orderId));
- } catch (Exception e) {
- log.error("返利异常", e);
+ log.error("合伙人自动升级异常", e);
}
}
@@ -67,9 +56,26 @@
public void orderReturnMoney(String orderId) {
log.info("收到订单返利消息:{}", orderId);
try {
- memberProfitService.dynamicProfit(Long.parseLong(orderId));
+ memberProfitService.directProfit(Long.parseLong(orderId));
} catch (Exception e) {
log.error("订单返利异常:", e);
}
}
+
+ @RabbitListener(queues = QueueConstants.ORDER_BONUS)
+ public void calOrderBonus(String orderId) {
+ log.info("收到订单分红消息:{}", orderId);
+ try {
+ memberProfitService.orderBonus(Long.parseLong(orderId));
+ } catch (Exception e) {
+ log.error("订单分红消息异常:", e);
+ }
+ }
+
+ @RabbitListener(queues = QueueConstants.MATRIX_TREE)
+ public void matrixTree(Long memberId) {
+ log.info("矩阵节点消息:{}", memberId);
+ matrixTreeNodeService.addTreeNode(memberId);
+ }
+
}
--
Gitblit v1.9.1