Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.commons.component;
 
 import com.alibaba.fastjson2.JSON;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.quotation.commons.standard.CrawlerRequestUrlStandard;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/InsuranceCode.java

@@ -2,7 +2,6 @@ package com.jzg.quotation.commons.constant;
 
 
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 /**
  * @description: 保险公司编码

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/QuoteRuleCategory.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.commons.constant.enums.base;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/KindCode.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.commons.constant.enums.quote;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 @AllArgsConstructor

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/quote/LicenseKindCode.java

@@ -0,0 +1,45 @@
+package com.jzg.quotation.commons.constant.enums.quote;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 号牌种类
+ * @author: wenks
+ * @date: 2025/2/26 11:58
+ **/
+@AllArgsConstructor
+@Getter
+public enum LicenseKindCode {
+
+    L01("01", "大型汽车号牌"),
+    L02("02", "小型汽车号牌"),
+    L03("03", "使馆汽车号牌"),
+    L04("04", "领馆汽车号牌"),
+    L05("05", "境外汽车号牌"),
+    L06("06", "外籍汽车号牌"),
+    L07("07", "大型新能源汽车号牌"),
+    L08("08", "小型新能源汽车号牌"),
+
+//    L13("13", "农用运输车号牌"),
+//    L15("15", "挂车号牌"),
+//    L16("16", "教练汽车号牌"),
+//    L18("18", "试验汽车号牌"),
+//    L20("20", "临时入境汽车号牌"),
+//    L22("22", "临时行驶车号牌"),
+//    L23("23", "公安警车号牌"),
+//    L24("24", "其它车型"),
+//    L38("38", "警用汽车号牌"),
+//    L39("39", "警用摩托车号牌"),
+//    L81("81", "武警号牌"),
+//    L32("32", "军队号牌"),
+//    L99("99", "其它号牌");
+    ;
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+
+}

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteVo.java

