悬赏招亲

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);
     }