From 4551ab55d370c5ca26209c5a2b8a50f1a976665f Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 7 May 2024 15:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dating-agency-mall-server/pom.xml | 5 ++++ .../user/RewardUserCommandController.java | 11 --------- .../MarriageBountyOrderEventHandle.java | 23 +++++++++++++++++++ .../infrastructure/constant/MqExchange.java | 4 ++++ .../dam/infrastructure/constant/MqQueue.java | 6 +++++ 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dating-agency-mall-server/pom.xml b/dating-agency-mall-server/pom.xml index 79200d8..1b92eb6 100644 --- a/dating-agency-mall-server/pom.xml +++ b/dating-agency-mall-server/pom.xml @@ -81,6 +81,11 @@ dating-agency-mall-event 0.0.1-SNAPSHOT + + com.qniao + dating-agency-service-event + 0.0.1-SNAPSHOT + com.qniao dating-agency-service-entity diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/RewardUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/RewardUserCommandController.java index 6adc158..5e8c007 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/RewardUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/RewardUserCommandController.java @@ -1,8 +1,6 @@ package com.qniao.dam.api.command.reward.user; -import com.qniao.dam.api.command.reward.user.request.AcquireMatchmakerConfirmMeetingRewardDto; import com.qniao.dam.api.command.reward.user.request.UserAcquireMatchmakerJoinRecommendRewardDto; -import com.qniao.dam.application.service.marriagebounty.MarriageBountyOrderApplicationService; import com.qniao.dam.application.service.reward.RewardApplicationService; import com.qniao.framework.annotation.IgnoreResponseAdvice; import io.swagger.annotations.Api; @@ -19,8 +17,6 @@ public class RewardUserCommandController { @Resource private RewardApplicationService rewardApplicationService; - @Resource - private MarriageBountyOrderApplicationService marriageBountyOrderApplicationService; @ApiOperation("通过SDK获得奖励") @PostMapping("acquire/matchmaker-join-recommend/reward/by/sdk") @@ -29,11 +25,4 @@ public class RewardUserCommandController { rewardApplicationService.acquireMatchmakerJoinRecommendReward(dto); } - @ApiOperation("红娘获得悬赏招亲见面奖励") - @GetMapping("acquire/matchmaker-confirm-meeting/reward") - public void acquireMatchmakerConfirmMeetingReward(@RequestParam Long marriageBountyOrderId, - @RequestParam Long receiver, - @RequestParam Long meetingMiId) { - marriageBountyOrderApplicationService.confirmMeeting(marriageBountyOrderId, receiver, meetingMiId); - } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/marriagebounty/MarriageBountyOrderEventHandle.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/marriagebounty/MarriageBountyOrderEventHandle.java index d6ee784..99a4e00 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/marriagebounty/MarriageBountyOrderEventHandle.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/marriagebounty/MarriageBountyOrderEventHandle.java @@ -2,15 +2,23 @@ package com.qniao.dam.application.handler.marriagebounty; import com.google.common.eventbus.Subscribe; import com.qniao.dam.api.command.reward.user.request.AcquireMatchmakerConfirmMeetingRewardDto; +import com.qniao.dam.application.service.marriagebounty.MarriageBountyOrderApplicationService; import com.qniao.dam.application.service.reward.RewardApplicationService; import com.qniao.dam.domian.aggregate.marriagebounty.event.MarriageBountyOrderConfirmedMeetingEvent; import com.qniao.dam.domian.aggregate.marriagebounty.event.MarriageBountyOrderCreatedEvent; import com.qniao.dam.domian.aggregate.marriagebounty.event.MarriageBountyOrderCreatedMQ; import com.qniao.dam.infrastructure.constant.MqExchange; +import com.qniao.dam.infrastructure.constant.MqQueue; +import com.qniao.das.domian.aggregate.marriageseekingreward.event.RewardSelectedGuestEvent; import com.qniao.domain.BaseApplicationService; import com.qniao.framework.utils.TypeConvertUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -24,6 +32,8 @@ public class MarriageBountyOrderEventHandle extends BaseApplicationService { private AmqpTemplate amqpTemplate; @Resource private RewardApplicationService rewardApplicationService; + @Resource + private MarriageBountyOrderApplicationService marriageBountyOrderApplicationService; @Subscribe public void handle(MarriageBountyOrderCreatedEvent event) { @@ -50,4 +60,17 @@ public class MarriageBountyOrderEventHandle extends BaseApplicationService { } } + + @RabbitListener(bindings = @QueueBinding(value = @Queue(MqQueue.REWARD_SELECTED_GUEST), + exchange = @Exchange(value = MqExchange.REWARD_SELECTED_GUEST, + type = ExchangeTypes.FANOUT))) + public void handle(RewardSelectedGuestEvent event) { + try { + //创建榜单 + marriageBountyOrderApplicationService.confirmMeeting(event.getMarriageBountyOrderId(),event.getMatchmakerUserId(),event.getMiId()); + log.error("接收到MQ事件：{}", event); + } catch (Exception e) { + log.error("悬赏招亲确认见面处理异常", e); + } + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java index fa5e1ec..04b93b8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java @@ -5,4 +5,8 @@ public interface MqExchange { String MARRIAGE_BOUNTY_ORDER_CREATED = "fanout.marriageBountyOrderCreated"; String MARRIAGE_BOUNTY_ORDER_CANCELLED = "fanout.marriageBountyOrderCancelled"; + + String REWARD_SELECTED_GUEST = "fanout.rewardSelectedGuest"; + + String REWARD_MATCH_SUCCESSFULLY = "fanout.rewardMatchSuccessfully"; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqQueue.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqQueue.java index 979539d..8e5cad2 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqQueue.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqQueue.java @@ -6,4 +6,10 @@ package com.qniao.dam.infrastructure.constant; */ public interface MqQueue { + String serviceName = ".dating-agency-mall"; + + String REWARD_SELECTED_GUEST = MqExchange.REWARD_SELECTED_GUEST + serviceName; + + String REWARD_MATCH_SUCCESSFULLY = MqExchange.REWARD_MATCH_SUCCESSFULLY + serviceName; + }