From a6497e10a190e9b56dc9f43544928339fdf7dab4 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 6 May 2024 09:12:32 +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 --- .../PaymentOrderRefundEventHandler.java | 2 +- .../MarriageBountyOrderApplicationService.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/paymentorderrefund/PaymentOrderRefundEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/paymentorderrefund/PaymentOrderRefundEventHandler.java index e76ce8b..6a26ba9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/paymentorderrefund/PaymentOrderRefundEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/paymentorderrefund/PaymentOrderRefundEventHandler.java @@ -41,7 +41,7 @@ public class PaymentOrderRefundEventHandler extends BaseApplicationService { @Subscribe private void handle(PaymentOrderRefundRefundedEvent event) { try { - if (PaymentOrderRefundStatusEnum.SUCCESS.equals(event.getStatus())) { + if (PaymentOrderRefundStatusEnum.SUCCESS.equals(event.getStatus()) || PaymentOrderRefundStatusEnum.PROCESSING.equals(event.getStatus())) { MarriageBountyOrder marriageBountyOrder = marriageBountyOrderQueryService.queryByOrderRel(event.getTradeOrderId()); if (Objects.nonNull(marriageBountyOrder)) { List tradeOrderIdList = marriageBountyOrder.getOrderRelList().stream().map(MarriageBountyOrderRel::getOrderId).collect(Collectors.toList()); 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 78209e6..2cf3384 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 @@ -158,8 +158,18 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic MarriageBountyOrder existMarriageBountyOrder = marriageBountyOrderRepository.load(marriageBountyOrderId); if (Objects.nonNull(existMarriageBountyOrder) && MarriageBountyOrderStatusEnum.MATCHMAKING.equals(existMarriageBountyOrder.getStatus())) { if (CollUtil.isNotEmpty(existMarriageBountyOrder.getOrderRewardList())) { - MarriageBountyOrderReward marriageBountyOrderReward = existMarriageBountyOrder.getOrderRewardList().stream() - .filter(orderReward -> !orderReward.getIsReceive()).findFirst().get(); + MarriageBountyOrderReward marriageBountyOrderReward = null; + for (MarriageBountyOrderReward orderReward : existMarriageBountyOrder.getOrderRewardList()) { + if (ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE.equals(orderReward.getRewardCategory())) { + if (!orderReward.getIsReceive()) { + marriageBountyOrderReward = orderReward; + break; + } + } + } + if (Objects.nonNull(marriageBountyOrderReward)) { + + } } } }