From fcb449faacbe90487b89bca9e3125810fbe3fd2e Mon Sep 17 00:00:00 2001 From: Derran Date: Wed, 8 May 2024 15:46:13 +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 --- .../request/AcquireMatchmakerConfirmMeetingRewardDto.java | 4 ++-- .../marriagebounty/MarriageBountyOrderEventHandle.java | 1 - .../application/service/reward/RewardApplicationService.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/AcquireMatchmakerConfirmMeetingRewardDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/AcquireMatchmakerConfirmMeetingRewardDto.java index ad918bd..3ba4a3f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/AcquireMatchmakerConfirmMeetingRewardDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/reward/user/request/AcquireMatchmakerConfirmMeetingRewardDto.java @@ -13,8 +13,8 @@ public class AcquireMatchmakerConfirmMeetingRewardDto { @ApiModelProperty("奖励类型") private RewardTypeEnum rewardType; - @ApiModelProperty("见面嘉宾标识") - private Long meetingMiId; + @ApiModelProperty("关联嘉宾") + private Long associatedMiId; @ApiModelProperty("领取人标识") private Long receiver; 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 60c2a58..bfbbe41 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 @@ -59,7 +59,6 @@ public class MarriageBountyOrderEventHandle extends BaseApplicationService { for (MarriageBountyOrderConfirmedMeetingEvent.MarriageBountyOrderRewardReceiveRecordEvent rewardReceiveRecordEvent : event.getRewardReceiveRecordList()) { AcquireMatchmakerConfirmMeetingRewardDto confirmMeetingRewardDto = TypeConvertUtils.convert(rewardReceiveRecordEvent, AcquireMatchmakerConfirmMeetingRewardDto.class); - rewardApplicationService.acquireMatchmakerConfirmMeetingReward(confirmMeetingRewardDto); confirmMeetingRewardDto.setOrderIdRelList(event.getOrderIdRelList()); rewardApplicationService.acquireMatchmakerConfirmMeetingReward(confirmMeetingRewardDto); } 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 4c0b320..5b0443a 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 @@ -81,7 +81,7 @@ public class RewardApplicationService { walletAccount = WalletAccount.init(dto.getReceiver()); } BigDecimal rewardAmount = dto.getReceivedAmount(); - MarriageInformation meetingMi = marriageInformationDao.selectById(dto.getMeetingMiId()); + MarriageInformation meetingMi = marriageInformationDao.selectById(dto.getAssociatedMiId()); walletAccount.setAvailableBalance(walletAccount.getAvailableBalance().add(rewardAmount)); walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(walletAccount.getFrozenBalance())); WalletAccountRecord record = WalletAccountRecord.build(TradeTypeEnum.MARRIAGE_BOUNTY_MEETING_FEE,