修改报价和影像问题

src/main/java/com/ydtech/modules/order/components/zj/ZijinDuplicateInsuranceComponents.java

@@ -5,6 +5,7 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.entity.api.zj.constants.enums.CalculateFlagEnum;
 import com.ydtech.modules.order.entity.api.zj.constants.enums.ResultEnum;
 import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
+import com.ydtech.modules.order.entity.api.zj.request.ModelQueryRequest;
 import com.ydtech.modules.order.entity.api.zj.response.CalculatePremiumResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
@@ -70,7 +71,7 @@ public class ZijinDuplicateInsuranceComponents {
      * @param httpHeaders              请求头
      * @return CalculatePremiumResponse
      */
-    public CalculatePremiumResponse duplicate(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders) {
+    public CalculatePremiumResponse duplicate(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest) {
         if (ResultEnum.R_4001.getCode().equals(calculatePremiumResponse.getRtnCode())) {
             String rtnMsg = calculatePremiumResponse.getRtnMsg();
             CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
@@ -100,7 +101,7 @@ public class ZijinDuplicateInsuranceComponents {
                 throw new SystemException(rtnMsg);
             }
 
-            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders);
+            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders,  modelQueryRequest);
         }
         return calculatePremiumResponse;
     }

src/main/java/com/ydtech/modules/order/components/zj/ZijinReinsuranceComponents.java

@@ -4,6 +4,7 @@ package com.ydtech.modules.order.components.zj;
 import com.ydtech.modules.order.components.VerificationCodeIdentification;
 import com.ydtech.modules.order.entity.api.zj.constants.enums.ResultEnum;
 import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
+import com.ydtech.modules.order.entity.api.zj.request.ModelQueryRequest;
 import com.ydtech.modules.order.entity.api.zj.response.CalculatePremiumResponse;
 import com.ydtech.modules.order.entity.crawler.request.RecognitionRequest;
 import com.ydtech.modules.order.entity.crawler.response.RecognitionResponse;
