修改实体转换

tenant/insurance/pom.xml

@@ -13,8 +13,8 @@
 
     <modules>
         <module>quotation-commons</module>
-        <module>quotation-dajia</module>
         <module>quotation-summary</module>
+        <module>quotation-dajia</module>
         <module>quotation-zhongmei</module>
         <module>quotation-zijin</module>
     </modules>

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

@@ -34,6 +34,10 @@ public class KindInfoVo implements Serializable {
      * 每座保额
      */
     private BigDecimal unitAmount;
+    /**
+     * 座位数
+     */
+    private String quantity;
     /**
      * 保费
      */

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/standard/QuoteResultsConverter.java

@@ -1,65 +0,0 @@
-package com.jzg.quotation.commons.standard;
-
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
-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 java.util.List;
-
-/**
- * @description: 结果转换抽象类
- * @author: wenks
- * @date: 2025/2/18 19:12
- **/
-public abstract class QuoteResultsConverter<Response> {
-
-    /**
-     * 转换数据类 保险公司转换实体
-     *
-     * @return 保费计算 返回结果
-     */
-    public QuoteResultsVo toQuoteResultsVo(Response insuranceQuoteResults) {
-        // 交强险
-        RiskInfoVo ciRiskInfoVo = toCiRiskInfoVo(insuranceQuoteResults);
-        // 商业险
-        RiskInfoVo biRiskInfoVo = toBiRiskInfoVo(insuranceQuoteResults);
-        // 商业险险种
-        List<KindInfoVo> kindInfoVo = toKindInfoVoList(insuranceQuoteResults);
-        // 费用因子
-        List<ExpenseFactor> expenseFactors = toExpenseFactorList(insuranceQuoteResults);
-        return new QuoteResultsVo("", ciRiskInfoVo, biRiskInfoVo, kindInfoVo, expenseFactors);
-    }
-
-    /**
-     * 交强险
-     *
-     * @param insuranceQuoteResults 保险公司转换实体
-     * @return 交强险信息
-     */
-    protected abstract RiskInfoVo toCiRiskInfoVo(Response insuranceQuoteResults);
-
-    /**
-     * 商业险
-     *
-     * @param insuranceQuoteResults 保险公司转换实体
-     * @return 商业险信息
-     */
-    protected abstract RiskInfoVo toBiRiskInfoVo(Response insuranceQuoteResults);
-
-    /**
-     * 商业险险种
-     *
-     * @param insuranceQuoteResults 保险公司转换实体
-     * @return 商业险险种信息
-     */
-    protected abstract List<KindInfoVo> toKindInfoVoList(Response insuranceQuoteResults);
-
-    /**
-     * 费用因子
-     *
-     * @param insuranceQuoteResults 保险公司转换实体
-     * @return 费用因子信息
-     */
-    protected abstract List<ExpenseFactor> toExpenseFactorList(Response insuranceQuoteResults);
-}

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

@@ -26,41 +26,40 @@ import java.util.List;
 @RequiredArgsConstructor
 public class DaJiaCrawlerRequestImpl implements DaJiaCrawlerRequest {
 
-    private final DaJiaCrawlerRequestComponent DaJiaCrawlerRequestComponent;
+    private final DaJiaCrawlerRequestComponent daJiaCrawlerRequestComponent;
 
     @Override
     public void login(LoginBase loginBase) {
-        DaJiaCrawlerRequestComponent.authenticate(loginBase.getUsername(), loginBase.getUsername(), DaJiaCrawlerRequestComponent.LOGINS_NUMBER);
+        daJiaCrawlerRequestComponent.authenticate(loginBase.getUsername(), loginBase.getUsername(), DaJiaCrawlerRequestComponent.LOGINS_NUMBER);
     }
 
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) {
         // 获取token的请求头
         AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
-        HttpHeaders headers = DaJiaCrawlerRequestComponent.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+        HttpHeaders headers = daJiaCrawlerRequestComponent.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         // 配置信息
         DaJiaCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(DaJiaCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
 
         // 车型查询
         DaJiaCrawlerCarRequest daJiaCrawlerCarRequest = DaJiaQuotationProcessConstruction.daJiaCrawlerCarRequestBuilder(quoteVo.getCarInfoVo());
-        List<DaJiaCrawlerCarResponse.ListDTO> car = DaJiaCrawlerRequestComponent.car(daJiaCrawlerCarRequest, headers);
+        List<DaJiaCrawlerCarResponse.ListDTO> car = daJiaCrawlerRequestComponent.car(daJiaCrawlerCarRequest, headers);
         // 获取相同的车型
         DaJiaCrawlerCarResponse.ListDTO listDTO = car.get(0);
 
         // 计算折旧价格
         DaJiaCrawlerActualValueRequest daJiaCrawlerActualValueRequest = new DaJiaCrawlerActualValueRequest();
-        String actualValue = DaJiaCrawlerRequestComponent.actualValue(daJiaCrawlerActualValueRequest, headers);
+        String actualValue = daJiaCrawlerRequestComponent.actualValue(daJiaCrawlerActualValueRequest, headers);
 
         // 保费计算
         DaJiaCrawlerPriceRequest daJiaCrawlerPriceRequest = new DaJiaCrawlerPriceRequest();
-        DaJiaCrawlerPriceResponse crawlerPriceResponse = DaJiaCrawlerRequestComponent.price(daJiaCrawlerPriceRequest, headers);
+        DaJiaCrawlerPriceResponse crawlerPriceResponse = daJiaCrawlerRequestComponent.price(daJiaCrawlerPriceRequest, headers);
 
         // 订单保存
         DaJiaCrawlerSaveRequest daJiaCrawlerSaveRequest = new DaJiaCrawlerSaveRequest(crawlerPriceResponse, "");
-        DaJiaCrawlerSaveResponse daJiaCrawlerSaveResponse = DaJiaCrawlerRequestComponent.save(daJiaCrawlerSaveRequest, headers);
-
+        DaJiaCrawlerSaveResponse daJiaCrawlerSaveResponse = daJiaCrawlerRequestComponent.save(daJiaCrawlerSaveRequest, headers);
         // 返回报价信息
-        return new DaJiaCrawlerQuoteResultsConverter().toQuoteResultsVo(crawlerPriceResponse);
+        return null;
     }
 
     @Override

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

@@ -42,13 +42,18 @@ public class InsuranceCompanyRequestServiceImpl implements InsuranceCompanyReque
         return input.matches(regex) ? input : input.replaceAll("(?i).*?([A-Z]+).*", "$1");
     }
 
-    private QuotationBaseService getQuotationBase(int apiType, String insuranceCode) {
-        if(ApiType.API_1.getCode() == apiType){
+    /**
+     * @param apiType       请求类型
+     * @param insuranceCode 保险公司编码
+     * @return 报价请求基类
+     */
+    public QuotationBaseService getQuotationBase(int apiType, String insuranceCode) {
+        if (ApiType.API_1.getCode() == apiType) {
             return quoteApiBaseServiceMap.get(insuranceCode);
         } else if (ApiType.API_2.getCode() == apiType) {
             return quotationCrawlerBaseServiceMap.get(insuranceCode);
         }
-        throw new SystemException("");
+        throw new SystemException("报价类型出错，请联系管理员处理。");
     }
 
     @Override

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

@@ -0,0 +1,24 @@
+package com.jzg.quotation.zijin.api.constant.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @version
+ * @description: 关联单标识
+ * @author: wenks
+ * @date: 2023/9/20 9:19
+ **/
+
+@Getter
+@AllArgsConstructor
+public enum CalculateFlagEnum {
+
+    CF_0("0", "关联单"),
+    CF_1("1", "单商业"),
+    CF_2("2", "单交强");
+
+    private final String code;
+
+    private final String desc;
+}

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/converter/ZiJinQuotationConstruction.java

@@ -1,41 +0,0 @@
-package com.jzg.quotation.zijin.api.converter;
-
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
-import com.jzg.quotation.zijin.api.entity.request.CalculatePremiumRequest;
-
-import java.util.ArrayList;
-
-
-/**
- * @version
- * @description: 紫金财险 报价实体转换类
- * @author: wenks
- * @date: 2025/2/24 8:40
- **/
-public class ZiJinQuotationConstruction {
-
-    public static CalculatePremiumRequest buildCalculatePremiumRequest(String orderId, String orderNo, ZiJinApiConfigureParameters parameters, QuoteVo quoteVo) {
-        CalculatePremiumRequest calculatePremiumRequest = new CalculatePremiumRequest();
-        calculatePremiumRequest.setOrderId(orderId);
-        calculatePremiumRequest.setOrderNo(orderNo);
-        calculatePremiumRequest.setOrderOrigin(parameters.getAppKey());
-        calculatePremiumRequest.setProposalAreaCode(parameters.getProposalAreaCode());
-        calculatePremiumRequest.setProposalCityCode(parameters.getProposalCityCode());
-
-        calculatePremiumRequest.setBaseInfo(new CalculatePremiumRequest.BaseInfoDTO());
-        calculatePremiumRequest.setCarOwnerInfo(new CalculatePremiumRequest.CarOwnerInfoDTO());
-        calculatePremiumRequest.setInsuredList(new ArrayList<>());
-        calculatePremiumRequest.setItemKindList(new ArrayList<>());
-        calculatePremiumRequest.setProfitDataList(new ArrayList<>());
-        calculatePremiumRequest.setCarPolicySubInfoList(new ArrayList<>());
-        calculatePremiumRequest.setTaxRelifInfo(new CalculatePremiumRequest.TaxRelifInfoDTO());
-        calculatePremiumRequest.setVehicleInfo(new CalculatePremiumRequest.VehicleInfoDTO());
-
-        calculatePremiumRequest.setDemandNoCheckFlag("1");
-        return calculatePremiumRequest;
-    }
-
-
-
-}

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/converter/ZiJinQuotationProcessConstruction.java

@@ -1,42 +0,0 @@
-package com.jzg.quotation.zijin.api.converter;
-
-import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
-import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
-import com.jzg.quotation.zijin.api.entity.request.ModelQueryRequest;
-import com.jzg.quotation.zijin.api.entity.request.QueryActualValueRequest;
-import com.jzg.quotation.zijin.api.entity.response.ModelQueryResponse;
-
-public class ZiJinQuotationProcessConstruction {
-
-    /**
-     * 构造车型查询实体
-     *
-     * @param parameters 紫金财险配置参数
-     * @param vinNo      车架号
-     * @param brandName  品牌型号
-     * @return 车型查询实体
-     */
-    public static ModelQueryRequest buildModelQueryRequest(ZiJinApiConfigureParameters parameters, String vinNo, String brandName) {
-        ModelQueryRequest modelQueryRequest = new ModelQueryRequest();
-        modelQueryRequest.setOrderOrigin(parameters.getAppKey());
-        modelQueryRequest.setProposalCityCode(parameters.getProposalCityCode());
-        modelQueryRequest.setProposalAreaCode(parameters.getProposalAreaCode());
-        modelQueryRequest.setVinNo(vinNo);
-        modelQueryRequest.setBrandName(brandName);
-        return modelQueryRequest;
-    }
-
-    public static QueryActualValueRequest buildQueryActualValueRequest(CarInfoVo carInfoVo, ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO, String startDate) {
-        QueryActualValueRequest queryActualValueRequest = new QueryActualValueRequest();
-        queryActualValueRequest.setCarKindCode(carInfoVo.getCarKindCode());
-        // queryActualValueRequest.setCertificateDate("");
-        queryActualValueRequest.setEnrollDate(carInfoVo.getRegisterDate());
-        queryActualValueRequest.setPurchasePrice(vehicleModelInfosDTO.getPurchasePrice());
-        queryActualValueRequest.setSeatCount(carInfoVo.getSeatCount());
-        queryActualValueRequest.setStartDate(startDate);
-        queryActualValueRequest.setTonCount(carInfoVo.getTonCount());
-        queryActualValueRequest.setUseNatureCode(carInfoVo.getCarNatureCode());
-        return queryActualValueRequest;
-    }
-
-}

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

@@ -7,10 +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.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.zijin.api.component.ZiJinApiRequestComponent;
-import com.jzg.quotation.zijin.api.converter.ZiJinQuotationProcessConstruction;
-import com.jzg.quotation.zijin.api.converter.ZiJinQuotationConstruction;
 import com.jzg.quotation.zijin.api.entity.ZiJinApiConfigureParameters;
-import com.jzg.quotation.zijin.api.entity.request.CalculatePremiumRequest;
 import com.jzg.quotation.zijin.api.entity.request.ModelQueryRequest;
 import com.jzg.quotation.zijin.api.entity.request.QueryActualValueRequest;
 import com.jzg.quotation.zijin.api.entity.response.ModelQueryResponse;
@@ -40,14 +37,13 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
         HttpHeaders httpHeaders = ziJinApiRequestComponent.getHttpHeaders(parameters);
         // 车型查询
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
-        ModelQueryRequest modelQueryRequest = ZiJinQuotationProcessConstruction.buildModelQueryRequest(parameters, carInfoVo.getVinNo(), carInfoVo.getBrandName());
-        ModelQueryResponse modelQueryResponse = ziJinApiRequestComponent.modelQuery(modelQueryRequest, httpHeaders);
-        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO = modelQueryResponse.getVehicleModelInfos().get(0);
+//        ModelQueryRequest modelQueryRequest = ZiJinQuotationProcessConstruction.buildModelQueryRequest(parameters, carInfoVo.getVinNo(), carInfoVo.getBrandName());
+//        ModelQueryResponse modelQueryResponse = ziJinApiRequestComponent.modelQuery(modelQueryRequest, httpHeaders);
+//        ModelQueryResponse.VehicleModelInfosDTO vehicleModelInfosDTO = modelQueryResponse.getVehicleModelInfos().get(0);
         // 计算车辆价格
-        QueryActualValueRequest queryActualValueRequest = ZiJinQuotationProcessConstruction.buildQueryActualValueRequest(carInfoVo, vehicleModelInfosDTO, "");
-        QueryActualValueResponse queryActualValueResponse = ziJinApiRequestComponent.queryActualValue(queryActualValueRequest, httpHeaders);
+//        QueryActualValueRequest queryActualValueRequest = ZiJinQuotationProcessConstruction.buildQueryActualValueRequest(carInfoVo, vehicleModelInfosDTO, "");
+//        QueryActualValueResponse queryActualValueResponse = ziJinApiRequestComponent.queryActualValue(queryActualValueRequest, httpHeaders);
         // 报价
-        CalculatePremiumRequest calculatePremiumRequest = ZiJinQuotationConstruction.buildCalculatePremiumRequest(modelQueryResponse.getOrderId(), modelQueryResponse.getOrderNo(), parameters, quoteVo);
 
         return null;
     }