Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/request/HbCrawlerCalculationRequest.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.hengbang.crawler.entity.request;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.excel.util.StringUtils;
 import com.jzg.commons.entity.quote.vo.AccidentalDrivingVo;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
@@ -139,8 +140,10 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
         dto.setNonriskcode(vo.getProductCode().split("_")[1]);
         dto.setProgramcode(vo.getProductCode());
         dto.setProgramname(vo.getProductName());
-        dto.setBegintime(DateUtil.toUtcDateTime(biRiskInfoVo.getStartDate()));
-        dto.setEndtime(DateUtil.toUtcDateTime(biRiskInfoVo.getEndDate()));
+        if (biRiskInfoVo != null && StringUtils.isNotBlank(biRiskInfoVo.getStartDate()) && StringUtils.isNotBlank(biRiskInfoVo.getEndDate())) {
+            dto.setBegintime(DateUtil.toUtcDateTime(biRiskInfoVo.getStartDate()));
+            dto.setEndtime(DateUtil.toUtcDateTime(biRiskInfoVo.getEndDate()));
+        }
         dto.setCompanycode("0107");
         dto.setRelationcarowner("a");
         dto.setSuminsured("525000");

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -151,6 +151,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
         HbCrawlerProposalResponse proposalResponse = null;
         // 脱保情况 重新赋值核心建议起保时间 二次报价
         if (errorMsg.contains("脱保")) {
+            calculationRequest.setOutofwarrantytype("N");
             resJson = hbCrawlerRequestComponent.getCalculationResult(calculationRequest, headers);
             errorMsg = JSONObject.parseObject(resJson).getString("message");
             status = JSONObject.parseObject(resJson).getString("status");