1.紫金代码修改

2.国任代码修改

src/main/java/com/ydtech/config/properties/GuorenApiConfigurationProperties.java

@@ -15,5 +15,18 @@ public class GuorenApiConfigurationProperties {
 
     private String redirectUrl;
 
-
+    // 保单
+    private String policyUrl;
+    // 标志
+    private String policyFlagUrl;
+    // 服务代码
+    private String serveCode;
+    // 渠道编码
+    private String channelCode;
+    // 访问账号
+    private String interfaceUserCode;
+    // 访问口令
+    private String interfacePwd;
+    // 环境类型 测试环境填”Y”;生产环境填”N”
+    private String iftest;
 }

src/main/java/com/ydtech/constants/enums/InsurKindGuoRen.java

@@ -28,7 +28,6 @@ public enum InsurKindGuoRen {
     SY_FJ_YBW3("20Y1", "附加医保外医疗费用责任险-驾驶员","55"," 2  0"),
     SY_FJ_YBW2("20Y2", "附加医保外医疗费用责任险-乘客","56"," 2  0"),
 
-
     ;
 
     public static InsurKindGuoRen matchKey(String key) {
@@ -43,16 +42,12 @@ public enum InsurKindGuoRen {
     }
 
 
-    @Getter
-    private String code;
+    private final String code;
 
-    @Getter
-    private String desc;
-    @Getter
-    private String itemKindNo;
+    private final String desc;
 
-    @Getter
-    private String flag;
+    private final String itemKindNo;
 
+    private final String flag;
 
 }

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

@@ -33,21 +33,27 @@ public class CarPriceResp {
         @JsonProperty(value = "basepureriskpremium")
         @JSONField(name = "basepureriskpremium")
         private String basepureriskpremium;
+
         @JsonProperty(value = "modelCode")
         @JSONField(name = "modelCode")
         private String modelCode;
+
         @JsonProperty(value = "inputvo")
         @JSONField(name = "inputvo")
         private String inputvo;
+
         @JsonProperty(value = "actualValue")
         @JSONField(name = "actualValue")
         private Double actualValue;
+
         @JsonProperty(value = "noticeType")
         @JSONField(name = "noticeType")
         private String noticeType;
+
         @JsonProperty(value = "derailleurType")
         @JSONField(name = "derailleurType")
         private String derailleurType;
+
         @JsonProperty(value = "carCountryNature")
         @JSONField(name = "carCountryNature")
         private String carCountryNature;

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.ins.model.guoren;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.config.properties.GuorenApiConfigurationProperties;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,48 +11,39 @@ import java.util.Date;
 @Data
 public class RequestDto {
 
-    //    @JsonProperty("PACKAGE")
     @JsonProperty(value = "PACKAGE")
     @JSONField(name = "PACKAGE")
     private RequestPackage rPackage;
 
-    public static RequestDto builRequestDto(Object body, String apiCode) {
+    public static RequestDto builRequestDto(Object body, String apiCode, GuorenApiConfigurationProperties properties) {
         RequestDto dto = new RequestDto();
         RequestDto.RequestHead rHead = new RequestDto.RequestHead();
-        //=========
-        //===生产
-        //==========
-        rHead.setServeCode("GR0002");
-        rHead.setChannelCode("TQDL");
+        rHead.setServeCode(properties.getServeCode());
+        rHead.setChannelCode(properties.getChannelCode());
         rHead.setInterfaceCode(apiCode);
-        rHead.setInterfaceUserCode("TQDL");
-        rHead.setInterfacePwd("$2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te");
+        rHead.setInterfaceUserCode(properties.getInterfaceUserCode());
+        rHead.setInterfacePwd(properties.getInterfacePwd());
         rHead.setBusinessUuid("");
         rHead.setRequestTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss:ssss"));
-//        rHead.setRequestTime("2018-08-17 12:12:12:0005");
         rHead.setXmlListSuffix("");
         //测试环境填”Y”;生产环境填”N”
-        rHead.setIftest("N");
-
+        rHead.setIftest(properties.getIftest());
         RequestDto.RequestPackage rpackage = new RequestDto.RequestPackage();
         rpackage.setRHead(rHead);
-
         //请求参数
         rpackage.setRBody(body);
         dto.setRPackage(rpackage);
-
         return dto;
 
     }
 
     @Data
     public static class RequestPackage {
-        //        @JsonProperty("HEAD")
+
         @JsonProperty(value = "HEAD")
         @JSONField(name = "HEAD")
         private RequestHead rHead;
 
-        //        @JsonProperty("BODY")
         @JsonProperty(value = "BODY")
         @JSONField(name = "BODY")
         private Object rBody;

src/main/java/com/ydtech/modules/order/components/gouren/GuorenRequestApiComponent.java

@@ -64,7 +64,7 @@ public class GuorenRequestApiComponent {
     }
 
     private ResponseDto<JSONObject> post(Object o, PlatformInterfaceCode platformInterfaceCode) {
-        RequestDto requestBody = RequestDto.builRequestDto(o, platformInterfaceCode.getCode());
+        RequestDto requestBody = RequestDto.builRequestDto(o, platformInterfaceCode.getCode(), guorenApiConfigurationProperties);
         ResponseDto<JSONObject> post = post(InsuranceEnum.XDCX.getPinyin(), platformInterfaceCode.getDesc(), requestBody);
         Response.verification(Response.API_T0000000, post);
         return post;
@@ -81,6 +81,4 @@ public class GuorenRequestApiComponent {
     }
 
 
-
-
 }

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

@@ -32,7 +32,8 @@ public abstract class ResponseMessageAbstractHandler {
             HttpHeaders httpHeaders,
             ModelQueryRequest modelQueryRequest,
             String message,
-            QueryActualValueRequest queryActualValueRequest
+            QueryActualValueRequest queryActualValueRequest,
+            boolean retry
     );
 
 

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

@@ -90,7 +90,13 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
 
 
     @Override
-    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message, QueryActualValueRequest queryActualValueRequest) {
+    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest,
+                                                   CalculatePremiumResponse calculatePremiumResponse,
+                                                   HttpHeaders httpHeaders,
+                                                   ModelQueryRequest modelQueryRequest,
+                                                   String message,
+                                                   QueryActualValueRequest queryActualValueRequest,
+                                                   boolean retry) {
         InsuranceLog.infoLog(InsuranceEnum.ZKIC.getPinyin(), "\n\t---------> {}\n\t---------> {}", "紫金财险重复投保处理", calculatePremiumResponse.getRtnMsg());
         String rtnMsg = calculatePremiumResponse.getRtnMsg();
         CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
@@ -122,7 +128,7 @@ public class ZijinDuplicateInsuranceComponents extends ResponseMessageAbstractHa
 
         baseInfo.setTrafficTime(jqEndDate);
         baseInfo.setBusinessTime(syEndDate);
-        calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest);
+        calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
         return calculatePremiumResponse;
     }
 

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

@@ -45,7 +45,13 @@ public class ZijinReinsuranceComponents extends ResponseMessageAbstractHandler {
      * @return CalculatePremiumResponse
      */
     @Override
-    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message, QueryActualValueRequest queryActualValueRequest) {
+    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest,
+                                                   CalculatePremiumResponse calculatePremiumResponse,
+                                                   HttpHeaders httpHeaders,
+                                                   ModelQueryRequest modelQueryRequest,
+                                                   String message,
+                                                   QueryActualValueRequest queryActualValueRequest,
+                                                   boolean retry) {
         InsuranceLog.infoLog(InsuranceEnum.ZKIC.getPinyin(), "\n\t---------> {}\n\t---------> {}", "紫金财险转保处理", calculatePremiumResponse.getRtnMsg());
         CalculatePremiumResponse.BasePartDTO basePart = calculatePremiumResponse.getBasePart();
         RecognitionRequest recognitionRequest = new RecognitionRequest();
@@ -65,7 +71,6 @@ public class ZijinReinsuranceComponents extends ResponseMessageAbstractHandler {
         RecognitionResponse recognition = verificationCodeIdentification.recognition(recognitionRequest);
         baseInfo.setAnswerCI(recognition.getData().getJqImageCode());
         baseInfo.setAnswer(recognition.getData().getSyImageCode());
-
-        return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest);
+        return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
     }
 }

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

@@ -236,20 +236,24 @@ public class ZijinRequestApiComponents {
      * @param message                 传输信息
      * @return 出参实体
      */
-    public CalculatePremiumResponse calculatePremium(CalculatePremiumRequest calculatePremiumRequest, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message,QueryActualValueRequest queryActualValueRequest ) {
+    public CalculatePremiumResponse calculatePremium(CalculatePremiumRequest calculatePremiumRequest, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message,QueryActualValueRequest queryActualValueRequest, boolean retry ) {
         CalculatePremiumResponse calculatePremiumResponse = requestQuotation(RequestUrl.CALCULATE_PREMIUM, calculatePremiumRequest, CalculatePremiumResponse.class, httpHeaders);
         // 清空转保业务码
         CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
-        baseInfo.setAnswerCI(null);
-        baseInfo.setAnswer(null);
-        baseInfo.setDemandNoCI(null);
-        baseInfo.setDemandNo(null);
+
+        if(!calculatePremiumResponse.getRtnCode().equals(ResultEnum.C_999)){
+            baseInfo.setAnswerCI(null);
+            baseInfo.setAnswer(null);
+            baseInfo.setDemandNoCI(null);
+            baseInfo.setDemandNo(null);
+        }
 
         // 通过状态码获取处理器处理
         ResponseMessageAbstractHandler responseMessageAbstractHandler = handlerMap.get(ResponseMessageAbstractHandler.CALCULATE_PREMIUM_COMPONENTS + calculatePremiumResponse.getRtnCode());
         if (!ObjectUtils.isEmpty(responseMessageAbstractHandler)) {
-            calculatePremiumResponse = responseMessageAbstractHandler.messageHandler(calculatePremiumRequest, calculatePremiumResponse, httpHeaders, modelQueryRequest, message, queryActualValueRequest);
+            calculatePremiumResponse = responseMessageAbstractHandler.messageHandler(calculatePremiumRequest, calculatePremiumResponse, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
         }
+
         return calculatePremiumResponse;
     }
 

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

@@ -9,6 +9,7 @@ import com.ydtech.modules.order.entity.api.zijin.request.ModelQueryRequest;
 import com.ydtech.modules.order.entity.api.zijin.request.QueryActualValueRequest;
 import com.ydtech.modules.order.entity.api.zijin.response.CalculatePremiumResponse;
 import com.ydtech.modules.order.utils.InsuranceLog;
+import com.ydtech.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -36,22 +37,42 @@ public class ZijinSystemExceptionComponents extends ResponseMessageAbstractHandl
     }
 
     @Override
-    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message, QueryActualValueRequest queryActualValueRequest) {
+    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest,
+                                                   CalculatePremiumResponse calculatePremiumResponse,
+                                                   HttpHeaders httpHeaders,
+                                                   ModelQueryRequest modelQueryRequest,
+                                                   String message,
+                                                   QueryActualValueRequest queryActualValueRequest,
+                                                   boolean retry) {
         InsuranceLog.infoLog(InsuranceEnum.ZKIC.getPinyin(), "\n\t---------> {}\n\t---------> {}", "紫金财险 999 异常处理", calculatePremiumResponse.getRtnMsg());
         String rtnMsg = calculatePremiumResponse.getRtnMsg();
 
-        if (rtnMsg.contains(ExceptionEnum.R_93169.getCode())) {
-            throw new SystemException("稍等一会,再重新报价！");
+        if (retry && rtnMsg.contains(ExceptionEnum.R_90000.getDesc())) {
+            CalculatePremiumRequest.BaseInfoDTO baseInfo = calculatePremiumRequest.getBaseInfo();
+            baseInfo.setAnswerCI(replacingStrings(baseInfo.getAnswerCI()));
+            baseInfo.setAnswer(replacingStrings(baseInfo.getAnswer()));
+            retry = false;
+            return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
         }
 
-        throw new SystemException(rtnMsg);
+        throw new SystemException(calculatePremiumResponse.getRtnMsg());
+    }
+
+    public static String replacingStrings(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return code;
+        }
+
+        return code
+                .replace("3", "j")
+                .replace("0", "o");
     }
 
     @AllArgsConstructor
     @Getter
     public enum ExceptionEnum {
 
-        R_93169("93169", "系统异常:93169:找不到投保询价待校验信息(投保询价信息不存在，或投保询价已经成功)。");
+        R_90000("90000", "录入的校验码有误");
 
         private final String code;
 

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

@@ -64,7 +64,13 @@ public class ZijinVehicleTypeErrorComponents extends ResponseMessageAbstractHand
      * 修改正确车型报价
      */
     @Override
-    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest, CalculatePremiumResponse calculatePremiumResponse, HttpHeaders httpHeaders, ModelQueryRequest modelQueryRequest, String message, QueryActualValueRequest queryActualValueRequest) {
+    public CalculatePremiumResponse messageHandler(CalculatePremiumRequest calculatePremiumRequest,
+                                                   CalculatePremiumResponse calculatePremiumResponse,
+                                                   HttpHeaders httpHeaders,
+                                                   ModelQueryRequest modelQueryRequest,
+                                                   String message,
+                                                   QueryActualValueRequest queryActualValueRequest,
+                                                   boolean retry) {
         InsuranceLog.infoLog(InsuranceEnum.ZKIC.getPinyin(), "\n\t---------> {}\n\t---------> {}", "紫金财险转修改正确车型报价", calculatePremiumResponse.getRtnMsg());
         CarType carType = getCarInconsistentInformation(calculatePremiumResponse.getRtnMsg());
 
@@ -91,7 +97,7 @@ public class ZijinVehicleTypeErrorComponents extends ResponseMessageAbstractHand
             itemKindListDTO.get(0).setAmount(actualValue);
         }
 
-        return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest);
+        return zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, retry);
     }
 
     @Data

src/main/java/com/ydtech/modules/order/controller/GuoRenOrderApiController.java

@@ -3,6 +3,8 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.ins.model.guoren.CarModelResp;
+import com.ydtech.modules.ins.model.guoren.NonAutoInsResp;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
@@ -31,8 +33,6 @@ import javax.validation.Valid;
 @RequestMapping("/api/guoRen")
 public class GuoRenOrderApiController {
 
-    private static final Logger log = LoggerFactory.getLogger("guoRen");
-
     private final GuorenOrderApiService guorenOrderApiService;
 
     public GuoRenOrderApiController(GuorenOrderApiService guorenOrderApiService) {
@@ -50,23 +50,10 @@ public class GuoRenOrderApiController {
 
     @ApiOperation(value = "车型查询", notes = "只需要vin码、发动机号、注册日期例：20120512")
     @PostMapping("/modelQuery")
-    public HttpResult modelQueryAPI(@RequestBody CarInfoVo carInfo) {
+    public HttpResult<CarModelResp> modelQueryAPI(@RequestBody CarInfoVo carInfo) {
         return guorenOrderApiService.modelsQueryApi(carInfo);
     }
 
-//    @ApiOperation(value = "VIN码查询", notes = "只需要vin码、发动机号")
-//    @PostMapping("/vinQuery")
-//    public HttpResult vinQuery(@RequestBody CarModel_Req carModelReq) {
-//
-//        return insGuoRenApiService.vinQueryApi(carModelReq);
-//    }
-//
-//    @ApiOperation(value = "API方式 - 车价查询")
-//    @PostMapping("/carPrice")
-//    public HttpResult carPrice(@RequestBody BaseQuoteVo<AccidentalDrivingVo> quoteVo) {
-//        return insGuoRenApiService.carPrice(quoteVo);
-//    }
-
     @ApiResponses({
             @ApiResponse(code = 500, message = "出现异常"),
             @ApiResponse(code = 101, message = "转保单"),
@@ -96,7 +83,6 @@ public class GuoRenOrderApiController {
         return guorenOrderApiService.auditApi(companyId);
     }
 
-
     @ApiOperation(value = "更新订单信息")
     @PostMapping("/updateOrderInfo")
     public HttpResult updateOrderInfoByIns(@RequestSingleParam(value = "companyId") String companyId) {
@@ -124,8 +110,8 @@ public class GuoRenOrderApiController {
     public HttpResult syncNonAutoIns() {
         //家用车驾乘意外险-山西版(02746425173001)
         String goodsCode = "02746425173001";
-        return HttpResult.ok(guorenOrderApiService.gainNonAutoInsList(goodsCode));
-
+        NonAutoInsResp.DataDTO dataDTO = guorenOrderApiService.gainNonAutoInsList(goodsCode);
+        return HttpResult.ok(dataDTO);
     }
 
     /**

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";
 

src/main/java/com/ydtech/modules/order/entity/crawler/response/RecognitionResponse.java

@@ -42,11 +42,11 @@ public class RecognitionResponse extends CrawlerBaseResponse implements Serializ
 
 
         public String getJqImageCode() {
-            return jqImageCode.replace("0", "o");
+            return jqImageCode;
         }
 
         public String getSyImageCode() {
-            return syImageCode.replace("0", "o");
+            return syImageCode;
         }
     }
 

src/main/java/com/ydtech/modules/order/service/GuorenOrderApiService.java

@@ -1,6 +1,8 @@
 package com.ydtech.modules.order.service;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.ins.model.guoren.CarModelResp;
+import com.ydtech.modules.ins.model.guoren.ChannelInfoDto;
 import com.ydtech.modules.ins.model.guoren.NonAutoInsResp;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
@@ -16,18 +18,15 @@ public interface GuorenOrderApiService {
 
 
     //=================API 方式=================
-
     /**
      * 获取渠道信息
      */
     HttpResult gainChannelInfo(String thirdCode);
 
-
     /**
      * 1 车型查询接口
      */
-    HttpResult modelsQueryApi(CarInfoVo carInfo);
-
+    HttpResult<CarModelResp> modelsQueryApi(CarInfoVo carInfo);
 
     /**
      * 2 报价
@@ -44,11 +43,6 @@ public interface GuorenOrderApiService {
      */
     HttpResult insOrderInfo(String iacNo);
 
-    /**
-     * 处理核保待缴费的订单
-     */
-    void toBePaidOrderStatus();
-
     /**
      * 获取缴费地址
      */
@@ -60,30 +54,18 @@ public interface GuorenOrderApiService {
      * @param
      * @return
      */
-    HttpResult uploadImageApi(String quoteOrderNo);
+    HttpResult uploadImageApi(String companyId);
 
     /**
      * 非车列表
      */
     NonAutoInsResp.DataDTO gainNonAutoInsList(String goodsCode);
-    /**
-     * （驾意险）意健险方案及险种查询接口
-     */
-     HttpResult gainAccidentList(AccidentalDrivingQueryVo accidentalDrivingVo);
 
     /**
      * （驾意险）同步驾意险
      */
     HttpResult syncAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo);
 
-    /**
-     * （驾意险）意健险方案及险种查询接口
-     *
-     * @param scheme 方案
-     */
-    AccidentResponse gainAccidentInsure(AccidentalDrivingQueryVo accidentalDrivingVo, NonAutoInsResp.DataDTO.ProdListDTO.ProdRiskListDTO scheme);
-
-
     /**
      * 第三方回调通知（支付+承保）
      *
@@ -98,14 +80,5 @@ public interface GuorenOrderApiService {
     HttpResult getPolicyPrintApi(PolicyPrintVo policyPrintVo);
 
 
-    /**
-     * 获取地区编码   通过身份证地址
-     *
-     * @author: lig
-     * @date: 2023年04月12日 0012
-     */
-    Map<String, String> gainRegionCode(String address);
-
-
 
 }

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

@@ -130,14 +130,13 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         }
 
         QueryActualValueRequest queryActualValueRequest = new QueryActualValueRequest(carInfo.getRegisterDate(), purchasePrice, seatCount, startDate);
-
         QueryActualValueResponse queryActualValueResponse = zijinRequestApiComponents.queryActualValue(queryActualValueRequest, httpHeaders);
         // 4. 报价
         CalculatePremiumRequest calculatePremiumRequest
                 = new CalculatePremiumRequest(quoteInfoVo, vehicleModelInfosDTO, queryActualValueResponse.getActualValue(), quoteVo.getAccidentalDrivingVo(), zjConfigureParameters, modelQueryResponse);
 
         String message = "";
-        CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest);
+        CalculatePremiumResponse calculatePremiumResponse = zijinRequestApiComponents.calculatePremium(calculatePremiumRequest, httpHeaders, modelQueryRequest, message, queryActualValueRequest, true);
         // 警告信息
         QuoteRespVo quoteRespVo = getQuoteRespVo(calculatePremiumResponse, quoteInfoVo, quoteVo.getAccidentalDrivingVo());
         if (!StringUtils.isEmpty(message)) {

src/main/resources/application-prod.yml

@@ -236,3 +236,10 @@ guoren:
     baseUrl: https://rbt.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
     uploadUrl: https://rbt.guorenpcic.com/api/grecar/photo/upload
     redirectUrl: http://sxzgkj.baoxianzhanggui.com/web-api/api/guoRen/callBack
+    policyUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+    policyFlagUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+    serveCode: GR0002
+    channelCode: TQDL
+    interfaceUserCode: TQDL
+    interfacePwd: $2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te
+    iftest: N

src/main/resources/application-test.yml

@@ -284,10 +284,10 @@ zm:
 # 紫金财险
 zj:
   api:
-#    appKey: SXTQ-C-SX
-#    appSecret: vAI9sW4bM1m5Y074AUT72wvxKu55SbGY
-#    proposalCityCode: 320100
-#    proposalAreaCode: 320000
+    #    appKey: SXTQ-C-SX
+    #    appSecret: vAI9sW4bM1m5Y074AUT72wvxKu55SbGY
+    #    proposalCityCode: 320100
+    #    proposalAreaCode: 320000
     # 为接入方提供获取token服务
     accessTokenUrl: https://test-open.zking.com/api/v1/public/token/getAccessToken
     # 车险业务
@@ -336,3 +336,10 @@ guoren:
     baseUrl: https://devyun.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
     uploadUrl: https://devyun.guorenpcic.com/api/grecar/photo/upload
     redirectUrl: http://39.98.239.48/web-api/api/guoRen/callBack
+    policyUrl: https://devyun.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+    policyFlagUrl: https://devyun.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+    serveCode: GR0002
+    channelCode: jindouyun
+    interfaceUserCode: guoren_tp_jdy
+    interfacePwd: Q31gIrhZgQc=
+    iftest: Y