修改出险次数

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumResp.java

@@ -151,6 +151,274 @@ public class PremiumResp {
         @JSONField(name = "ciInsureDemandPay")
         private List<CIInsureDemandPayVo> ciInsureDemandPay;
 
+        @JsonProperty(value = "ciInsureDemand")
+        @JSONField(name = "ciInsureDemand")
+        private List<CiInsureDemandDTO> ciInsureDemandDTOS;
+
+        @NoArgsConstructor
+        @Data
+        public static class CiInsureDemandDTO{
+
+            @JsonProperty("demandNo")
+            private String demandNo;
+            @JsonProperty("errorMessage")
+            private String errorMessage;
+            @JsonProperty("errorCode")
+            private String errorCode;
+            @JsonProperty("checkCode")
+            private String checkCode;
+            @JsonProperty("ownerMessage")
+            private String ownerMessage;
+            @JsonProperty("commissionRateUpper")
+            private String commissionRateUpper;
+            @JsonProperty("companyCommissionRateUpper")
+            private String companyCommissionRateUpper;
+            @JsonProperty("claimEffectReason")
+            private String claimEffectReason;
+            @JsonProperty("newvehicleEffectReason")
+            private String newvehicleEffectReason;
+            @JsonProperty("produceReffectReason")
+            private String produceReffectReason;
+            @JsonProperty("busiLastYearEndDat")
+            private String busiLastYearEndDat;
+            @JsonProperty("transferFlag")
+            private String transferFlag;
+            @JsonProperty("highRiskFlag")
+            private String highRiskFlag;
+            @JsonProperty("effectReason")
+            private String effectReason;
+            @JsonProperty("lastyearCompanyId")
+            private String lastyearCompanyId;
+            @JsonProperty("ciInsureDemandBI")
+            private Object ciInsureDemandBI;
+            @JsonProperty("licensePlateType")
+            private String licensePlateType;
+            @JsonProperty("color")
+            private String color;
+            @JsonProperty("vehicleOwnerName")
+            private String vehicleOwnerName;
+            @JsonProperty("displacement")
+            private String displacement;
+            @JsonProperty("channelType")
+            private String channelType;
+            @JsonProperty("salePrice")
+            private String salePrice;
+            @JsonProperty("motorTypeCode")
+            private String motorTypeCode;
+            @JsonProperty("contractNo")
+            private String contractNo;
+            @JsonProperty("contractValidDate")
+            private String contractValidDate;
+            @JsonProperty("contractExpireDate")
+            private String contractExpireDate;
+            @JsonProperty("pmVehicleMessage")
+            private String pmVehicleMessage;
+            @JsonProperty("useNatureMessage")
+            private String useNatureMessage;
+            @JsonProperty("chgOwnerMessage")
+            private String chgOwnerMessage;
+            @JsonProperty("scoreCode")
+            private String scoreCode;
+            @JsonProperty("score")
+            private String score;
+            @JsonProperty("updateTime")
+            private String updateTime;
+            @JsonProperty("insureYears")
+            private String insureYears;
+            @JsonProperty("claimTimes")
+            private String claimTimes;
+            @JsonProperty("claimAdjustLevel")
+            private String claimAdjustLevel;
+            @JsonProperty("newVehicleFlag")
+            private String newVehicleFlag;
+            @JsonProperty("comCode")
+            private String comCode;
+            @JsonProperty("modelCode")
+            private String modelCode;
+            @JsonProperty("remark")
+            private String remark;
+            @JsonProperty("searchSequenceNo")
+            private String searchSequenceNo;
+            @JsonProperty("renewalFlag")
+            private String renewalFlag;
+            @JsonProperty("noClaimAdjustReason")
+            private String noClaimAdjustReason;
+            @JsonProperty("riskCode")
+            private String riskCode;
+            @JsonProperty("proposalNo")
+            private String proposalNo;
+            @JsonProperty("licenseNo")
+            private String licenseNo;
+            @JsonProperty("engineNo")
+            private String engineNo;
+            @JsonProperty("frameNo")
+            private String frameNo;
+            @JsonProperty("startDate")
+            private String startDate;
+            @JsonProperty("endDate")
+            private String endDate;
+            @JsonProperty("policyNo")
+            private String policyNo;
+            @JsonProperty("operatorCode")
+            private String operatorCode;
+            @JsonProperty("brandName")
+            private String brandName;
+            @JsonProperty("amount")
+            private String amount;
+            @JsonProperty("carOwner")
+            private String carOwner;
+            @JsonProperty("vehicleBrand")
+            private String vehicleBrand;
+            @JsonProperty("premium")
+            private String premium;
+            @JsonProperty("licenseColorCode")
+            private String licenseColorCode;
+            @JsonProperty("carKindCode")
+            private String carKindCode;
+            @JsonProperty("useNatureCode")
+            private String useNatureCode;
+            @JsonProperty("basePremium")
+            private String basePremium;
+            @JsonProperty("licenseType")
+            private String licenseType;
+            @JsonProperty("enrollDate")
+            private String enrollDate;
+            @JsonProperty("tonCount")
+            private String tonCount;
+            @JsonProperty("completeKerbMass")
+            private String completeKerbMass;
+            @JsonProperty("seatCount")
+            private String seatCount;
+            @JsonProperty("fuelType")
+            private String fuelType;
+            @JsonProperty("exhaustScale")
+            private String exhaustScale;
+            @JsonProperty("transferDate")
+            private String transferDate;
+            @JsonProperty("lastYearEndDate")
+            private String lastYearEndDate;
+            @JsonProperty("reCoverMsg")
+            private String reCoverMsg;
+            @JsonProperty("certificateDate")
+            private String certificateDate;
+            @JsonProperty("claimCoeff")
+            private String claimCoeff;
+            @JsonProperty("peccancyCoeff")
+            private String peccancyCoeff;
+            @JsonProperty("benchmarkPremium")
+            private String benchmarkPremium;
+            @JsonProperty("driverCoeff")
+            private String driverCoeff;
+            @JsonProperty("districtCoeff")
+            private String districtCoeff;
+            @JsonProperty("manufacturerName")
+            private String manufacturerName;
+            @JsonProperty("endValidDate")
+            private String endValidDate;
+            @JsonProperty("carStatus")
+            private String carStatus;
+            @JsonProperty("validCheckDate")
+            private String validCheckDate;
+            @JsonProperty("flag")
+            private String flag;
+            @JsonProperty("ip")
+            private String ip;
+            @JsonProperty("noPeccancyReason")
+            private String noPeccancyReason;
+            @JsonProperty("lastBusinessNature")
+            private String lastBusinessNature;
+            @JsonProperty("nonclaimAdjust")
+            private String nonclaimAdjust;
+            @JsonProperty("loyaltyAdjust")
+            private String loyaltyAdjust;
+            @JsonProperty("safeAdjust")
+            private String safeAdjust;
+            @JsonProperty("lastPolicyNo")
+            private String lastPolicyNo;
+            @JsonProperty("usbKey")
+            private String usbKey;
+            @JsonProperty("noLoyaltyAdjustReason")
+            private String noLoyaltyAdjustReason;
+            @JsonProperty("kindAdjustReason")
+            private String kindAdjustReason;
+            @JsonProperty("noKindAdjustReason")
+            private String noKindAdjustReason;
+            @JsonProperty("kindAdjustValue")
+            private String kindAdjustValue;
+            @JsonProperty("peccancyEndDate")
+            private String peccancyEndDate;
+            @JsonProperty("policyCoeff")
+            private String policyCoeff;
+            @JsonProperty("brandCName")
+            private String brandCName;
+            @JsonProperty("restricFlag")
+            private String restricFlag;
+            @JsonProperty("dataSourceCode")
+            private String dataSourceCode;
+            @JsonProperty("fundRate")
+            private String fundRate;
+            @JsonProperty("fundAmount")
+            private String fundAmount;
+            @JsonProperty("districtRateReason")
+            private String districtRateReason;
+            @JsonProperty("question")
+            private String question;
+            @JsonProperty("makeDate")
+            private String makeDate;
+            @JsonProperty("queryPastDate")
+            private String queryPastDate;
+            @JsonProperty("proconfirmSequenceNo")
+            private String proconfirmSequenceNo;
+            @JsonProperty("proconfirmStartDate")
+            private String proconfirmStartDate;
+            @JsonProperty("proconfirmEndDate")
+            private String proconfirmEndDate;
+            @JsonProperty("preferentialPremium")
+            private String preferentialPremium;
+            @JsonProperty("commissionRate")
+            private String commissionRate;
+            @JsonProperty("demandTime")
+            private String demandTime;
+            @JsonProperty("preferentialFormula")
+            private String preferentialFormula;
+            @JsonProperty("driverRateReason")
+            private String driverRateReason;
+            @JsonProperty("rateFloatFlag")
+            private String rateFloatFlag;
+            @JsonProperty("peccancyAdjustReason")
+            private String peccancyAdjustReason;
+            @JsonProperty("claimAdjustReason")
+            private String claimAdjustReason;
+            @JsonProperty("ciinsureDemandRiskCodeListBI")
+            private Object ciinsureDemandRiskCodeListBI;
+            @JsonProperty("busiAdjustStart")
+            private String busiAdjustStart;
+            @JsonProperty("peccancyStartDate")
+            private String peccancyStartDate;
+            @JsonProperty("preferentialDay")
+            private String preferentialDay;
+            @JsonProperty("busiAdjustEnd")
+            private String busiAdjustEnd;
+            @JsonProperty("lastYearStartDate")
+            private String lastYearStartDate;
+            @JsonProperty("billDate")
+            private String billDate;
+            @JsonProperty("reinsureFlag")
+            private String reinsureFlag;
+            @JsonProperty("lastBillDate")
+            private String lastBillDate;
+            @JsonProperty("loyaltyAdjustReason")
+            private String loyaltyAdjustReason;
+            @JsonProperty("busiLastYearEndDate")
+            private String busiLastYearEndDate;
+            @JsonProperty("useTypeSource")
+            private String useTypeSource;
+            @JsonProperty("checkDate")
+            private String checkDate;
+            @JsonProperty("haulage")
+            private String haulage;
+        }
+
         @NoArgsConstructor
         @Data
         public static class CIInsureDemandPayVo {

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -507,6 +507,8 @@ public class InsAreaCompany implements Serializable {
         this.syAdjustRate = StringUtils.parseDouble(quoteRespVo.getSyAdjustRate());
         this.jqRenewal = quoteRespVo.getJqRenewal();
         this.syRenewal = quoteRespVo.getSyRenewal();
+        this.jqClaims = quoteRespVo.getJqClaims();
+        this.syClaims = quoteRespVo.getSyClaims();
 
     }
 

src/main/java/com/ydtech/modules/order/service/impl/GuorenOrderApiServiceImpl.java

@@ -631,16 +631,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         iac.setJqpremium(jqPremium);
         iac.setSypremium(syPremium);
         iac.setTaxamount(BigDecimal.valueOf(jq_falg ? quoteRespVo.getTaxAmount() : 0));
-        StringBuffer sb = new StringBuffer();
-        sb.append("出险信息，交强险：");
-        if (CollUtil.isNotEmpty(premiumResult.getCiInsureDemandPay())) {
-            sb.append(premiumResult.getCiInsureDemandPay().size());
-        } else {
-            sb.append("0");
-        }
-        //商业险出险次数
-        iac.setAccidentStrInfo(sb.toString());
-        //@TODO 临时用保险公司订单号存放 投保单查询需要
+
         iac.setInsOrderNo(carPriceUuid);
     }
 
@@ -748,6 +739,17 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         quoteRespVo.setOrderno(insOrder.getOrderno()); //订单号
         quoteRespVo.setJqPremium(jqPremiumBig.doubleValue());
         quoteRespVo.setSyPremium(syPremiumBig.doubleValue());
+
+        // 出险次数
+        List<PremiumResp.DataDTO.CiInsureDemandDTO> ciInsureDemandDTOS = rd.getCiInsureDemandDTOS();
+        for (PremiumResp.DataDTO.CiInsureDemandDTO ciInsureDemandDTO : ciInsureDemandDTOS) {
+            if (GuoRenRiskCode.R_0507.getCode().equals(ciInsureDemandDTO.getRiskCode())) {
+                quoteRespVo.setJqClaims(ciInsureDemandDTO.getClaimTimes());
+            }else if(GuoRenRiskCode.R_0518.getCode().equals(ciInsureDemandDTO.getRiskCode())){
+                quoteRespVo.setSyClaims(ciInsureDemandDTO.getClaimTimes());
+            }
+        }
+
         return quoteRespVo;
     }
 

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -70,6 +70,7 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTaskImagesService;
 import com.ydtech.modules.order.service.YongchengOrderApiService;
 import com.ydtech.modules.order.utils.InsuranceLog;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.DateTimeUtil;
 import com.ydtech.utils.StringUtils;
@@ -388,7 +389,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         quoteRespVo.setCoreModels(coreModelsVo);
         //添加调用费用匹配功能
 //        feeRuleSchemeService.dealFeeOrderInfo(yaQuoteInfoVo, quoteRespVo, quoteVo.getAgreementId(), iac.getId());
-        
+
         return HttpResult.ok("报价成功", quoteRespVo);
 
     }
@@ -1221,10 +1222,12 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
         }
 
-        //出险信息
-        insAreaCompany.setAccidentStrInfo(quoteRespVo.getAccidentInfoStr());
         //评分
         insAreaCompany.setScore(quoteRespVo.getILogPreUdwMess());
+
+        // 出现次数
+        insAreaCompany.setJqClaims(quoteRespVo.getJqClaims());
+        insAreaCompany.setSyClaims(quoteRespVo.getSyClaims());
         //欠税信息
         if (null != quoteRespVo.getTaxArrears()) {
             insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(quoteRespVo.getTaxArrears())));