From 171c89e23429657fb700721cd5c5bd9309fe19f7 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 7 Apr 2026 14:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1=E8=B4=B9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dam/application/service/order/OrderApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index 64f18a6..deb4071 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -551,7 +551,7 @@ public class OrderApplicationService extends BaseApplicationService { paymentOrder = makePaymentOrder(order); List eventList = submitSiteActivityOrderDomainService.handle(order, paymentOrder, dto.getSiteActivityId()); this.sendEvent(eventList); - return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), Objects.isNull(paymentOrder.getId())); + return new UserSubmitOrderVo(order.getId(), Objects.nonNull(paymentOrder) ? paymentOrder.getId() : null, Objects.isNull(paymentOrder.getId())); } public UserCalculateOrderFeeVo calculateSiteActivityOrderFee(UserCalculateSiteActivityOrderDto dto, Long userId) {