Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/service/Impl/ZhongAnCrawlerRequestImpl.java

@@ -13,6 +13,7 @@ import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.ObjectUtil;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.client.PlatformClient;
@@ -36,6 +37,7 @@ import com.jzg.quotation.zhongan.crawler.service.ZhongAnCrawlerOrderService;
 import com.jzg.quotation.zhongan.crawler.service.ZhongAnCrawlerRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -46,6 +48,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -202,20 +205,20 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
             return quoteResultsVo;
         }
         // 处理重复投保
-        if (quoteResponse.getAdditionalInfo() != null) {
+        if (ObjectUtils.isNotEmpty(quoteResponse.getAdditionalInfo())) {
             if (quoteResponse.getAdditionalInfo().getInsureMessageF() != null && quoteResponse.getAdditionalInfo().getInsureMessageF().contains("重复投保")) {
                 String jqExtractDate = jqExtractDate(quoteResponse);
                 if (jqExtractDate != null) {
                     quoteRequest.setCompelInsEffectiveDate(jqExtractDate);
                 }
                 quoteResponse = zhongAnCrawlerRequestComponent.quote(quoteRequest, headers);
-                if (quoteResponse.getAdditionalInfo() != null && quoteResponse.getAdditionalInfo().getInsureMessage().contains("重复投保")) {
+                if (ObjectUtils.isNotEmpty(quoteResponse.getAdditionalInfo()) && quoteResponse.getAdditionalInfo().getInsureMessage() != null && quoteResponse.getAdditionalInfo().getInsureMessage().contains("重复投保")) {
                     String syExtractDate = syExtractDate(quoteResponse);
                     if (syExtractDate != null) {
                         quoteRequest.setEffectiveDate(syExtractDate);
                     }
+                    quoteResponse = zhongAnCrawlerRequestComponent.quote(quoteRequest, headers);
                 }
-                quoteResponse = zhongAnCrawlerRequestComponent.quote(quoteRequest, headers);
             }
         }