1.泰康、紫金返回续保标志

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/build/TkCrawlerQuoteResultsBuild.java

@@ -9,8 +9,9 @@ import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.TaxInfoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.util.DateTimeUtils;
-import com.jzg.commons.util.ObjectUtil;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
+import com.jzg.quotation.commons.constant.enums.quote.RenewalEnum;
 import com.jzg.quotation.commons.utils.DateTimeUtil;
 import com.jzg.quotation.taikang.crawler.ConvertUtil;
 import com.jzg.quotation.taikang.crawler.cache.RedisCacheUtil;
@@ -20,7 +21,6 @@ import com.jzg.quotation.taikang.crawler.model.entity.TKDateInfo;
 import com.jzg.quotation.taikang.crawler.model.entity.TKOther;
 import com.jzg.quotation.taikang.crawler.model.entity.TKPremium;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -144,9 +144,9 @@ public class TkCrawlerQuoteResultsBuild {
         quoteResultsVo.getScoreVo().setJqAdjustRate(preciseInitResult.getCiDisCount() != null ? preciseInitResult.getCiDisCount().toString() : null);
         quoteResultsVo.getScoreVo().setSyAdjustRate(preciseInitResult.getBzDisCount() != null ? preciseInitResult.getBzDisCount().toString() : null);
         // 交强续保
-        quoteResultsVo.getScoreVo().setJqRenewal(preciseInitResult.getFlag().getRenewalBZFlag());
+        quoteResultsVo.getScoreVo().setJqRenewal(convertRenewalFlag(preciseInitResult.getFlag().getRenewalBZFlag()));
         // 商业续保
-        quoteResultsVo.getScoreVo().setSyRenewal(preciseInitResult.getFlag().getRenewalCIFlag());
+        quoteResultsVo.getScoreVo().setSyRenewal(convertRenewalFlag(preciseInitResult.getFlag().getRenewalCIFlag()));
         // 设置订单状态
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         // 缓存报价书据数据
@@ -175,4 +175,15 @@ public class TkCrawlerQuoteResultsBuild {
         return quoteResultsVo;
     }
 
+    private static String convertRenewalFlag(String renewalFlag) {
+        if (!StringUtils.hasText(renewalFlag)) {
+            return null;
+        }
+        // RenewalEnum 枚举值
+        if (renewalFlag.equals("0")) {
+            return "2";
+        } else {
+            return "3";
+        }
+    }
 }

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/build/ZiJinCrawlerQuoteResultsVoBuild.java

@@ -11,6 +11,7 @@ import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.util.DateTimeUtils;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.quotation.commons.constant.enums.quote.RenewalEnum;
 import com.jzg.quotation.zijin.api.constant.enums.RiskCodeEnum;
 import com.jzg.quotation.zijin.crawler.entity.response.ZiJinCrawlerQuotationResponse;
 import com.jzg.quotation.zijin.crawler.entity.response.ZiJinCrawlerSaveProposalResponse;
@@ -94,7 +95,7 @@ public class ZiJinCrawlerQuoteResultsVoBuild {
         // 设置警告消息（预核保消息）
         warnMessageList(ziJinCrawlerQuotationResponse, quoteResultsVo);
 
-        // 设置评分、折扣、影响因子
+        // 设置评分、折扣、影响因子、转保标识
         quoteResultsVo.setScoreVo(ZiJinCrawlerQuoteResultsVoBuild.buildScoreVo(ziJinCrawlerQuotationResponse));
 
         // 构建因子
@@ -290,9 +291,9 @@ public class ZiJinCrawlerQuoteResultsVoBuild {
 
         ZiJinCrawlerQuotationResponse.BasePart basePart = ziJinCrawlerQuotationResponse.getBasePart();
         // 交强续保
-        scoreVo.setJqRenewal(basePart.getXbFlagCI());
+        scoreVo.setJqRenewal(convertRenewalFlag(basePart.getXbFlagCI()));
         // 商业续保
-        scoreVo.setSyRenewal(basePart.getXbFlag());
+        scoreVo.setSyRenewal(convertRenewalFlag(basePart.getXbFlag()));
 
         List<ZiJinCrawlerQuotationResponse.PriceInfoList> priceInfoList = ziJinCrawlerQuotationResponse.getPriceInfoList();// 定价信息列表
         if (CollectionUtils.isEmpty(priceInfoList)) {
@@ -441,4 +442,16 @@ public class ZiJinCrawlerQuoteResultsVoBuild {
         scoreVo.setScoreJson(scoreArray);
         return scoreVo;
     }
+
+    private static String convertRenewalFlag(String renewalFlag) {
+        if (!StringUtils.hasText(renewalFlag)) {
+            return null;
+        }
+        // RenewalEnum 枚举转换不了，这里直接返回 2 或 3
+        if (renewalFlag.equals("0")) {
+            return "2";
+        } else {
+            return "3";
+        }
+    }
 }