Merge branch 'master' into dev_jzg_lipf_v20260518

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/entity/request/HbCrawlerCalculationRequest.java

@@ -77,7 +77,7 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
     @Serial
     private static final long serialVersionUID = -6130320344004620564L;
 
-    public HbCrawlerCalculationRequest(QuoteVo quoteVo, String plyappno) {
+    public HbCrawlerCalculationRequest(QuoteVo quoteVo, String plyappno, String depreciationPrice) {
         this.clauseType = "2";
         List<KindInfoVo> kindInfoVoList = quoteVo.getKindInfoVo();
         this.risktype = "0";
@@ -88,12 +88,11 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
             this.risktype = "1";
         }
         if (CollUtil.isNotEmpty(kindInfoVoList)) {
-            this.epersonliabilityList = getEpersonliabilityList(kindInfoVoList);
+            this.epersonliabilityList = getEpersonliabilityList(kindInfoVoList, depreciationPrice);
             this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
             this.begintimeAccident = DateUtil.toUtcDateTime(quoteVo.getBiRiskInfoVo().getStartDate());
             this.risktype = "2";
         } else {
-//            this.begintimeBi = DateUtil.toUtcDateTime(quoteVo.getCiRiskInfoVo().getStartDate());
             this.epersonliabilityList = new ArrayList<>();
         }
         this.plyappno = plyappno;
@@ -107,18 +106,34 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
         this.effectfLag = null;
         this.ecarChargingPosts = new ArrayList<>();
         this.carInsureDevices = new ArrayList<>();
+        this.outofwarrantytype = "N";
+        this.drivingtype = "";
+        this.endtimeAccident = "";
         this.accidentInsuranceList = getAccidentInsuranceList(quoteVo.getBiRiskInfoVo(), quoteVo.getAccidentalDrivings());
     }
 
-    public List<EpersonliabilityDTO> getEpersonliabilityList(List<KindInfoVo> kindInfoVoList) {
+    public List<EpersonliabilityDTO> getEpersonliabilityList(List<KindInfoVo> kindInfoVoList, String depreciationPrice) {
         List<EpersonliabilityDTO> epersonliabilityDTOList = new ArrayList<>();
         for (KindInfoVo kindInfoVo : kindInfoVoList) {
             EpersonliabilityDTO epersonliabilityDTO = new EpersonliabilityDTO();
             epersonliabilityDTO.setKindcode(kindInfoVo.getKindCode());
             epersonliabilityDTO.setLiabname(kindInfoVo.getKindName());
-            epersonliabilityDTO.setLiabamt(kindInfoVo.getAmount());
-            epersonliabilityDTO.setQuantity(kindInfoVo.getQuantity());
-            epersonliabilityDTO.setUnitAmount(kindInfoVo.getUnitAmount());
+            // kindcode "101"（机动车损失保险）的保额必须使用车辆折旧价（实际价值），
+            // 否则保司会校验"协商价格范围建议在实际价值上下30%浮动"并拒绝
+            if ("101".equals(kindInfoVo.getKindCode()) && depreciationPrice != null) {
+                epersonliabilityDTO.setLiabamt(depreciationPrice);
+                epersonliabilityDTO.setUnitAmount(depreciationPrice);
+            } else if (!"116".equals(kindInfoVo.getKindCode())) {
+                // kindcode "116"不需要liabamt和unitAmount
+                epersonliabilityDTO.setLiabamt(kindInfoVo.getAmount());
+                epersonliabilityDTO.setUnitAmount(kindInfoVo.getUnitAmount());
+            }
+            if ("116".equals(kindInfoVo.getKindCode())) {
+                // 道路救援服务特约条款：只需要serviceTimes字段
+                epersonliabilityDTO.setServiceTimes(kindInfoVo.getServiceTimes() != null ? kindInfoVo.getServiceTimes() : "2");
+            } else {
+                epersonliabilityDTO.setQuantity(kindInfoVo.getQuantity() != null ? kindInfoVo.getQuantity() : "4");
+            }
             epersonliabilityDTOList.add(epersonliabilityDTO);
         }
         return epersonliabilityDTOList;
@@ -300,6 +315,7 @@ public class HbCrawlerCalculationRequest extends HbBaseRequest {
         private String liabname;
         private String model = "0";
         private String quantity;
+        private String serviceTimes;
         private String unitAmount;
     }
 

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -148,7 +148,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
         HbCrawlerQuoteimmediatelyRequest quoteimmediatelyRequest = new HbCrawlerQuoteimmediatelyRequest(quoteVo, salesInfo, depreciationPrice, parameters, contentDTO);
         String plyappno = hbCrawlerRequestComponent.quoteImmediately(quoteimmediatelyRequest, headers);
         // 5.1 报价第二步，提交报价数据，返回是否重复投保，脱保等提示信息,用于页面展示
-        HbCrawlerCalculationRequest calculationRequest = new HbCrawlerCalculationRequest(quoteVo, plyappno);
+        HbCrawlerCalculationRequest calculationRequest = new HbCrawlerCalculationRequest(quoteVo, plyappno, depreciationPrice);
         // 非车信息匹配核心
         matchingAccident(quoteVo, headers, plyappno, calculationRequest);
         String resJson = hbCrawlerRequestComponent.getCalculationResult(calculationRequest, headers);

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

@@ -125,7 +125,7 @@ public class TkCrawlerQuoteResultsBuild {
         // 设置商业险保费
         quoteResultsVo.getCosts().setBiPremium(premium.getSyPremium().toString());
         // 设置车船税
-        quoteResultsVo.getCosts().setVvTax(premium.getTax().toString());
+        quoteResultsVo.getCosts().setVvTax(preciseInitResult.getCarTax().getSumPayment().toString());
         // 设置非车险(驾意险)保费
         quoteResultsVo.getCosts().setNiPremium(premium.getJyxPremium().toString());
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
@@ -143,7 +143,7 @@ public class TkCrawlerQuoteResultsBuild {
                 .fluentPut("score", preciseInitResult.getRiskScore()));
         quoteResultsVo.getScoreVo().setScoreJson(scoreJson);
         // 欠税信息
-        if (null != preciseInitResult.getCarTax()) {
+        if (preciseInitResult.getCarTax() != null) {
             List<TaxInfoVo> taxArrearsList = new ArrayList<>();
             TaxInfoVo taxArrear = new TaxInfoVo();
             taxArrear.setYears(preciseInitResult.getCarTax().getRepaymentYear());

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

@@ -293,8 +293,7 @@ public class TKSimpleService {
     public AreaUserResult areaUser(TKLoginSession session, String mainOrderId, AgentFuzzyResult agentFuzzyResult, String agentCode) {
         List<AreaUserResult> areaUserResults = httpService.areaUser(session.getToken(), session.getTplatformId(), mainOrderId, agentFuzzyResult, agentCode);
         // todo 先暂时取第1个省第1个城市
-        AreaUserResult province = areaUserResults.get(0);
-        return province;
+        return areaUserResults.get(0);
     }
 
     /**