Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKPremium.java

@@ -65,6 +65,11 @@ public class TKPremium extends UnknownFieldEntity {
      */
     private BigDecimal syPremium;
 
+    /**
+     * 驾意险保费
+     */
+    private BigDecimal jyxPremium;
+
     /**
      * 税款
      */

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/service/impl/TKQuotationBaseServiceImpl.java

@@ -223,9 +223,10 @@ public class TKQuotationBaseServiceImpl implements TKQuotationBaseService {
         // 设置商业险保费
         quoteResultsVo.getCosts().setBiPremium(premium.getSyPremium().toString());
         // 设置车船税
-        quoteResultsVo.getCosts().setVvTax(premium.getTax().toString());
+        quoteResultsVo.getCosts().setVvTax(premium.getSumCarTaxJqPremium().toString());
         // 设置非车险(驾意险)保费
-        quoteResultsVo.getCosts().setNiPremium(preciseInitResult.getDriverAccidentVo().getPremium().toString());
+        quoteResultsVo.getCosts().setNiPremium(premium.getJyxPremium().toString());
+        //quoteResultsVo.getCosts().setSumPremium(premium.getSumPremium().toString());
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         // 缓存报价书据数据
         redisCacheUtil.setPreciseInitResult(preciseInitResult, quoteResultsVo.getOrdersNo());