Merge branch 'chengtai'

tenant/insurance/quotation-chengtai/src/main/java/com/jzg/quotation/chengtai/crawler/service/ChengTaiCrawlerRequestService.java

@@ -11,10 +11,7 @@ import com.jzg.quotation.chengtai.crawler.model.param.ChengTaiPremiumcalParam;
 import com.jzg.quotation.chengtai.crawler.model.result.*;
 import com.jzg.quotation.chengtai.crawler.repository.ChengTaiLoginSessionRepository;
 import com.jzg.quotation.chengtai.crawler.repository.ChengTaiPremiumcalRepository;
-import com.jzg.quotation.commons.entity.vo.aggregated.InsuranceUploadImageVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.UnderwritingVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.*;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.service.QuotationApiBaseService;
@@ -663,7 +660,7 @@ public class ChengTaiCrawlerRequestService implements QuotationApiBaseService {
     }
 
     @Override
-    public void underwriting(UnderwritingVo underwritingVo) {
+    public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) {
         String token = login();
 
         String ordersNo = underwritingVo.getOrder().getOrdersNo();
@@ -681,13 +678,20 @@ public class ChengTaiCrawlerRequestService implements QuotationApiBaseService {
         }
 
         ChengTaiSubmitResult.SubmitResult submitResult = result.getSubmitResult();
+
+        UnderwritingResultsVo underwritingResultsVo = new UnderwritingResultsVo();
+
+        // todo
+
+        return underwritingResultsVo;
     }
 
+
     @Override
-    public String getPaymentLink(OrderBase orderBase) throws JsonProcessingException {
+    public PaymentLinkResultsVo getPaymentLink(PaymentLinkVo paymentLinkVo) throws JsonProcessingException {
         String token = login();
 
-        String ordersNo = orderBase.getOrdersNo();
+        String ordersNo = paymentLinkVo.getOrder().getOrdersNo();
 
         ChengTaiPremiumcalParam param = chengTaiPremiumcalRepository.findByOrdersNo(ordersNo);
 
@@ -709,7 +713,12 @@ public class ChengTaiCrawlerRequestService implements QuotationApiBaseService {
 
         String payUrl = chengTaiInsureResult.getPayUrl();
 
-        return payUrl;
+        PaymentLinkResultsVo paymentLinkResultsVo = new PaymentLinkResultsVo();
+        paymentLinkResultsVo.setPaymentLink(payUrl);
+
+        // todo
+
+        return paymentLinkResultsVo;
     }
 
     @Override
@@ -794,11 +803,12 @@ public class ChengTaiCrawlerRequestService implements QuotationApiBaseService {
         }
     }
 
+
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderBase) {
         String token = login();
 
-        String ordersNo = orderBase.getOrdersNo();
+        String ordersNo = orderBase.getOrder().getOrdersNo();
 
         ChengTaiPremiumcalParam param = chengTaiPremiumcalRepository.findByOrdersNo(ordersNo);