玫瑰

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -513,7 +513,8 @@ public class OrderApplicationService extends BaseApplicationService {
         PaymentOrder paymentOrder = makePaymentOrder(order);
         BaseDomainEvent event = submitOrderDomainService.handle(order, paymentOrder);
         this.sendEvent(event);
-        return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), order.getSettlementAmount().compareTo(BigDecimal.ZERO) == 0);
+        return new UserSubmitOrderVo(order.getId(), Objects.nonNull(paymentOrder) ? paymentOrder.getId() : null,
+                order.getSettlementAmount().compareTo(BigDecimal.ZERO) == 0);
     }
 
     private void checkLiveDuration(Order order,