diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java index d43b2bf..b6dc078 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java @@ -159,10 +159,8 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic public void confirmMeeting(Long marriageBountyOrderId, Long receiver, Long meetingMiId) { MarriageBountyOrder existMarriageBountyOrder = marriageBountyOrderRepository.load(marriageBountyOrderId); if (Objects.nonNull(existMarriageBountyOrder) && MarriageBountyOrderStatusEnum.MATCHMAKING.equals(existMarriageBountyOrder.getStatus())) { - MarriageBountyOrder marriageBountyOrder = new MarriageBountyOrder(); - marriageBountyOrder.setId(marriageBountyOrderId); - if (CollUtil.isNotEmpty(existMarriageBountyOrder.getOrderRewardList()) && - existMarriageBountyOrder.getOrderRewardList().stream().noneMatch(orderReward -> meetingMiId.equals(orderReward.getMeetingMiId()))) { + if (CollUtil.isNotEmpty(existMarriageBountyOrder.getOrderRewardList())&& + existMarriageBountyOrder.getOrderRewardList().stream().noneMatch(orderReward->meetingMiId.equals(orderReward.getMeetingMiId()))) { MarriageBountyOrderReward marriageBountyOrderReward = null; for (MarriageBountyOrderReward orderReward : existMarriageBountyOrder.getOrderRewardList()) { if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(orderReward.getRewardCategory())) { @@ -173,16 +171,18 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic } } if (Objects.nonNull(marriageBountyOrderReward)) { + MarriageBountyOrder marriageBountyOrder = new MarriageBountyOrder(); + marriageBountyOrder.setId(marriageBountyOrderId); marriageBountyOrderReward.setIsReceive(true); marriageBountyOrderReward.setMeetingMiId(meetingMiId); MarriageBountyOrderRewardReceiveRecord rewardReceiveRecord = MarriageBountyOrderRewardReceiveRecord.build( RewardTypeEnum.MARRIAGE_BOUNTY_MEETING_FEE, receiver, marriageBountyOrderReward.getRewardAmount()); marriageBountyOrderReward.setRewardReceiveRecordList(Collections.singletonList(rewardReceiveRecord)); marriageBountyOrder.setUpdateOrderRewardList(Collections.singletonList(marriageBountyOrderReward)); + BaseDomainEvent event = marriageBountyOrderAggregate.confirmMeeting(marriageBountyOrder, existMarriageBountyOrder.getOrderRelList()); + this.sendEvent(event); } } - BaseDomainEvent event = marriageBountyOrderAggregate.confirmMeeting(marriageBountyOrder, existMarriageBountyOrder.getOrderRelList()); - this.sendEvent(event); } }