From f8c06a26a8c49c0fa2fb327f16fc87989bfc896c Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 6 Aug 2024 09:58:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderApplicationService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 3271494..4236739 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 @@ -186,7 +186,7 @@ public class OrderApplicationService extends BaseApplicationService { //1. 提交产品信息 productList.forEach(product -> handleProduct(product, product.getProductSpecList())); //2. 填充订单信息 - fillMarriageBountyOrderInfo(order, productList,meetingQuantity); + fillMarriageBountyOrderInfo(order, productList, meetingQuantity); //3. 订单金额计算 countOrderAmount(order, false); //4. 设置订单号 @@ -194,7 +194,11 @@ public class OrderApplicationService extends BaseApplicationService { //5. 组装付款单信息 PaymentOrder paymentOrder = makePaymentOrder(order); submitOrderDomainService.handle(order, paymentOrder); - marriageBountyOrderAggregate.init(marriageBountyOrder); + MarriageBountyOrder existMarriageBountyOrder = marriageBountyOrderQueryService.queryBy(order.getUserId(), order.getMiId(), + MarriageBountyOrderStatusEnum.MATCHMAKING, MarriageBountyOrderPaymentStatusEnum.PAID); + if (Objects.isNull(existMarriageBountyOrder)) { + marriageBountyOrderAggregate.init(marriageBountyOrder); + } return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), false); }