修改报价逻辑

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -203,8 +203,11 @@ public class UnifyOrderManager {
 
         // 添加车辆没有的参数: 车辆明细、
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());
-
-        //保司相关代码转换
+        // 生成订单
+        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
+        quoteVo.getOrder().setOrdersNo(ordersNo);
+        // 先生成订单 在进行保司相关代码转换 解决入库时存储的是保司所需的数据
+        // 保司相关代码转换
         Map<String, List<QuoteRuleMapping>> quoteKindMappingMap = quoteRuleMappingService.getByInsuranceCompanyCode(esmInsCompanyHttpResult.getData()
                 .getCode());
         QuoteInfoConverter.converterCarInfoVo(quoteVo, quoteKindMappingMap.get(QuoteRuleCategory.QUOTE_INFO.getCode()));
@@ -213,10 +216,6 @@ public class UnifyOrderManager {
             QuoteInfoConverter.converterKindInfoVo(quoteVo.getKindInfoVo(), quoteKindMappingMap.get(QuoteRuleCategory.KIND.getCode()), quoteVo.getCarInfoVo());
         }
 
-        // 生成订单
-        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
-        quoteVo.getOrder().setOrdersNo(ordersNo);
-
         // 报价
         QuoteResultsVo quoteResultsVo = quoteService.quote(quoteVo);
         quoteResultsVo.setKindInfoVo(quoteVo.getKindInfoVo());

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangPaymentRequest.java

@@ -92,7 +92,7 @@ public class YangGuangPaymentRequest extends YangGuangBaseRequest {
         this.RequestNo = "payment";
         this.ComCode = ygConfigureParameters.getComCode();
         this.RequestDate = LocalDateTime.now().format(formatter);
-        this.InfotransNo = paymentLinkVo.getInsOrders().getInsOrderNo();
+        this.InfotransNo = paymentLinkVo.getOrder().getCompanyOrderNo();
 
         Optional<InsOrdersCarUserInfo> insOrdersCarUserInfo = paymentLinkVo.getInsOrdersCarUserInfoList()
                 .stream().filter(x -> x.getPolicyPersonType().equals(2)).findFirst();

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -189,7 +189,15 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                 // 获取缴费地址
                 PaymentLinkVo paymentLinkVo = new PaymentLinkVo();
                 paymentLinkVo.setOrder(underwritingVo.getOrder());
-                getPaymentLink(paymentLinkVo);
+                paymentLinkVo.setInsOrders(underwritingVo.getInsOrders());
+                paymentLinkVo.setInsOrdersCarUserInfoList(underwritingVo.getInsOrdersCarUserInfoList());
+                // 将投保单号带入
+                underwritingVo.getPolicy().setJqApplyNo(jq);
+                underwritingVo.getPolicy().setSyApplyNo(sy);
+                paymentLinkVo.setInsOrdersPolicy(underwritingVo.getPolicy());
+                paymentLinkVo.setInsOrdersCosts(underwritingVo.getInsOrdersCosts());
+                PaymentLinkResultsVo payLink = getPaymentLink(paymentLinkVo);
+                underwritingResultsVo.setPaymentLink(payLink.getPaymentLink());
             }
 
         } else {