基础配置

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<Long> tradeOrderIdList = marriageBountyOrder.getOrderRelList().stream().map(MarriageBountyOrderRel::getOrderId).collect(Collectors.toList());

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)) {
+
+                }
             }
         }
     }