@@ -40,7 +41,7 @@ public class ZijinReinsuranceComponents {
      * @param httpHeaders              请求头
      * @return CalculatePremiumResponse
      */
-    public CalculatePremiumResponse reinsurance(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders) {
+    public CalculatePremiumResponse reinsurance(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest) {
         if (ResultEnum.R_9980.getCode().equals(calculatePremiumResponse.getRtnCode())) {
             CalculatePremiumResponse.BasePartDTO basePart = calculatePremiumResponse.getBasePart();
             RecognitionRequest recognitionRequest = new RecognitionRequest();
@@ -61,7 +62,7 @@ public class ZijinReinsuranceComponents {
             baseInfo.setAnswerCI(recognition.getData().getJqImageCode());
             baseInfo.setAnswer(recognition.getData().getSyImageCode());
 
-            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders);
+            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest);
         }
         return calculatePremiumResponse;
     }

src/main/java/com/ydtech/modules/order/components/zj/ZijinRequestApiComponents.java

@@ -54,7 +54,14 @@ public class ZijinRequestApiComponents {
 
     private static final String USER_ID = "28317480921155536850";
 
+    @Autowired
+    private  ZijinDuplicateInsuranceComponents zijinDuplicateInsuranceComponents;
 
+    @Autowired
+    private  ZijinReinsuranceComponents zijinReinsuranceComponents;
+
+    @Autowired
+    private  ZijinVehicleTypeErrorComponents zijinVehicleTypeErrorComponents;
 
     public ZijinRequestApiComponents(InsCrawlerOrderComponents insCrawlerOrderComponents, ZjApiConfigurationProperties zjApiConfigurationProperties, ConfigureParametersComponents configureParametersComponents, StringRedisTemplate redisTemplate, RedissonClient redissonClient) {
         this.insCrawlerOrderComponents = insCrawlerOrderComponents;
@@ -227,8 +234,17 @@ public class ZijinRequestApiComponents {
      * @param calculatePremiumRequest 紫金财险 保费计算 入参实体
      * @return 出参实体
      */
-    public CalculatePremiumResponse calculatePremium(CalculatePremiumRequest calculatePremiumRequest, HttpHeaders httpHeaders) {
-        return request(RequestUrl.CALCULATE_PREMIUM, calculatePremiumRequest, CalculatePremiumResponse.class, httpHeaders);
+    public CalculatePremiumResponse calculatePremium(CalculatePremiumRequest calculatePremiumRequest, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest) {
+        CalculatePremiumResponse calculatePremiumResponse = request(RequestUrl.CALCULATE_PREMIUM, calculatePremiumRequest, CalculatePremiumResponse.class, httpHeaders);
+
+        // 5. 重复投保
+        calculatePremiumResponse = zijinDuplicateInsuranceComponents.duplicate(calculatePremiumRequest, calculatePremiumResponse, httpHeaders, modelQueryRequest);
+        // 6. 转保标志
+        calculatePremiumResponse = zijinReinsuranceComponents.reinsurance(calculatePremiumRequest, calculatePremiumResponse, httpHeaders, modelQueryRequest);
+        // 7. 车型不一致
+        calculatePremiumResponse = zijinVehicleTypeErrorComponents.modification(calculatePremiumRequest, calculatePremiumResponse, httpHeaders,  modelQueryRequest);
+
+        return calculatePremiumResponse;
     }
 
     /**

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

@@ -70,7 +70,7 @@ public class ZijinVehicleTypeErrorComponents {
                     .collect(Collectors.toList()).get(0);
 
             calculatePremiumRequest.modificationOfVehicleType(vehicleModelInfosDTO);
-            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders);
+            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders,  modelQueryRequest);
         }
         return calculatePremiumResponse;
     }

src/main/java/com/ydtech/modules/order/entity/api/zj/constants/enums/FileTypeEnum.java

@@ -23,11 +23,11 @@ public enum FileTypeEnum {
     FT_9("9", "其他", new String[]{}),
     FT_19("19", "实名缴费证明", new String[]{}),
     FT_51("51", "银行卡", new String[]{}),
-    FT_52("52", "驾驶证", new String[]{"C01", "D01"}),
+    FT_52("52", "驾驶证", new String[]{}),
     FT_53("53", "身份证", new String[]{"C02", "D02", "C03", "D03", "C04", "D04"}),
     FT_54("54", "增值税发票", new String[]{}),
     FT_55("55", "车辆合格证", new String[]{}),
-    FT_56("56", "行驶证", new String[]{}),
+    FT_56("56", "行驶证", new String[]{"C01", "D01"}),
     FT_41("41", "充电桩影像资料", new String[]{}),
     FT_42("42", "是否为新能源证明材料", new String[]{});
 

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

@@ -68,22 +68,15 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
     private final ConfigureParametersComponents configureParametersComponents;
 
-    private final ZijinDuplicateInsuranceComponents zijinDuplicateInsuranceComponents;
 
-    private final ZijinReinsuranceComponents zijinReinsuranceComponents;
 
-    private final ZijinVehicleTypeErrorComponents zijinVehicleTypeErrorComponents;
-
-    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents, InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsTaskImagesService insTaskImagesService, PtlAgreementAttributionService ptlAgreementAttributionService, ConfigureParametersComponents configureParametersComponents, ZijinDuplicateInsuranceComponents zijinDuplicateInsuranceComponents, ZijinReinsuranceComponents zijinReinsuranceComponents, ZijinVehicleTypeErrorComponents zijinVehicleTypeErrorComponents) {
+    public ZijinOrderApiServiceImpl(ZijinRequestApiComponents zijinRequestApiComponents, InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsTaskImagesService insTaskImagesService, PtlAgreementAttributionService ptlAgreementAttributionService, ConfigureParametersComponents configureParametersComponents) {
         this.zijinRequestApiComponents = zijinRequestApiComponents;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insTaskImagesService = insTaskImagesService;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.configureParametersComponents = configureParametersComponents;
-        this.zijinDuplicateInsuranceComponents = zijinDuplicateInsuranceComponents;
-        this.zijinReinsuranceComponents = zijinReinsuranceComponents;
-        this.zijinVehicleTypeErrorComponents = zijinVehicleTypeErrorComponents;
     }
 
 
@@ -134,15 +127,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 4. 报价
         CalculatePremiumRequest calculatePremiumRequest
                 = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters, modelQueryResponse);
-
-        CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders);
-
-        // 5. 重复投保
-        calculatePremiumResponse = zijinDuplicateInsuranceComponents.duplicate(calculatePremiumRequest, calculatePremiumResponse, httpHeaders);
-        // 6. 转保标志
-        calculatePremiumResponse = zijinReinsuranceComponents.reinsurance(calculatePremiumRequest, calculatePremiumResponse, httpHeaders);
-        // 7. 车型不一致
-        calculatePremiumResponse = zijinVehicleTypeErrorComponents.modification(calculatePremiumRequest, calculatePremiumResponse, httpHeaders,  modelQueryRequest );
+        CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest);
 
         QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo, quoteVo.getAccidentalDrivingVo());
         return responseOrder(calculatePremiumResponse, quoteRespVo, ptlAgreementAttribution, modelQueryResponse.getOrderId(), modelQueryResponse.getOrderNo());
@@ -423,6 +408,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         quoteRespVo.setCiSumPermium(CalculateUtils.add(jqPremium, sumPayTax));//交强险和车船税合计
         quoteRespVo.setSumPermium(CalculateUtils.add(jqPremium, syPremium, sumPayTax, jyPremium));//保费合计
         quoteRespVo.setTotalAdjustRate(0);
+//        quoteRespVo.setILogPreUdwMess("");//评分
         quoteRespVo.setOrderno(yaQuoteInfoVo.getOrderNo()); //订单号
         return quoteRespVo;
     }