委托服务

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

@@ -293,17 +293,17 @@ public class OrderApplicationService extends BaseApplicationService {
         entrustServiceOrderQueryService.checkEntrustServiceOrder(entrustServiceOrder);
         //查询委托服务价格
         BigDecimal amount = queryEntrustServiceAmount(entrustServiceOrder);
+        //下单人信息
+        UserMarriageInformation initiatorUserMarriageInformation = userMarriageInformationQueryService.queryByOwn(order.getUserId());
+        order.setMiId(initiatorUserMarriageInformation.getMiId());
+        //委托服务订单处理
+        handleEntrustServiceOrder(entrustServiceOrder, initiatorUserMarriageInformation, amount);
         //组装产品信息
         Product product = productApplicationService.handleEntrustServiceProduct(entrustServiceOrder, amount);
         //提交产品信息
         handleProduct(product, product.getProductSpecList());
-        //下单人信息
-        UserMarriageInformation initiatorUserMarriageInformation = userMarriageInformationQueryService.queryByOwn(order.getUserId());
-        order.setMiId(initiatorUserMarriageInformation.getMiId());
         //订单信息处理
         fillEntrustServiceOrderInfo(order, product);
-        //委托服务订单处理
-        handleEntrustServiceOrder(entrustServiceOrder, initiatorUserMarriageInformation, amount);
         //组装付款单信息
         PaymentOrder paymentOrder = makePaymentOrder(order);
         submitEntrustServiceOrderDomainService.handle(order, paymentOrder, entrustServiceOrder);
@@ -315,7 +315,10 @@ public class OrderApplicationService extends BaseApplicationService {
                                            BigDecimal amount) {
         entrustServiceOrder.setInitiatorMiId(initiatorUserMarriageInformation.getMiId());
         UserMarriageInformation targetUserMarriageInformation = userMarriageInformationQueryService.queryOwnByMiId(entrustServiceOrder.getTargetMiId());
-        entrustServiceOrder.setTargetMiId(targetUserMarriageInformation.getMiId());
+        if (Objects.isNull(targetUserMarriageInformation)) {
+            throw new BizException("无法发起牵线");
+        }
+        entrustServiceOrder.setTargetUserId(targetUserMarriageInformation.getUserId());
         entrustServiceOrder.setRewardAmount(amount);
     }