dajia 修改

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/build/DaJiaCrawlerQuoteResultsVoBuild.java

@@ -193,7 +193,6 @@ public final class DaJiaCrawlerQuoteResultsVoBuild {
         }
         boolean sy = CollectionUtil.isNotEmpty(businessInsurance.getItemKinds());
         if (sy) {
-            String flatCarReinsuredMessage = businessInsurance.getProductInfo().getFlatCarReinsuredMessage();
             scoreVo.setSyLossRation(StringUtils.isNotEmpty(businessInsurance.getCoefficientInfo().getLossRatioBi()) ? businessInsurance.getCoefficientInfo().getLossRatioBi() : null);
             scoreVo.setBiClaims(String.valueOf(new BigDecimal(businessInsurance.getCoefficientInfo().getLastPolicyNum()).intValue()));
             String renewalFrequency = businessInsurance.getCoefficientInfo().getRenewalFrequency();
@@ -217,16 +216,6 @@ public final class DaJiaCrawlerQuoteResultsVoBuild {
         }
         CompulsoryInsuranceDTO.CoefficientInfoDTO coefficientInfo = daJiaCrawlerSaveResponse.getCompulsoryInsurance().getCoefficientInfo();
         JSONArray scoreArray = new JSONArray();
-        Optional.ofNullable(businessInsurance)
-                .map(BusinessInsuranceDTO::getProductInfo)
-                .map(BusinessInsuranceDTO.ProductInfoDTO::getFlatCarReinsuredMessage)
-                .filter(StringUtils::isNotEmpty)
-                .ifPresent(msg ->
-                        scoreArray.add(new JSONObject()
-                                .fluentPut("scoreName", "上年承保险别")
-                                .fluentPut("scoreKey", "priorCoverage")
-                                .fluentPut("score", msg))
-                );
         scoreArray.add(new JSONObject()
                 .fluentPut("scoreName","交强类型评分")
                 .fluentPut("scoreKey","jqPubScores")
@@ -270,6 +259,15 @@ public final class DaJiaCrawlerQuoteResultsVoBuild {
                     .fluentPut("scoreKey","syPubScores")
                     .fluentPut("score",coefficientInfo1.getPubScores()));
          }
+        Optional.ofNullable(businessInsurance)
+                .map(BusinessInsuranceDTO::getProductInfo)
+                .map(BusinessInsuranceDTO.ProductInfoDTO::getFlatCarReinsuredMessage)
+                .filter(StringUtils::isNotEmpty)
+                .ifPresent(msg ->
+                        scoreArray.add(new JSONObject()
+                                .fluentPut("scoreName", "上年承保险别")
+                                .fluentPut("scoreKey", "priorCoverage")
+                                .fluentPut("score", msg)));
         scoreVo.setScoreJson(scoreArray);
         return scoreVo;
     }

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/build/DajiaCrawlerAuditResultsVoBuild.java

@@ -3,6 +3,7 @@ package com.jzg.quotation.dajia.crawler.build;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingResultsVo;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerGenerateResponse;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -38,13 +39,7 @@ public final class DajiaCrawlerAuditResultsVoBuild {
         if (daJiaCrawlerGenerateResponse.getStatus().equals("3")) {
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
             // 失败信息
-            StringBuilder sb = new StringBuilder();
-            if (null != daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()) {
-                sb.append(String.format("交强险提示信息：%s", daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()));
-            }
-            if (!Objects.isNull(daJiaCrawlerGenerateResponse.getSyGenerate()) && null != daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()) {
-                sb.append(String.format("商业险提示信息：%s", daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()));
-            }
+            StringBuilder sb = getStringBuilder(daJiaCrawlerGenerateResponse);
             underwritingResultsVo.setUnderwritingResult(sb.toString());
         } else if (daJiaCrawlerGenerateResponse.getStatus().equals("4")) {
         // 核保成功
@@ -55,4 +50,16 @@ public final class DajiaCrawlerAuditResultsVoBuild {
         }
         return underwritingResultsVo;
     }
+
+    @NotNull
+    private static StringBuilder getStringBuilder(DaJiaCrawlerGenerateResponse daJiaCrawlerGenerateResponse) {
+        StringBuilder sb = new StringBuilder();
+        if (null != daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()) {
+            sb.append(String.format("交强险提示信息：%s", daJiaCrawlerGenerateResponse.getJqGenerate().getErrorMessage()));
+        }
+        if (!Objects.isNull(daJiaCrawlerGenerateResponse.getSyGenerate()) && null != daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()) {
+            sb.append(String.format("商业险提示信息：%s", daJiaCrawlerGenerateResponse.getSyGenerate().getErrorMessage()));
+        }
+        return sb;
+    }
 }