From 5742f9cdb399cc75dd1ef27d74cac92e514d8268 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 27 May 2022 11:51:58 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 fd287fe..cdadcb4 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.IMemberProfitService;
import cc.mrbird.febs.rabbit.constants.QueueConstants;
import cc.mrbird.febs.rabbit.enumerates.RabbitQueueEnum;
import com.rabbitmq.client.Channel;
@@ -25,6 +26,8 @@
private IApiMallOrderInfoService orderInfoService;
@Autowired
private IAgentService agentService;
+ @Autowired
+ private IMemberProfitService memberProfitService;
@RabbitListener(queues = QueueConstants.QUEUE_DEFAULT)
public void agentReturn(Message message, Channel channel) {
@@ -53,10 +56,21 @@
@RabbitListener(queues = QueueConstants.AGENT_RETURN_MONEY)
public void agentReturnMoney(String orderId) {
log.info("收到返利消息:{}", orderId);
- try{
+ try {
agentService.returnMoneyToAgent(Long.parseLong(orderId));
} catch (Exception e) {
log.error("返利异常", e);
}
}
+
+ @RabbitListener(queues = QueueConstants.ORDER_RETURN_MONEY)
+ public void orderReturnMoney(String orderId) {
+ log.info("收到订单返利消息:{}", orderId);
+
+ try {
+ memberProfitService.dynamicProfit(Long.parseLong(orderId));
+ } catch (Exception e) {
+ log.error("订单返利异常:{}", e);
+ }
+ }
}
--
Gitblit v1.9.1