@@ -52,5 +52,9 @@ public class QuoteVo implements Serializable {
      * 商业险信息
      */
     private List<KindInfoVo> kindInfoVo;
+    /**
+     * 非车险
+     */
+    private List<AccidentalDrivingVo> accidentalDrivings;
 
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UnderwritingVo.java

@@ -0,0 +1,32 @@
+package com.jzg.quotation.commons.entity.vo.aggregated;
+
+
+import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.quotation.commons.entity.vo.underwriting.SpecialAppointmentsVo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description: 核保实体
+ * @author: wenks
+ * @date: 2025/2/26 14:33
+ **/
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class UnderwritingVo {
+
+    /**
+     * 订单交互信息
+     */
+    private OrderBase order;
+
+    /**
+     * 特别约定
+     */
+    private List<SpecialAppointmentsVo> specialAppointmentsVos;
+
+}

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UploadImageVo.java

@@ -0,0 +1,32 @@
+package com.jzg.quotation.commons.entity.vo.aggregated;
+
+import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import com.jzg.quotation.commons.entity.vo.image.ImageVo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @description: 上传影像聚合实体
+ * @author: wenks
+ * @date: 2025/2/26 14:22
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class UploadImageVo {
+
+    /**
+     * 订单交互信息
+     */
+    private OrderBase order;
+
+    /**
+     * 影像分类
+     */
+    private List<ImageVo> imageVoList;
+
+}

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/base/LoginBase.java

@@ -1,6 +1,5 @@
 package com.jzg.quotation.commons.entity.vo.base;
 
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/image/ImageVo.java

@@ -0,0 +1,29 @@
+package com.jzg.quotation.commons.entity.vo.image;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * @version
+ * @description: 上传影像实体
+ * @author: wenks
+ * @date: 2025/2/26 14:21
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ImageVo {
+
+    /**
+     * 影像类型
+     */
+    private String imageType;
+
+    /**
+     * 影像base64 影像类型
+     */
+    private String imageBase64Str;
+
+}

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/quote/AccidentalDrivingVo.java

@@ -1,31 +1,52 @@
 package com.jzg.quotation.commons.entity.vo.quote;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * @description: todo
+ * @description: 非车险
  * @author: shenwd
  * @date:2025/2/24 17:41
  **/
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
-//@ApiModel(value = "驾意险")
 public class AccidentalDrivingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4823674553515932817L;
-    private String id;
 
-//    @ApiModelProperty(value = "驾意险编号")
-    private String rideRiskCode;
-
-//    @ApiModelProperty(value = "驾意险名称")
-    private String rideRiskName;
-
-//    @ApiModelProperty(value = "驾意险份数")
+    /**
+     * 险种编码
+     */
+    private String riskCode;
+    /**
+     * 险种名称
+     */
+    private String riskName;
+    /**
+     * 产品编码
+     */
+    private String productCode;
+    /**
+     * 产品名称
+     */
+    private String productName;
+    /**
+     * 产品分类编码
+     */
+    private String productCategoryCode;
+    /**
+     * 产品分类编码
+     */
+    private String productCategoryName;
+    /**
+     * 份数
+     */
     private int quantity;
 
-
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/quote/CarInfoVo.java

@@ -115,6 +115,13 @@ public class CarInfoVo implements Serializable {
      * 车种明细
      */
     private String carKindDetailIdCode;
+
+    /**
+     * @see com.jzg.quotation.commons.constant.enums.quote.LicenseKindCode
+     * 号牌种类
+     */
+    private String licenseKindCode;
+
     /**
      * 注册日期
      */

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/quote/KindInfoVo.java

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @description: 商业险 险种信息

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/quote/RiskInfoVo.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.commons.entity.vo.quote;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
 
 import java.io.Serial;
 import java.io.Serializable;

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/underwriting/SpecialAppointmentsVo.java

@@ -0,0 +1,43 @@
+package com.jzg.quotation.commons.entity.vo.underwriting;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: 特别约定实体
+ * @author: wenks
+ * @date: 2025/2/26 14:27
+ **/
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class SpecialAppointmentsVo {
+
+    /**
+     * 特约编码
+     */
+    private String clauseCode;
+
+    /**
+     * 特约名
+     */
+    private String clauses;
+
+    /**
+     * 特约内容
+     */
+    private String clausesContext;
+
+    /**
+     * 险种编号
+     */
+    private String riskCode;
+
+    /**
+     * 险种名称
+     */
+    private String riskName;
+
+}

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/converter/DaJiaQuotationProcessConstruction.java

@@ -1,49 +0,0 @@
-package com.jzg.quotation.dajia.crawler.converter;
-
-
-import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
-import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerActualValueRequest;
-import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerCarRequest;
-import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerCarResponse;
-
-/**
- * @description: 大家财险 报价过程构建
- * @author: wenks
- * @date: 2025/2/20 9:15
- **/
-public class DaJiaQuotationProcessConstruction {
-
-
-    public static DaJiaCrawlerCarRequest daJiaCrawlerCarRequestBuilder(CarInfoVo carInfoVo) {
-        DaJiaCrawlerCarRequest crawlerCarRequest = new DaJiaCrawlerCarRequest();
-        crawlerCarRequest.setPageNo(1);
-        crawlerCarRequest.setPageSize(30);
-        crawlerCarRequest.setVehicleName(carInfoVo.getBrandName());
-        crawlerCarRequest.setAreaCode("");
-        crawlerCarRequest.setOrderNo("");
-        crawlerCarRequest.setDptCode("");
-        crawlerCarRequest.setEngineNo(carInfoVo.getEngineNo());
-        crawlerCarRequest.setVin(carInfoVo.getVinNo());
-        crawlerCarRequest.setLicensePlateNo(carInfoVo.getLicenseNo());
-        crawlerCarRequest.setQueryMod("1");
-        crawlerCarRequest.setOperatorCode("");
-        return crawlerCarRequest;
-    }
-
-    public static DaJiaCrawlerActualValueRequest daJiaCrawlerActualValueRequestBuilder(DaJiaCrawlerCarResponse.ListDTO car, CarInfoVo carInfoVo) {
-        DaJiaCrawlerActualValueRequest crawlerActualValueRequest = new DaJiaCrawlerActualValueRequest();
-        crawlerActualValueRequest.setPurchaseValue(car.getVehiclePrice());
-        crawlerActualValueRequest.setRegisterDate("");
-        crawlerActualValueRequest.setRideKind("");
-        crawlerActualValueRequest.setStartDate("");
-        crawlerActualValueRequest.setUsage("");
-        crawlerActualValueRequest.setVehicleName("");
-        crawlerActualValueRequest.setFuelType("");
-        crawlerActualValueRequest.setCombineProductCode("");
-        crawlerActualValueRequest.setSeatNumber(carInfoVo.getSeatCount());
-        crawlerActualValueRequest.setModelEnergyType("");
-        crawlerActualValueRequest.setOperatorCode("");
-        return crawlerActualValueRequest;
-    }
-
-}

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/request/DaJiaCrawlerCarRequest.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.dajia.crawler.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -59,5 +60,18 @@ public class DaJiaCrawlerCarRequest implements Serializable {
     @JsonProperty("operatorCode")
     private String operatorCode;
 
+    public DaJiaCrawlerCarRequest(CarInfoVo carInfoVo,String areaCode, String dptCode, String operatorCode) {
+        this.pageNo = 1;
+        this.pageSize = 30;
+        this.vehicleName = carInfoVo.getBrandName();
+        this.areaCode = areaCode;
+        this.orderNo = null;
+        this.dptCode = dptCode;
+        this.engineNo = carInfoVo.getEngineNo();
+        this.vin = carInfoVo.getVinNo();
+        this.licensePlateNo = carInfoVo.getLicenseNo();
+        this.queryMod = carInfoVo.getLicenseKindCode();
+        this.operatorCode = operatorCode;
+    }
 
 }

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/response/DaJiaCrawlerCarResponse.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.dajia.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.quotation.commons.filter.CarModelsFilter;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -32,13 +33,19 @@ public class DaJiaCrawlerCarResponse implements Serializable {
 
     @NoArgsConstructor
     @Data
-    public static class ListDTO {
+    public static class ListDTO implements Serializable, CarModelsFilter {
+        @Serial
+        private static final long serialVersionUID = -9139048419262298709L;
+
         @JsonProperty("vehicleId")
         private String vehicleId;
+
         @JsonProperty("brandId")
         private String brandId;
+
         @JsonProperty("vehicleName")
         private String vehicleName;
+
         @JsonProperty("vehicleAlias")
         private String vehicleAlias;
         @JsonProperty("vehicleMaker")
@@ -63,81 +70,129 @@ public class DaJiaCrawlerCarResponse implements Serializable {
         private Double vehicleExhaust;
         @JsonProperty("vehicleTonnage")
         private String vehicleTonnage;
+
         @JsonProperty("vehicleSeat")
         private Integer vehicleSeat;
+
         @JsonProperty("vehiclePriceTax")
         private Integer vehiclePriceTax;
+
         @JsonProperty("antiTheft")
         private String antiTheft;
+
         @JsonProperty("airbag")
         private String airbag;
+
         @JsonProperty("absFlag")
         private String absFlag;
+
         @JsonProperty("transmissionType")
         private String transmissionType;
+
         @JsonProperty("remark")
         private String remark;
+
         @JsonProperty("qualityMax")
         private Integer qualityMax;
+
         @JsonProperty("qualityMin")
         private Integer qualityMin;
+
         @JsonProperty("vehiclePrice")
         private String vehiclePrice;
+
         @JsonProperty("vehiclePriceTax1")
         private String vehiclePriceTax1;
+
         @JsonProperty("factoryId")
         private String factoryId;
+
         @JsonProperty("power")
         private String power;
+
         @JsonProperty("vehicleTypeNew")
         private String vehicleTypeNew;
+
         @JsonProperty("powerTypeCode")
         private String powerTypeCode;
+
         @JsonProperty("powerTypeName")
         private String powerTypeName;
+
         @JsonProperty("travelTaxMark")
         private String travelTaxMark;
+
         @JsonProperty("vehicleHyCode")
         private String vehicleHyCode;
+
         @JsonProperty("vehicleHyName")
         private String vehicleHyName;
+
         @JsonProperty("cfrmNo")
         private String cfrmNo;
+
         @JsonProperty("cengNo")
         private String cengNo;
+
         @JsonProperty("cplateNo")
         private String cplateNo;
+
         @JsonProperty("ncurbWt")
         private String ncurbWt;
+
         @JsonProperty("cplateTyp")
         private String cplateTyp;
+
         @JsonProperty("ttransferDate")
         private String ttransferDate;
+
         @JsonProperty("cregVhlTyp")
         private String cregVhlTyp;
+
         @JsonProperty("cvhlTyp")
         private String cvhlTyp;
+
         @JsonProperty("cusageCde")
         private String cusageCde;
+
         @JsonProperty("cfstRegYmBar")
         private String cfstRegYmBar;
+
         @JsonProperty("nseatNum")
         private String nseatNum;
+
         @JsonProperty("ntonage")
         private String ntonage;
+
         @JsonProperty("ndisplacement")
         private String ndisplacement;
+
         @JsonProperty("cregOwner")
         private String cregOwner;
+
         @JsonProperty("ctraUsageCde")
         private String ctraUsageCde;
+
         @JsonProperty("chaulge")
         private String chaulge;
+
         @JsonProperty("tcertificateDate")
         private String tcertificateDate;
+
         @JsonProperty("cfuelType")
         private String cfuelType;
+
         @JsonProperty("cmodelEnergyType")
         private String cmodelEnergyType;
+
+        @Override
+        public String getCarYear() {
+            return "";
+        }
+
+        @Override
+        public String getPurchasePrice() {
+            return "";
+        }
     }
 }

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/entity/response/DaJiaCrawlerPriceResponse.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.dajia.crawler.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.dajia.crawler.entity.request.quote.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/crawler/service/impl/DaJiaCrawlerRequestImpl.java

@@ -6,11 +6,14 @@ import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.base.LoginBase;
 import com.jzg.quotation.commons.entity.vo.quote.AttributionInformationVo;
+import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.dajia.crawler.component.DaJiaCrawlerRequestComponent;
-import com.jzg.quotation.dajia.crawler.converter.DaJiaQuotationProcessConstruction;
 import com.jzg.quotation.dajia.crawler.entity.DaJiaCrawlerConfigureParameters;
-import com.jzg.quotation.dajia.crawler.entity.request.*;
+import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerActualValueRequest;
+import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerCarRequest;
+import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerPriceRequest;
+import com.jzg.quotation.dajia.crawler.entity.request.DaJiaCrawlerSaveRequest;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerCarResponse;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerPriceResponse;
 import com.jzg.quotation.dajia.crawler.entity.response.DaJiaCrawlerSaveResponse;
@@ -39,12 +42,11 @@ public class DaJiaCrawlerRequestImpl implements DaJiaCrawlerRequest {
         HttpHeaders headers = daJiaCrawlerRequestComponent.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         // 配置信息
         DaJiaCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(DaJiaCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
-
         // 车型查询
-        DaJiaCrawlerCarRequest daJiaCrawlerCarRequest = DaJiaQuotationProcessConstruction.daJiaCrawlerCarRequestBuilder(quoteVo.getCarInfoVo());
+        DaJiaCrawlerCarRequest daJiaCrawlerCarRequest = new DaJiaCrawlerCarRequest();
         List<DaJiaCrawlerCarResponse.ListDTO> car = daJiaCrawlerRequestComponent.car(daJiaCrawlerCarRequest, headers);
         // 获取相同的车型
-        DaJiaCrawlerCarResponse.ListDTO listDTO = car.get(0);
+        DaJiaCrawlerCarResponse.ListDTO listDTO = CarModelsFilterUtils.to(car, quoteVo.getCarInfoVo());
 
         // 计算折旧价格
         DaJiaCrawlerActualValueRequest daJiaCrawlerActualValueRequest = new DaJiaCrawlerActualValueRequest();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/entity/po/QuoteRuleMapping.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.Getter;
 
 import java.io.Serial;
 import java.io.Serializable;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/QuoteRuleConfigMapper.java

@@ -1,7 +1,7 @@
 package com.jzg.quotation.summary.mapper;
 
-import com.jzg.quotation.summary.entity.po.QuoteRuleConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.quotation.summary.entity.po.QuoteRuleConfig;
 
 /**
 * @author Administrator

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/QuoteRuleMappingMapper.java

@@ -1,7 +1,7 @@
 package com.jzg.quotation.summary.mapper;
 
-import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 
 /**
 * @author Administrator

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsuranceCompanyRequestService.java

@@ -3,6 +3,7 @@ package com.jzg.quotation.summary.service;
 
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.UploadImageVo;
 
 /**
  * @description: 保险公司请求服务
@@ -19,5 +20,12 @@ public interface InsuranceCompanyRequestService {
      */
     QuoteResultsVo quote(QuoteVo quoteVo);
 
+    /**
+     * 上传影像实体
+     *
+     * @param uploadImageVo 影像列表
+     */
+    void uploadImage(UploadImageVo uploadImageVo);
+
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/QuoteRuleConfigService.java

@@ -1,7 +1,7 @@
 package com.jzg.quotation.summary.service;
 
-import com.jzg.quotation.summary.entity.po.QuoteRuleConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.quotation.summary.entity.po.QuoteRuleConfig;
 
 /**
 * @author Administrator

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/QuoteRuleMappingService.java

@@ -1,7 +1,8 @@
 package com.jzg.quotation.summary.service;
 
-import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.quotation.commons.entity.vo.aggregated.UploadImageVo;
+import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 
 import java.util.List;
 import java.util.Map;
@@ -20,5 +21,4 @@ public interface QuoteRuleMappingService extends IService<QuoteRuleMapping> {
      */
     Map<String, List<QuoteRuleMapping>> getByInsuranceCompanyCode(String insuranceCompanyCode);
 
-
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsuranceCompanyRequestServiceImpl.java

@@ -5,9 +5,8 @@ import com.jzg.quotation.commons.constant.enums.base.ApiType;
 import com.jzg.quotation.commons.constant.enums.base.QuoteRuleCategory;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.UploadImageVo;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
-import com.jzg.quotation.commons.entity.vo.quote.KindInfoVo;
 import com.jzg.quotation.commons.service.QuotationApiBaseService;
 import com.jzg.quotation.commons.service.QuotationBaseService;
 import com.jzg.quotation.commons.service.QuotationCrawlerBaseService;
@@ -67,4 +66,10 @@ public class InsuranceCompanyRequestServiceImpl implements InsuranceCompanyReque
         return getQuotationBase(order.getApiType(), insuranceCode).quote(quoteVo);
     }
 
+    @Override
+    public void uploadImage(UploadImageVo uploadImageVo) {
+
+    }
+
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/QuoteRuleMappingServiceImpl.java

@@ -3,8 +3,8 @@ package com.jzg.quotation.summary.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
-import com.jzg.quotation.summary.service.QuoteRuleMappingService;
 import com.jzg.quotation.summary.mapper.QuoteRuleMappingMapper;
+import com.jzg.quotation.summary.service.QuoteRuleMappingService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/entity/request/QuotedPriceRequest.java

@@ -117,7 +117,7 @@ public class QuotedPriceRequest extends BaseRequest {
             this.customer = new CustomerDTO().getCustomers(ownerInfo, policyHolderInfo, insuredPersonInfo);
             // 驾意险
             if (accidentalDrivingVo != null) {
-                this.accident = Collections.singletonList(new AccidentDTO(accidentalDrivingVo.getRideRiskCode(),
+                this.accident = Collections.singletonList(new AccidentDTO(accidentalDrivingVo.getProductCode(),
                         accidentalDrivingVo.getQuantity(),"",""));
             }
 

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/build/ZiJinQuoteResultsVoBuild.java → tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/build/ZiJinAPIQuoteResultsVoBuild.java

@@ -1,14 +1,11 @@
 package com.jzg.quotation.zijin.api.build;
 
 import com.jzg.quotation.commons.constant.enums.quote.KindCode;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.quote.ExpenseFactor;
 import com.jzg.quotation.commons.entity.vo.quote.KindInfoVo;
 import com.jzg.quotation.commons.entity.vo.quote.RiskInfoVo;
-import com.google.common.collect.Lists;
-
-
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.zijin.api.constant.enums.RiskCodeEnum;
 import com.jzg.quotation.zijin.api.entity.response.CalculatePremiumResponse;
 
@@ -17,13 +14,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class ZiJinQuoteResultsVoBuild {
 
-    public ZiJinQuoteResultsVoBuild() {
+/**
+ * @version
+ * @description: 紫金财险【API】 构造报价返回参数
+ * @author: wenks
+ * @date: 2025/2/25 18:10
+ **/
+public class ZiJinAPIQuoteResultsVoBuild {
+
+    public ZiJinAPIQuoteResultsVoBuild() {
         throw new IllegalStateException("Utility class");
     }
 
-
     public static QuoteResultsVo buildQuoteResultsVo(String orderNo, QuoteVo quoteVo, CalculatePremiumResponse calculatePremiumResponse) {
         QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
         quoteResultsVo.setOrdersNo(orderNo);

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/component/ZiJinApiRequestComponent.java

@@ -4,6 +4,8 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.zijin.api.constant.enums.RequestUrl;
 import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
+import com.jzg.quotation.zijin.api.entity.request.*;
+import com.jzg.quotation.zijin.api.entity.response.*;
 import com.jzg.quotation.zijin.api.properties.ZiJinApiProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,8 +16,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
-import com.jzg.quotation.zijin.api.entity.request.*;
-import com.jzg.quotation.zijin.api.entity.response.*;
 
 import java.time.Duration;
 import java.util.HashMap;

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/constant/enums/RequestUrl.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.zijin.api.constant.enums;
 
 import com.jzg.quotation.commons.standard.CrawlerRequestUrlStandard;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 /**
  * @description: 紫金财险 请求接口

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/entity/request/CalculatePremiumRequest.java

@@ -21,7 +21,6 @@ import org.springframework.util.StringUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/entity/request/ModelQueryRequest.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.zijin.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
 import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/entity/request/QueryActualValueRequest.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.zijin.api.entity.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
-import com.jzg.quotation.zijin.api.entity.response.ModelQueryResponse;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/repository/ZiJinApiOrderRepository.java

@@ -2,8 +2,9 @@ package com.jzg.quotation.zijin.api.repository;
 
 import com.jzg.quotation.zijin.api.entity.po.ZiJinApiOrder;
 import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface ZiJinApiOrderRepository extends MongoRepository<ZiJinApiOrder, String> {
 
 }

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

@@ -7,7 +7,7 @@ import com.jzg.quotation.commons.entity.vo.quote.AttributionInformationVo;
 import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
-import com.jzg.quotation.zijin.api.build.ZiJinQuoteResultsVoBuild;
+import com.jzg.quotation.zijin.api.build.ZiJinAPIQuoteResultsVoBuild;
 import com.jzg.quotation.zijin.api.component.ZiJinApiRequestComponent;
 import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
 import com.jzg.quotation.zijin.api.entity.po.ZiJinApiOrder;
@@ -69,7 +69,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
         ziJinApiOrder.setOrderId(modelQueryResponse.getOrderId());
         ziJinApiOrderRepository.save(ziJinApiOrder);
 
-        return ZiJinQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, calculatePremiumResponse);
+        return ZiJinAPIQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, calculatePremiumResponse);
     }
 
     @Override