From 26989a418695aee475e240b9abc4281810b132f3 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 14 Jan 2025 17:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=A5=96=E5=93=81=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java | 3 +++ .../handler/rpa/RafflePrizeActivityEventHandler.java | 2 +- .../application/service/reward/RewardApplicationService.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java index 219fdb9..34306d9 100644 --- a/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java +++ b/dating-agency-mall-event/src/main/java/com/qniao/dam/domian/aggregate/matchmaker/event/MatchmakerFranchiseFeeRewardEvent.java @@ -22,6 +22,9 @@ public class MatchmakerFranchiseFeeRewardEvent extends BaseDomainEvent { @ApiModelProperty("被邀请用户名称") private String receiveUserName; + @ApiModelProperty("发起红娘级别") + private MatchmakerLevelEnum initiatorLevel; + @ApiModelProperty("入驻红娘级别") private MatchmakerLevelEnum receiveLevel; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java index 2d0cef5..dd28e12 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/rpa/RafflePrizeActivityEventHandler.java @@ -46,7 +46,7 @@ public class RafflePrizeActivityEventHandler extends BaseApplicationService { winning.setPhone(matchmaker.getPhone()); winning.setIsDraw(false); winning.setMaxReward(event.getStayFranchiseFee().stripTrailingZeros().toPlainString()); - winning.setRemark(matchmaker.getType().getDesc() + matchmaker.getName() + "邀请" + event.getReceiveLevel().getDesc() + event.getReceiveUserName() + "加盟,加盟费" + event.getFranchiseFee()); + winning.setRemark(event.getInitiatorLevel().getDesc() + matchmaker.getName() + "邀请" + event.getReceiveLevel().getDesc() + event.getReceiveUserName() + "加盟,加盟费" + event.getFranchiseFee()); rafflePrizeActivityWinningAggregate.create(winning); } } catch (Exception e) { diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java index aef6e80..f7b8c3e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/reward/RewardApplicationService.java @@ -113,6 +113,7 @@ public class RewardApplicationService extends BaseApplicationService { rewardEvent.setFranchiseFee(rewardAmount); rewardEvent.setStayFranchiseFee(rewardAmount.subtract(revenue)); rewardEvent.setReceiveUserName(dto.getReceiveUserName()); + rewardEvent.setInitiatorLevel(dto.getInitiatorLevel()); rewardEvent.setReceiveLevel(dto.getReceiveLevel()); rewardEvent.setAssociateId(dto.getAssociateOrderId()); this.sendEvent(rewardEvent);