1.华泰财险商业险重复投保

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiQuotationProcessorComponent.java

@@ -31,13 +31,21 @@ public class HuaTaiQuotationProcessorComponent {
         HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiRequestApiComponents.quotedPrice(quotedPriceRequest,
                 HuaTaiQuotedPriceResponse.class);
 
+        // 将报价号和校验码置空
         List<HuaTaiQuotedPriceRequest.ContractDto> contract1 = quotedPriceRequest.getBusinessData().getContract();
         for (HuaTaiQuotedPriceRequest.ContractDto contractDto : contract1) {
+            contractDto.getContractMain().setContractNo(null);
             contractDto.setPlatFormMessage(null);
         }
 
-        // 重复投保
-        b = huaTaiRepeatInsuranceComponents.dealRepeatDate(quotedPriceRequest, quotedPriceResponse, quoteInfo);
+        // 交强险重复投保
+        b = huaTaiRepeatInsuranceComponents.compulsoryInsurance(quotedPriceRequest, quotedPriceResponse);
+        if (b) {
+            return handler(quotedPriceRequest, quoteInfo);
+        }
+
+        // 商业险重复投保
+        b = huaTaiRepeatInsuranceComponents.commercialInsurance(quotedPriceRequest, quotedPriceResponse);
         if (b) {
             return handler(quotedPriceRequest, quoteInfo);
         }

src/main/java/com/ydtech/modules/order/components/huatai/HuaTaiRepeatInsuranceComponents.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -31,74 +32,92 @@ import java.util.List;
 @Component
 public class HuaTaiRepeatInsuranceComponents {
 
-    public boolean dealRepeatDate(HuaTaiQuotedPriceRequest huaTaiQuotedPriceRequest, HuaTaiQuotedPriceResponse quotedPriceResponse,
-                                  BaseQuoteInfoVo quoteInfo) {
+
+    /**
+     * 交强险重复投保
+     *
+     * @param huaTaiQuotedPriceRequest 华泰财险请求内容
+     * @param quotedPriceResponse      华泰财险响应内容
+     * @return true 重新请求 false 跳过
+     */
+    public boolean compulsoryInsurance(HuaTaiQuotedPriceRequest huaTaiQuotedPriceRequest,
+                                       HuaTaiQuotedPriceResponse quotedPriceResponse) {
         HuaTaiBaseResponseHead head = quotedPriceResponse.getHead();
         if ("0".equals(head.getReturnCode())) {
             return false;
         }
 
         String returnMessage = quotedPriceResponse.getHead().getReturnMessage();
-        InsuranceLog.infoLog(InsuranceEnum.ZMBX.getPinyin(), "\n\t---------> {}\n\t---------> {}", "华泰财险重复投保处理", returnMessage);
+        InsuranceLog.infoLog(InsuranceEnum.ZMBX.getPinyin(), "\n\t---------> {}\n\t---------> {}", "华泰财险重复投保处理",
+                returnMessage);
 
         // 交强险重复投保
-        HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTOBiz = null;
-
-        // 商业险重复投保
-        HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTOBusi = null;
-
-        List<HuaTaiQuotedPriceRequest.ContractDto> contractDTOList = huaTaiQuotedPriceRequest.getBusinessData().getContract();
-        for (HuaTaiQuotedPriceRequest.ContractDto contractDTO : contractDTOList) {
-
-            HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTO = contractDTO.getContractMain();
-            if (HuaTaiRiskCode.R_1002.getCode().equals(contractMainDTO.getRiskCode())) {
-                contractMainDTOBiz = contractDTO.getContractMain();
-            } else if (HuaTaiRiskCode.R_1251.getCode().equals(contractMainDTO.getRiskCode())) {
-                contractMainDTOBusi = contractDTO.getContractMain();
-            }
-        }
-
-        List<RiskInfoVo> riskList = quoteInfo.getRiskList();
+        List<HuaTaiQuotedPriceRequest.ContractDto> contractDTOList =
+                huaTaiQuotedPriceRequest.getBusinessData().getContract();
 
+        HashMap<String, HuaTaiQuotedPriceRequest.ContractDto> map = getStringContractDtoHashMap(contractDTOList);
+        HuaTaiQuotedPriceRequest.ContractDto contractDto = map.get(HuaTaiRiskCode.R_1002.getCode());
+        HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
         // 交强险重复投保
         if (StringUtils.isNotEmpty(returnMessage) && returnMessage.contains("重复投保")) {
             String jqEndDate = GuorenDuplicateInsuranceComponent.getEndDate(returnMessage,
                     GuorenDuplicateInsuranceComponent.THE_FIRST_REGEX);
-            getPeriodDate(jqEndDate, contractMainDTOBiz);
-            extracted(riskList, contractMainDTOBusi, contractMainDTOBiz);
+            getPeriodDate(jqEndDate, contractMain);
             return true;
         }
+        return false;
+    }
+
+
+    /**
+     * 商业险重复投保
+     *
+     * @param huaTaiQuotedPriceRequest 华泰财险请求内容
+     * @param quotedPriceResponse      华泰财险响应内容
+     * @return true 重新请求 false 跳过
+     */
+    public boolean commercialInsurance(HuaTaiQuotedPriceRequest huaTaiQuotedPriceRequest,
+                                        HuaTaiQuotedPriceResponse quotedPriceResponse) {
+
+        HuaTaiBaseResponseHead head = quotedPriceResponse.getHead();
+        if ("-1".equals(head.getReturnCode())) {
+            return false;
+        }
+
+        // 请求内容
+        List<HuaTaiQuotedPriceRequest.ContractDto> contractDTOList =
+                huaTaiQuotedPriceRequest.getBusinessData().getContract();
+        HashMap<String, HuaTaiQuotedPriceRequest.ContractDto> map = getStringContractDtoHashMap(contractDTOList);
+        HuaTaiQuotedPriceRequest.ContractDto contractDto = map.get(HuaTaiRiskCode.R_1251.getCode());
+        HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
 
-        HashMap<String, HuaTaiQuotedPriceResponse.ContractDto> map =
+        // 响应内容
+        HashMap<String, HuaTaiQuotedPriceResponse.ContractDto> mapResponse =
                 HuaTaiReinsuranceComponents.getStringPlatFormMessageDtoHashMap(quotedPriceResponse);
-        HuaTaiQuotedPriceResponse.ContractDto contractDto = map.get(HuaTaiRiskCode.R_1251.getCode());
-        HuaTaiQuotedPriceResponse.ContractDto.PlatFormMessageDto platFormMessage = contractDto.getPlatFormMessage();
+        HuaTaiQuotedPriceResponse.ContractDto contractResponse = mapResponse.get(HuaTaiRiskCode.R_1251.getCode());
+        HuaTaiQuotedPriceResponse.ContractDto.PlatFormMessageDto platFormMessage =
+                contractResponse.getPlatFormMessage();
         String reInsureMsg = platFormMessage.getReInsureMsg();
 
         // 商业险重复投保
-        if (!ObjectUtils.isEmpty(contractDto) && !ObjectUtils.isEmpty(platFormMessage) && !StringUtils.isEmpty(reInsureMsg)) {
-            String syEndDate = GuorenDuplicateInsuranceComponent.getEndDate(reInsureMsg, GuorenDuplicateInsuranceComponent.THE_FIRST_REGEX);
-            getPeriodDate(syEndDate, contractMainDTOBusi);
-            extracted(riskList, contractMainDTOBusi, contractMainDTOBiz);
+        if (!ObjectUtils.isEmpty(contractResponse) && !ObjectUtils.isEmpty(platFormMessage) && !StringUtils.isEmpty(reInsureMsg)) {
+            String syEndDate = GuorenDuplicateInsuranceComponent.getEndDate(reInsureMsg,
+                    GuorenDuplicateInsuranceComponent.THE_FIRST_REGEX);
+
+            getPeriodDate(syEndDate, contractMain);
             return true;
         }
-
         return false;
     }
 
-    private static void extracted(List<RiskInfoVo> riskList, HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTOBusi,
-                                  HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTOBiz) {
-        for (RiskInfoVo riskInfoVo : riskList) {
-            if (InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {
-                riskInfoVo.setStartDate(contractMainDTOBusi.getValidDate());
-                riskInfoVo.setEndDate(contractMainDTOBusi.getExpiryDate());
-            }
-
-            if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
-                riskInfoVo.setStartDate(contractMainDTOBiz.getValidDate());
-                riskInfoVo.setEndDate(contractMainDTOBiz.getExpiryDate());
-            }
+
+    private static HashMap<String, HuaTaiQuotedPriceRequest.ContractDto> getStringContractDtoHashMap(List<HuaTaiQuotedPriceRequest.ContractDto> contractDTOList) {
+        HashMap<String, HuaTaiQuotedPriceRequest.ContractDto> map = new HashMap<>();
+        for (HuaTaiQuotedPriceRequest.ContractDto contractDTO : contractDTOList) {
+            HuaTaiQuotedPriceRequest.ContractDto.ContractMainDto contractMainDTO = contractDTO.getContractMain();
+            map.put(contractMainDTO.getRiskCode(), contractDTO);
         }
+        return map;
     }
 
 

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

@@ -18,6 +18,7 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequestHead;
+import com.ydtech.modules.order.entity.api.huatai.constants.HuaTaiRiskCode;
 import com.ydtech.modules.order.entity.api.huatai.constants.HuaTaiSubmitCommon;
 import com.ydtech.modules.order.entity.api.huatai.request.*;
 import com.ydtech.modules.order.entity.api.huatai.response.*;
@@ -43,6 +44,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -91,8 +93,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         // 通过 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                ptlAgreementAttribution);
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        ptlAgreementAttribution);
 
         HuaTaiBaseRequestHead baseRequestHead = new HuaTaiBaseRequestHead(huaTaiConfigureParameters);
 
@@ -102,8 +105,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         huaTaiModelsQueryRequest.setHead(baseRequestHead);
         huaTaiModelsQueryRequest.setLoginCom(huaTaiConfigureParameters.getComCode());
         huaTaiModelsQueryRequest.setAgentCode(huaTaiConfigureParameters.getAgentCode());
-        List<HuaTaiModelsQueryResponse.CarModelDto> carModelDtos = huaTaiRequestApiComponents.modelQuery(huaTaiModelsQueryRequest,
-                HuaTaiModelsQueryResponse.class);
+        List<HuaTaiModelsQueryResponse.CarModelDto> carModelDtos =
+                huaTaiRequestApiComponents.modelQuery(huaTaiModelsQueryRequest,
+                        HuaTaiModelsQueryResponse.class);
 
         List<HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto> fullCarDataDtos = new ArrayList<>();
         for (HuaTaiModelsQueryResponse.CarModelDto carModelDto : carModelDtos) {
@@ -111,31 +115,37 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         }
         // 2.2 过滤车型
         HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto fullCarDataDto =
-                new CarModelsFilterUtils<HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto>().to(fullCarDataDtos, carInfo);
+                new CarModelsFilterUtils<HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto>().to(fullCarDataDtos,
+                        carInfo);
 
 
         HuaTaiActualValueResponse actualValueResponse = null;
         for (RiskInfoVo riskInfoVo : quoteInfo.getRiskList()) {
             if ("0510".equals(riskInfoVo.getRiskCode())) {
                 String startDate = riskInfoVo.getStartDate();
-                HuaTaiActualValueRequest huaTaiActualValueRequest = new HuaTaiActualValueRequest(carInfo, fullCarDataDto, startDate);
+                HuaTaiActualValueRequest huaTaiActualValueRequest = new HuaTaiActualValueRequest(carInfo,
+                        fullCarDataDto, startDate);
                 huaTaiActualValueRequest.setHead(baseRequestHead);
-                actualValueResponse = huaTaiRequestApiComponents.actualValue(huaTaiActualValueRequest, HuaTaiActualValueResponse.class);
+                actualValueResponse = huaTaiRequestApiComponents.actualValue(huaTaiActualValueRequest,
+                        HuaTaiActualValueResponse.class);
             }
         }
 
 
         // 3 组装报价参数
-        HuaTaiQuotedPriceRequest quotedPriceRequest = new HuaTaiQuotedPriceRequest(quoteInfo, fullCarDataDto, actualValueResponse,
+        HuaTaiQuotedPriceRequest quotedPriceRequest = new HuaTaiQuotedPriceRequest(quoteInfo, fullCarDataDto,
+                actualValueResponse,
                 zmQuoteVo.getAccidentalDrivingVo(), huaTaiConfigureParameters);
         quotedPriceRequest.setHead(baseRequestHead);
 
         // 3.1 处理报价请求
-        HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest, quoteInfo);
+        HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest,
+                quoteInfo);
 
         QuoteRespVo quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo);
         //这里调用费用匹配功能
-        //feeRuleSchemeService.dealFeeOrderInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),quotedPriceResponse.getBusinessNo());
+        //feeRuleSchemeService.dealFeeOrderInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),
+        // quotedPriceResponse.getBusinessNo());
         return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution);
     }
 
@@ -152,13 +162,15 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
         // 1. 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                insAreaCompany.getAgreementId());
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         YaQuoteInfoVo yaQuoteInfoVo = new YaQuoteInfoVo(insOrders);
 
         // 2. 调用转投保接口
-        HuaTaiSubmitResponse response = submitForUnderwriting(yaQuoteInfoVo, insAreaCompany, huaTaiConfigureParameters, engageList);
+        HuaTaiSubmitResponse response = submitForUnderwriting(yaQuoteInfoVo, insAreaCompany,
+                huaTaiConfigureParameters, engageList);
 
         if ("-1".equals(response.getHead().getReturnCode())) {
             throw new SystemException(response.getHead().getReturnMessage());
@@ -236,7 +248,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             return getPayURL(insAreaCompany, huaTaiConfigureParameters);
         } else if ("1".equals(totalStatus)) {
             //调用提交核保接口
-            HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(insAreaCompany, huaTaiConfigureParameters, "1");
+            HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(insAreaCompany,
+                    huaTaiConfigureParameters, "1");
             HuaTaiSubmitCommon huaTaiSubmitCommon = getSubmitStatus(insAreaCompany, submitStatusQueryResponse);
             //根据核保返回信息进行更新
             if ("8".equals(huaTaiSubmitCommon.getTotalUnderWriteInd())) {//已通过核保未实收
@@ -270,7 +283,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         return HttpResult.ok(list);
     }
 
-    private HttpResult<Object> getPayURL(InsAreaCompany insAreaCompany, HuaTaiConfigureParameters huaTaiConfigureParameters) {
+    private HttpResult<Object> getPayURL(InsAreaCompany insAreaCompany,
+                                         HuaTaiConfigureParameters huaTaiConfigureParameters) {
         String payUrl = getPaymentUrl(insAreaCompany, huaTaiConfigureParameters);
         if (StringUtils.isNotEmpty(payUrl)) {
             insAreaCompany.setPaymentLink(payUrl);
@@ -289,17 +303,20 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
 
         // 1. 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                insAreaCompany.getAgreementId());
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
-        List<InsUploadImagesDto> insUploadImagesDtoList = insTaskImagesService.findImageByOrderNo(insOrders.getOrderno());
+        List<InsUploadImagesDto> insUploadImagesDtoList =
+                insTaskImagesService.findImageByOrderNo(insOrders.getOrderno());
         if (insUploadImagesDtoList.isEmpty()) {
             throw new SystemException("请检查影像是否上传了");
         }
         HuaTaiUploadImageRequest request = new HuaTaiUploadImageRequest(insAreaCompany, huaTaiConfigureParameters);
         request.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         //调用华泰影像接口获取上传链接地址
-        HuaTaiUploadImageResponse response = huaTaiRequestApiComponents.uploadImage(request, HuaTaiUploadImageResponse.class);
+        HuaTaiUploadImageResponse response = huaTaiRequestApiComponents.uploadImage(request,
+                HuaTaiUploadImageResponse.class);
         //爬虫方式进行图片上传
         huiTaiUploadImageComponents.uploadImage(response.getUrl(), insUploadImagesDtoList);
         return HttpResult.ok("上传文件成功");
@@ -317,14 +334,16 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
 
         // 1. 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                insAreaCompany.getAgreementId());
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        insAreaCompany.getAgreementId());
 
         if (insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
             return HttpResult.ok(InsOrderStatusEnum.ACCEPT_INSURANCE.getDesc());
         }
         // 2. 组装请求体
-        HuaTaiOrderStatusRequest orderStatusRequest = new HuaTaiOrderStatusRequest(insAreaCompany, huaTaiConfigureParameters);
+        HuaTaiOrderStatusRequest orderStatusRequest = new HuaTaiOrderStatusRequest(insAreaCompany,
+                huaTaiConfigureParameters);
         orderStatusRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiOrderStatusResponse orderStatusResponse = huaTaiRequestApiComponents.orderStatus(orderStatusRequest,
                 HuaTaiOrderStatusResponse.class);
@@ -372,7 +391,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
     private String getPaymentUrl(InsAreaCompany insAreaCompany, HuaTaiConfigureParameters huaTaiConfigureParameters) {
         String payUrl = "";
-        HuaTaiPaymentUrlRequest huaTaiPaymentUrlRequest = new HuaTaiPaymentUrlRequest(insAreaCompany, huaTaiConfigureParameters);
+        HuaTaiPaymentUrlRequest huaTaiPaymentUrlRequest = new HuaTaiPaymentUrlRequest(insAreaCompany,
+                huaTaiConfigureParameters);
         huaTaiPaymentUrlRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiPaymentUrlResponse paymentUrlResponse = huaTaiRequestApiComponents.getPaymentUrl(huaTaiPaymentUrlRequest,
                 HuaTaiPaymentUrlResponse.class);
@@ -392,8 +412,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     public HttpResult<CrawlerPolicyPrintVo> getPolicyPrint(PolicyPrintVo policyPrintVo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(policyPrintVo.getCompanyId());
         // 1. 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                insAreaCompany.getAgreementId());
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         String licensePlate = insOrders.getLicenseno();
         YaQuoteInfoVo yaQuoteInfoVo = new YaQuoteInfoVo(insOrders);
@@ -413,17 +434,21 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 HuaTaiInsurancePolicyPrintResponse.class);
         CrawlerPolicyPrintVo crawlerPolicyPrintVo = new CrawlerPolicyPrintVo();
         if ("0".equals(response.getHead().getReturnCode())) {
-            List<HuaTaiInsurancePolicyPrintResponse.ElecDownLoadResultDto> urlList = response.getElecDownLoadResultList();
+            List<HuaTaiInsurancePolicyPrintResponse.ElecDownLoadResultDto> urlList =
+                    response.getElecDownLoadResultList();
             //接口文档与返回示例不一致，待联调后修改
 
             if (urlList != null && !urlList.isEmpty()) {
                 for (HuaTaiInsurancePolicyPrintResponse.ElecDownLoadResultDto elecDownLoadResultDto : urlList) {
                     String url = elecDownLoadResultDto.getDownURL();
                     if (InsuranceRisk.TRAFFIC.getCode().equals(riskCode)) {
-                        crawlerPolicyPrintVo.setJqxPolicyUrl(gainCarInsPolicy(url, licensePlate + "-交强险保单.pdf", licensePlate, password));
-                        crawlerPolicyPrintVo.setJqxFlagUrl(gainCarInsPolicy(url, licensePlate + "-交强险标志.pdf", licensePlate, password));
+                        crawlerPolicyPrintVo.setJqxPolicyUrl(gainCarInsPolicy(url, licensePlate + "-交强险保单.pdf",
+                                licensePlate, password));
+                        crawlerPolicyPrintVo.setJqxFlagUrl(gainCarInsPolicy(url, licensePlate + "-交强险标志.pdf",
+                                licensePlate, password));
                     } else if (InsuranceRisk.BUSINESS.getCode().equals(riskCode)) {
-                        crawlerPolicyPrintVo.setSyxPolicyUrl(gainCarInsPolicy(url, licensePlate + "-商业险保单.pdf", licensePlate, password));
+                        crawlerPolicyPrintVo.setSyxPolicyUrl(gainCarInsPolicy(url, licensePlate + "-商业险保单.pdf",
+                                licensePlate, password));
                     }
                     /**
                      * 先下载到本地，然后再解压到固定路径
@@ -438,7 +463,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
 
     public String gainCarInsPolicy(String url, String fileName, String licensePlate, String password) {
         String dir = "carInsPolicy/" + licensePlate + "/";
-        return FileUtil.netUrlStoreToLocal(url, dir, fileName, uploadFilePath, apiUrl + showFileUrl, password, licensePlate);
+        return FileUtil.netUrlStoreToLocal(url, dir, fileName, uploadFilePath, apiUrl + showFileUrl, password,
+                licensePlate);
     }
 
     /**
@@ -452,7 +478,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     private HuaTaiSubmitResponse submitForUnderwriting(YaQuoteInfoVo yaQuoteInfoVo, InsAreaCompany insAreaCompany,
                                                        HuaTaiConfigureParameters huaTaiConfigureParameters,
                                                        List<InsHuataiContributingVo> engageList) {
-        HuaTaiSubmitRequest submitRequest = new HuaTaiSubmitRequest(yaQuoteInfoVo, insAreaCompany, huaTaiConfigureParameters, engageList);
+        HuaTaiSubmitRequest submitRequest = new HuaTaiSubmitRequest(yaQuoteInfoVo, insAreaCompany,
+                huaTaiConfigureParameters, engageList);
         submitRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         return huaTaiRequestApiComponents.submit(submitRequest, HuaTaiSubmitResponse.class);
     }
@@ -464,37 +491,37 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         double syDiscount = 0;
         String jqApplyNo = "";
         String syApplyNo = "";
+        QuoteRespVo quoteRespVo = new QuoteRespVo();
+
         List<HuaTaiQuotedPriceResponse.ContractDto.CoverageDto> syCoverageDtoList = null;
         HuaTaiQuotedPriceResponse.ContractDto.TaxDto taxDto = null;
-        List<HuaTaiQuotedPriceResponse.ContractDto> contractDtoList = quotedPriceResponse.getBusinessData().getContract();
+        List<HuaTaiQuotedPriceResponse.ContractDto> contractDtoList =
+                quotedPriceResponse.getBusinessData().getContract();
         for (HuaTaiQuotedPriceResponse.ContractDto contractDto : contractDtoList) {
             HuaTaiQuotedPriceResponse.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
-            if ("1002".equals(contractMain.getRiskCode())) {
+            if (HuaTaiRiskCode.R_1002.getCode().equals(contractMain.getRiskCode())) {
                 taxDto = contractDto.getTax();
                 jqDiscount = contractMain.getTotalAdjustRate();
                 jqPremium = contractMain.getTotalPremium();
                 jqApplyNo = contractMain.getContractNo();
+
+                quoteRespVo.setStartDateJq(contractMain.getExpiryDate().toString());
+                quoteRespVo.setEndDateJq(contractMain.getValidDate().toString());
             } else {
                 syCoverageDtoList = contractDto.getCoverage();
                 syDiscount = contractMain.getTotalAdjustRate();
                 syPremium = contractMain.getTotalPremium();
                 syApplyNo = contractMain.getContractNo();
+
+                quoteRespVo.setStartDateSy(contractMain.getExpiryDate().toString());
+                quoteRespVo.setEndDateSy(contractMain.getValidDate().toString());
             }
         }
-        QuoteRespVo quoteRespVo = new QuoteRespVo();
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
         // 报价险种放入保费
         List<QuoteRiskRespVo> riskList1 = QuoteRiskRespVo.toQuoteRiskRespVoList(riskList, jqPremium, syPremium);
 
-        for (QuoteRiskRespVo quoteRiskRespVo : riskList1) {
-            if (InsuranceRisk.TRAFFIC.getCode().equals(quoteRiskRespVo.getRiskCode())) {
-                quoteRespVo.setStartDateJq(quoteRiskRespVo.getStartDate());
-                quoteRespVo.setEndDateJq(quoteRiskRespVo.getEndDate());
-            } else if (InsuranceRisk.BUSINESS.getCode().equals(quoteRiskRespVo.getRiskCode())) {
-                quoteRespVo.setStartDateSy(quoteRiskRespVo.getStartDate());
-                quoteRespVo.setEndDateSy(quoteRiskRespVo.getEndDate());
-            }
-        }
+
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
         QuoteKindRespVo kind;
         if (!ObjectUtils.isEmpty(syCoverageDtoList)) {
@@ -538,7 +565,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         return quoteRespVo;
     }
 
-    private HttpResult<QuoteRespVo> responseOrder(HuaTaiQuotedPriceResponse quotedPriceResponse, QuoteRespVo quoteRespVo,
+    private HttpResult<QuoteRespVo> responseOrder(HuaTaiQuotedPriceResponse quotedPriceResponse,
+                                                  QuoteRespVo quoteRespVo,
                                                   PtlAgreementAttribution ptlAgreementAttribution) {
         //保存订单信息
         InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
@@ -548,12 +576,14 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         insAreaCompany.setJqapplyno(quoteRespVo.getJqApplyNo());
         insAreaCompany.setSyapplyno(quoteRespVo.getSyApplyNo());
         HuaTaiQuotedPriceResponse.ContractDto.TaxDto taxDto = null;
-        List<HuaTaiQuotedPriceResponse.ContractDto> contractDtoList = quotedPriceResponse.getBusinessData().getContract();
+        List<HuaTaiQuotedPriceResponse.ContractDto> contractDtoList =
+                quotedPriceResponse.getBusinessData().getContract();
         String jqQuerySequenceNo = " ";
         String syQuerySequenceNo = " ";
         for (HuaTaiQuotedPriceResponse.ContractDto contractDto : contractDtoList) {
             HuaTaiQuotedPriceResponse.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
-            HuaTaiQuotedPriceResponse.ContractDto.PlatFormMessageDto platFormMessageDto = contractDto.getPlatFormMessage();
+            HuaTaiQuotedPriceResponse.ContractDto.PlatFormMessageDto platFormMessageDto =
+                    contractDto.getPlatFormMessage();
             if ("1002".equals(contractMain.getRiskCode())) {
                 jqQuerySequenceNo = platFormMessageDto.getQuerySequenceNo();
                 taxDto = contractDto.getTax();
@@ -582,15 +612,17 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     public HttpResult<Object> auditStatusQuery(String companyId) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
         // 1. 协议id获取配置实体
-        HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
-                insAreaCompany.getAgreementId());
+        HuaTaiConfigureParameters huaTaiConfigureParameters =
+                configureParametersComponents.toEntity(HuaTaiConfigureParameters.class,
+                        insAreaCompany.getAgreementId());
 
         if (insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
             return HttpResult.ok(InsOrderStatusEnum.WAIT_PAY.getDesc());
         }
 
         // 2. 组装请求体
-        HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(insAreaCompany, huaTaiConfigureParameters, "2");
+        HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(insAreaCompany,
+                huaTaiConfigureParameters, "2");
 
         HuaTaiSubmitCommon huaTaiSubmitCommon = getSubmitStatus(insAreaCompany, submitStatusQueryResponse);
 
@@ -611,7 +643,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         }
     }
 
-    private HuaTaiSubmitCommon getSubmitStatus(InsAreaCompany insAreaCompany, HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse) {
+    private HuaTaiSubmitCommon getSubmitStatus(InsAreaCompany insAreaCompany,
+                                               HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse) {
         HuaTaiSubmitCommon huaTaiSubmitCommon = new HuaTaiSubmitCommon();
         boolean haveJQFlag = false;
         boolean haveSYFlag = false;
@@ -689,12 +722,15 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
      * @return
      */
     private HuaTaiSubmitStatusQueryResponse submitStatus(InsAreaCompany insAreaCompany,
-                                                         HuaTaiConfigureParameters huaTaiConfigureParameters, String operateType) {
-        HuaTaiSubmitStatusQueryRequest huaTaiSubmitStatusQueryRequest = new HuaTaiSubmitStatusQueryRequest(insAreaCompany,
-                huaTaiConfigureParameters, operateType);
+                                                         HuaTaiConfigureParameters huaTaiConfigureParameters,
+                                                         String operateType) {
+        HuaTaiSubmitStatusQueryRequest huaTaiSubmitStatusQueryRequest =
+                new HuaTaiSubmitStatusQueryRequest(insAreaCompany,
+                        huaTaiConfigureParameters, operateType);
         huaTaiSubmitStatusQueryRequest.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
         HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse =
-                huaTaiRequestApiComponents.submitStatus(huaTaiSubmitStatusQueryRequest, HuaTaiSubmitStatusQueryResponse.class);
+                huaTaiRequestApiComponents.submitStatus(huaTaiSubmitStatusQueryRequest,
+                        HuaTaiSubmitStatusQueryResponse.class);
         return submitStatusQueryResponse;
     }
 }