From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 20 Dec 2024 13:01:12 +0800 Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑 --- src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 53 ++++++++++++++++++++--------------------------------- 1 files changed, 20 insertions(+), 33 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 705b3f0..9ee6f75 100644 --- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java +++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java @@ -1,17 +1,13 @@ package cc.mrbird.febs.rabbit.consumer; +import cc.mrbird.febs.mall.dto.ApiMemberChargeFailDto; import cc.mrbird.febs.mall.service.IAgentService; -import cc.mrbird.febs.mall.service.IApiMallOrderInfoService; import cc.mrbird.febs.rabbit.constants.QueueConstants; -import cc.mrbird.febs.rabbit.enumerates.RabbitQueueEnum; -import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; - -import java.util.Date; /** * @author wzy @@ -19,45 +15,36 @@ **/ @Slf4j @Component +@ConditionalOnProperty(prefix = "consumer", name = "open", havingValue = "true") public class AgentConsumer { - - @Autowired - private IApiMallOrderInfoService orderInfoService; @Autowired private IAgentService agentService; - @RabbitListener(queues = QueueConstants.QUEUE_DEFAULT) - public void agentReturn(Message message, Channel channel) { - log.info("消费者:{}", new String(message.getBody())); - } - - @RabbitListener(queues = "queue_order_delay") - public void orderCancelDelay(String id) { - log.info("订单超时支付自动取消:{}", id); + /** + * 充值自动过期 + * @param apiMemberChargeFailDto + */ + @RabbitListener(queues = QueueConstants.RUN_VIP_OPERATION_CHARGE_FAIL) + public void memberChargeFailMsg(ApiMemberChargeFailDto apiMemberChargeFailDto) { try { - orderInfoService.autoCancelOrder(Long.parseLong(id)); + agentService.sendMemberChargeFailMsg(apiMemberChargeFailDto); } catch (Exception e) { - log.error("订单超时支付异常", e); + log.error("消费充值自动过期异常", e); } } - @RabbitListener(queues = QueueConstants.AGENT_AUTO_LEVEL_UP) - public void agentAutoLevelUp(String id) { - log.info("收到代理自动升级消息:{}", id); + + /** + * 购买成功 + */ + @RabbitListener(queues = QueueConstants.RUN_VIP_OPERATION_CHARGE) + public void buyVipSuccessMsg(Long chargeId) { try { - agentService.autoUpAgentLevel(Long.parseLong(id)); + agentService.buyVipSuccessMsg(chargeId); } catch (Exception e) { - log.error("代理自动升级异常", 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); - } - } + } -- Gitblit v1.9.1