Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/service/impl/RenBaoNewCrawlerRequestImpl.java

@@ -201,9 +201,11 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                     response.getData().getReInsureItems().forEach(item ->{
                         // 1. 获取 coverageItemList 数组
                         Object coverageObj = item.get("coverageItemList");
-                        // 强转为 List<Map<String,Object>>（里面每一项是 {"coverageCode":"xxx"}）
-                        List<Map<String, Object>> coverageList = (List<Map<String, Object>>) coverageObj;
-                        lastYeseRisks.addAll(coverageList);
+                        if(coverageObj != null){
+                            // 强转为 List<Map<String,Object>>（里面每一项是 {"coverageCode":"xxx"}）
+                            List<Map<String, Object>> coverageList = (List<Map<String, Object>>) coverageObj;
+                            lastYeseRisks.addAll(coverageList);
+                        }
                         if(item.get("billDate") != null){
                             String expireDate =item.get("expireDate")+"";
                             biDateArr[0] = expireDate != null && expireDate.length()>10 ? expireDate.substring(0,10):"";
@@ -215,7 +217,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                 // 上一年险别属于商业险重复投保，需要拦截并重新请求
                 java.time.LocalDate startDate = java.time.LocalDate.parse(biDateArr[0]);
                 java.time.LocalDate startDate1 = startDate.plusDays(1);
-                java.time.LocalDate endDate = startDate.plusDays(364);
+                java.time.LocalDate endDate = startDate.plusDays(365);
                 request.getPrpCmain().put("endDate", endDate.toString());
                 request.getPrpCmain().put("endHour", "24");
                 request.getPrpCmain().put("endMinute", "00");
@@ -373,7 +375,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
             return false;
         }
         List<Map<String, Object>> reInsureItems = response.getData().getReInsureItems();
-        return reInsureItems != null && !reInsureItems.isEmpty();
+        return reInsureItems != null && !reInsureItems.isEmpty() && reInsureItems.get(0).get("coverageItemList") != null;
     }
 
     /**