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