From a32c526c7903f07d6dd82f36201e7ae40381c52a Mon Sep 17 00:00:00 2001 From: Derran Date: Wed, 5 Jun 2024 14:27:42 +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 --- .../ExternalOrderEventHandler.java | 45 ++++++++----------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/externalorder/ExternalOrderEventHandler.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/externalorder/ExternalOrderEventHandler.java index cf90555..6ebe5d4 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/externalorder/ExternalOrderEventHandler.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/externalorder/ExternalOrderEventHandler.java @@ -12,10 +12,8 @@ import com.qniao.dam.domian.aggregate.paymentorder.constant.PaymentOrderStatusEn import com.qniao.dam.infrastructure.constant.MqExchange; import com.qniao.dam.infrastructure.constant.MqQueue; import com.qniao.dam.infrastructure.persistent.dao.domain.ExternalOrderRelDao; -import com.qniao.dam.infrastructure.persistent.dao.domain.SiteActivityDao; import com.qniao.dam.query.paymentchannelorder.PaymentChannelOrderQueryService; import com.qniao.dam.query.paymentorder.PaymentOrderQueryService; -import com.qniao.das.domian.aggregate.siteactivity.SiteActivity; import com.qniao.das.domian.aggregate.siteactivity.event.SiteActivityCancelEvent; import com.qniao.domain.BaseApplicationService; import lombok.extern.slf4j.Slf4j; @@ -46,8 +44,6 @@ public class ExternalOrderEventHandler extends BaseApplicationService { private PaymentOrderRefundApplicationService paymentOrderRefundApplicationService; @Resource private ExternalOrderRelAggregate externalOrderRelAggregate; - @Resource - private SiteActivityDao siteActivityDao; @RabbitListener(bindings = @QueueBinding(value = @Queue(MqQueue.CANCEL_SITE_ACTIVITY), exchange = @Exchange(value = MqExchange.CANCEL_SITE_ACTIVITY, @@ -55,30 +51,27 @@ public class ExternalOrderEventHandler extends BaseApplicationService { public void handleConfirmMeeting(SiteActivityCancelEvent event) { try { log.error("接收到线下活动订单取消事件：{}", event); - SiteActivity siteActivity = siteActivityDao.selectById(event.getExternalId()); //社群活动允许退款 - if (Objects.nonNull(siteActivity.getActivityType()) && siteActivity.getActivityType() == 1) { - ExternalOrderRel externalOrderRel = externalOrderRelDao.queryCompletedBy(event.getExternalId(), event.getUserId(), ExternalOrderTypeEnum.SITE_ACTIVITY); - if (Objects.nonNull(externalOrderRel)) { - externalOrderRel.setStatus(ExternalOrderRelStatus.CANCELED); - externalOrderRelAggregate.save(externalOrderRel); - List paymentOrderRefundList = new ArrayList<>(); - List paymentOrderList = paymentOrderQueryService.listByOrderId(Collections.singletonList(externalOrderRel.getOrderId()), PaymentOrderStatusEnum.PAID); - for (PaymentOrder paymentOrder : paymentOrderList) { - PaymentOrderRefund paymentOrderRefund = new PaymentOrderRefund(); - PaymentChannelOrder paymentChannelOrder = paymentChannelOrderQueryService.queryByTxnOrderId(paymentOrder.getId()); - paymentOrderRefund.setTradeOrderId(paymentOrder.getOrderId()); - paymentOrderRefund.setPaymentOrderId(paymentOrder.getId()); - paymentOrderRefund.setPaymentChannelOrder(paymentChannelOrder.getId()); - paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod()); - paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo()); - paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount()); - paymentOrderRefund.setRefundAmount(paymentChannelOrder.getAmount()); - paymentOrderRefundList.add(paymentOrderRefund); - } - //发起微信退款 - paymentOrderRefundApplicationService.refund(paymentOrderRefundList); + ExternalOrderRel externalOrderRel = externalOrderRelDao.queryCompletedBy(event.getExternalId(), event.getUserId(), ExternalOrderTypeEnum.SITE_ACTIVITY); + if (Objects.nonNull(externalOrderRel)) { + externalOrderRel.setStatus(ExternalOrderRelStatus.CANCELED); + externalOrderRelAggregate.save(externalOrderRel); + List paymentOrderRefundList = new ArrayList<>(); + List paymentOrderList = paymentOrderQueryService.listByOrderId(Collections.singletonList(externalOrderRel.getOrderId()), PaymentOrderStatusEnum.PAID); + for (PaymentOrder paymentOrder : paymentOrderList) { + PaymentOrderRefund paymentOrderRefund = new PaymentOrderRefund(); + PaymentChannelOrder paymentChannelOrder = paymentChannelOrderQueryService.queryByTxnOrderId(paymentOrder.getId()); + paymentOrderRefund.setTradeOrderId(paymentOrder.getOrderId()); + paymentOrderRefund.setPaymentOrderId(paymentOrder.getId()); + paymentOrderRefund.setPaymentChannelOrder(paymentChannelOrder.getId()); + paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod()); + paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo()); + paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount()); + paymentOrderRefund.setRefundAmount(paymentChannelOrder.getAmount()); + paymentOrderRefundList.add(paymentOrderRefund); } + //发起微信退款 + paymentOrderRefundApplicationService.refund(paymentOrderRefundList); } } catch (Exception e) { log.error("接收到线下活动订单取消事件处理异常", e);