Merge remote-tracking branch 'origin/master'

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

@@ -984,6 +984,16 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                 log.warn("获取人保评分失败: {}", e.getMessage());
             }
         }
+        // 获取商业险，交强险折扣率
+        if(quoteResponse.getData() != null && quoteResponse.getData().getPrpQmain() != null && quoteResponse.getData().getPrpQmain().getDiscount() != null){
+            // 设置商业险折扣率
+            resultsVo.getScoreVo().setSyAdjustRate(BigDecimal.valueOf(quoteResponse.getData().getPrpQmain().getDiscount()).toString());
+        }
+        if(quoteResponse.getData() != null && quoteResponse.getData().getPrpQmainCI() != null && quoteResponse.getData().getPrpQmainCI().getDiscount() != null) {
+            // 设置交强险折扣率
+            resultsVo.getScoreVo().setJqAdjustRate(BigDecimal.valueOf(quoteResponse.getData().getPrpQmainCI().getDiscount()).toString());
+        }
+
         // 处理上一年的投保险别
         if(!lastYeseRisks.isEmpty()){
             try{
@@ -1010,7 +1020,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
 
         // 获取交强险出险次数
         RenBaoNewCrawlerQuoteResponse.CarQuoteRiskItemCIRsp carQuoteRiskItemCIRsp = quoteResponse.getData().getCarQuoteRiskItemCIRsp();
-        JSONArray scoreJson1 = resultsVo.getScoreVo().getScoreJson();
+        JSONArray scoreJson1 = resultsVo.getScoreVo().getScoreJson() != null ?resultsVo.getScoreVo().getScoreJson() : new JSONArray() ;
         if( carQuoteRiskItemCIRsp != null){
             scoreJson1.add(new JSONObject()
                     .fluentPut("scoreName", "交强险出险情况")