解决永城财险上年车船税问题

src/main/java/com/ydtech/constants/InsuranceEnum.java

@@ -48,7 +48,7 @@ public enum InsuranceEnum {
     HGIC("HGIC", "海峡金桥财产保险股份有限公司", ""),
     HHBX("HHBX", "华海财产保险股份有限公司", ""),
     HNIC("HNIC", "华农财产保险股份有限公司", ""),
-    HTIC("HTIC", "华泰财产保险有限公司", ""),
+    HTIC("HTIC", "华泰财产保险有限公司", "huatai"),
     HYIC("HYIC", "现代财产保险（中国）有限公司", ""),
     JLIC("JLIC", "久隆财产保险有限公司", ""),
     JTIC("JTIC", "锦泰财产保险股份有限公司", ""),

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -322,7 +322,7 @@ public class YcBuildData {
             TaxArrears taxArrear = new TaxArrears();
 
             taxArrear.setYears(rd.getTax().getTaxEndDateCurrentYear());
-            taxArrear.setTaxDefault(StringUtils.toDouble(rd.getTax().getSumUpTax()));
+            taxArrear.setTaxDefault(StringUtils.toDouble(rd.getTax().getFormerTax()));
             taxArrear.setLateFee(StringUtils.toDouble(rd.getTax().getLateFee()));
             taxArrearsList.add(taxArrear);
             quoteRespVo.setTaxArrears(taxArrearsList);

src/main/java/com/ydtech/modules/order/components/zijin/ZijinVehicleTypeErrorComponents.java

@@ -84,7 +84,6 @@ public class ZijinVehicleTypeErrorComponents extends ResponseMessageAbstractHand
         calculatePremiumRequest.modificationOfVehicleType(vehicleModelInfosDTO, actualValue);
         calculatePremiumRequest.setOrderId(modelQueryResponse.getOrderId());
         calculatePremiumRequest.setOrderNo(modelQueryResponse.getOrderNo());
-
         List<CalculatePremiumRequest.ItemKindListDTO> itemKindListDTO = calculatePremiumRequest.getItemKindList().stream()
                 .filter(x -> x.getKindCode().equals(MotorVehicleInsuranceEnum.MVI_A.getCode())).collect(Collectors.toList());
 

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/CalculatePremiumRequest.java

@@ -108,6 +108,9 @@ public class CalculatePremiumRequest implements Serializable {
     @JsonProperty("vehicleInfo")
     private VehicleInfoDTO vehicleInfo;
 
+    @JsonProperty("demandNoCheckFlag")
+    private String demandNoCheckFlag = "1";
+
     public CalculatePremiumRequest(BaseQuoteInfoVo quoteInfoVo, ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO, String actualValue, List<ZjQuoteAccidentVo> zjQuoteAccidentVos, ZjConfigureParameters zjConfigureParameters, ModelQueryResponse modelQueryResponse) {
         // 基本信息
         this.baseInfo = new BaseInfoDTO(quoteInfoVo.getRiskList());
@@ -864,7 +867,7 @@ public class CalculatePremiumRequest implements Serializable {
             this.vehicleId = vehicleModelInfosDTO.getVehicleId();
 
             this.vinNo = carInfo.getVinNo();
-            this.brandName = vehicleModelInfosDTO.getBrand();
+            this.brandName = vehicleModelInfosDTO.getModelName();
             this.carInsuredRelation = "1";
             this.carKindCode = "A0";
             this.carKindDetailId = getCarKindDetailId(Integer.parseInt(carInfo.getSeatCount()));
@@ -877,7 +880,7 @@ public class CalculatePremiumRequest implements Serializable {
             this.printModelName = vehicleModelInfosDTO.getModelName();
             this.power = vehicleModelInfosDTO.getPower();
             this.oriPurchasePrice = vehicleModelInfosDTO.getPurchasePrice();
-            this.oriBrandName = vehicleModelInfosDTO.getBrand();
+            this.oriBrandName = vehicleModelInfosDTO.getModelName();
             this.oriModelName = vehicleModelInfosDTO.getModelName();
             this.vehicleStyleUniqueId = vehicleModelInfosDTO.getVehicleId();
             this.isInvokeJingYou = "1";
@@ -903,14 +906,14 @@ public class CalculatePremiumRequest implements Serializable {
             this.modelCode = vehicleModelInfosDTO.getModelCode();
             this.purchasePrice = vehicleModelInfosDTO.getPurchasePrice();
             this.vehicleId = vehicleModelInfosDTO.getVehicleId();
-            this.brandName = vehicleModelInfosDTO.getBrand();
+            this.brandName = vehicleModelInfosDTO.getModelName();
             this.exhaustCapacity = vehicleModelInfosDTO.getExhaustCapacity();
             this.platVehicleCode = vehicleModelInfosDTO.getPlatVehicleCode();
             this.modelEnergyType = vehicleModelInfosDTO.getPowerTypeCode();
             this.printModelName = vehicleModelInfosDTO.getModelName();
             this.power = vehicleModelInfosDTO.getPower();
             this.oriPurchasePrice = vehicleModelInfosDTO.getPurchasePrice();
-            this.oriBrandName = vehicleModelInfosDTO.getBrand();
+            this.oriBrandName = vehicleModelInfosDTO.getModelName();
             this.oriModelName = vehicleModelInfosDTO.getModelName();
             this.vehicleStyleUniqueId = vehicleModelInfosDTO.getVehicleId();
         }
@@ -925,7 +928,11 @@ public class CalculatePremiumRequest implements Serializable {
     public static class InsuredListDTO implements Serializable {
 
         private static final long serialVersionUID = -3707826282312519677L;
-
+        /**
+         * 职业
+         */
+        @JsonProperty("occupation")
+        private String occupation;
         /**
          * 地址
          */
@@ -983,6 +990,7 @@ public class CalculatePremiumRequest implements Serializable {
         private String validDate;
 
         public InsuredListDTO(CustomerInfoVo policyHolderInfo, String insuredFlag) {
+            this.occupation = "030199";
             this.address = policyHolderInfo.getAddr();
             this.identifyNumber = policyHolderInfo.getIdentifyNumber();
             this.identifyType = "01";

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/ModelQueryRequest.java

@@ -103,7 +103,7 @@ public class ModelQueryRequest implements Serializable {
         this.proposalAreaCode = zjConfigureParameters.getProposalAreaCode();
         this.proposalCityCode = zjConfigureParameters.getProposalCityCode();
         this.vinNo = carInfoVo.getVinNo();
-        this.brandName = carInfoVo.getBrandName();
+        this.brandName = carInfoVo.getModelcname();
     }
 
     public void modificationModelQueryRequest(String modelCode) {

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

@@ -109,13 +109,12 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 1.2 通过 协议id获取配置实体
         ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, ptlAgreementAttribution);
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjConfigureParameters, ZijinRequestApiComponents.RECURSIVE_HIERARCHY);
-
         // 2. 查询车型
         ModelQueryRequest modelQueryRequest = new ModelQueryRequest(quoteInfoVo.getCarInfo(), zjConfigureParameters);
         ModelQueryResponse modelQueryResponse = zijinRequestApiComponents.modelQuery(modelQueryRequest, httpHeaders);
         // 2.1 过滤车型
-        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO = new CarModelsFilterUtils<ModelQueryResponse.VehicleModelInfosDTO>().to(modelQueryResponse.getVehicleModelInfos(), quoteInfoVo.getCarInfo());
-
+        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO
+                = new CarModelsFilterUtils<ModelQueryResponse.VehicleModelInfosDTO>().to(modelQueryResponse.getVehicleModelInfos(), quoteInfoVo.getCarInfo());
         // 3. 计算车辆实际价值
         String purchasePrice = vehicleModelInfosDTO.getPurchasePrice();
         String seatCount = vehicleModelInfosDTO.getSeatCount();
@@ -422,7 +421,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
             CalculatePremiumResponse.ItemKindListDTO itemKindListDTO = itemKindList.stream().filter(a -> a.getKindCode().equals(InsuranceTypeCorrespondence.getZjConnectInsuranceType()[i])).collect(Collectors.toList()).get(0);
 
-            kind.setCoveragePremium(Double.parseDouble(itemKindListDTO.getBasePremium()));
+            kind.setCoveragePremium(Double.parseDouble(itemKindListDTO.getPremium()));
             kind.setUnitAmount(kindInfoVo.getUnitAmount());
             if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
                 kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));