修改生成的保单路径

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

@@ -25,7 +25,6 @@ import com.ydtech.modules.order.entity.dto.ReadPdfUrlListDto;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
-import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
@@ -35,10 +34,7 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateUtil_N;
-import com.ydtech.utils.OrderUtils;
 import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.baidu.FileUtil;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -796,7 +792,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         CrawlerPolicyPrintVo crawlerPolicyPrintVo = new CrawlerPolicyPrintVo();
         try{
             //文件前缀
-            String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-";
+            String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno() +"-"+insAreaCompany.getId()+"-";
             CustomerInfoVo customerInfoVo = insOrders.getApplyinfo().toJavaObject(CustomerInfoVo.class);
             // 账号信息
             PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());

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

@@ -26,7 +26,6 @@ import com.ydtech.modules.order.entity.api.dajia.constants.CProdNo;
 import com.ydtech.modules.order.entity.api.dajia.constants.Message;
 import com.ydtech.modules.order.entity.api.dajia.request.*;
 import com.ydtech.modules.order.entity.api.dajia.response.*;
-import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.dto.ReadPdfUrlListDto;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
@@ -42,7 +41,6 @@ import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateTimeUtil;
-import com.ydtech.utils.OrderUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1020,7 +1018,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
     public String getPdfUrl(InsAreaCompany insAreaCompany, InsOrders insOrders,String jqFlag,String jqSignFlag,String policyNo,boolean flag) {
         try {
             //文件前缀
-            String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-"+policyNo+"-";
+            String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno()+"-"+ insAreaCompany.getId()+"-"+policyNo+"-";
             if(org.apache.commons.lang3.StringUtils.isBlank(policyNo)){
                 return null;
             }

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

@@ -1277,7 +1277,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
     }
     public String getPdfUrl(InsAreaCompany insAreaCompany, InsOrders insOrders,String jqFlag,String jySignFlag,String policyNo,boolean flag) {
         //文件前缀
-        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-"+policyNo+"-";
+        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno()+"-"+ insAreaCompany.getId()+"-"+policyNo+"-";
         if(org.apache.commons.lang3.StringUtils.isBlank(policyNo)){
             return null;
         }

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

@@ -2,9 +2,6 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.alibaba.fastjson.JSON;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.ydtech.constants.enums.InsuranceOrderPdf;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
@@ -14,7 +11,7 @@ import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.ins.model.vo.*;
-import com.ydtech.modules.ins.model.ya.*;
+import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.huatai.HuaTaiQuotationProcessorComponent;
 import com.ydtech.modules.order.components.huatai.HuaTaiRequestApiComponents;
@@ -31,7 +28,6 @@ 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.*;
 import com.ydtech.modules.order.entity.config.HuaTaiConfigureParameters;
-import com.ydtech.modules.order.entity.config.YaConfigureParameters;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.dto.ReadPdfUrlListDto;
@@ -846,7 +842,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     @Override
     public ReadPdfUrlListDto getPolicyByCompanyIdPdfList(InsAreaCompany insAreaCompany,InsOrders insOrders,boolean flag) {
         //文件前缀
-        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-";
+        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno()+"-"+ insAreaCompany.getId()+"-";
         CrawlerPolicyPrintVo jqEntity = getPdfUrl(insAreaCompany, insOrders,InsuranceRisk.TRAFFIC.getCode(),insAreaCompany.getJqapplyno(),pathPrefix,flag);
         String jqPath = jqEntity.getJqxPolicyUrl();
         String jqSignPath = jqEntity.getJqxFlagUrl();

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

@@ -605,7 +605,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     public CrawlerPolicyPrintVo getPdfUrl(InsAreaCompany insAreaCompany, InsOrders insOrders,boolean flag) {
         CrawlerPolicyPrintVo crawlerPolicyPrintVo = new CrawlerPolicyPrintVo();
         //文件前缀
-        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-";
+        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno()+"-"+ insAreaCompany.getId()+"-";
         // 请求地址
         String apiUrl = ptlCrawlerApiService.getApiUrl(insAreaCompany.getAgreementId(), PtlCrawlerApiType.API_6);
         //组装参数

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -2639,7 +2638,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     public String getPdfUrl(InsAreaCompany insAreaCompany, InsOrders insOrders,String jqFlag,String jqSignFlag,String policyNo,boolean flag) {
         String path=null;
         //文件前缀
-        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insAreaCompany.getId()+"-"+insOrders.getLicenseno() +"-"+policyNo+"-";
+        String  pathPrefix = insAreaCompany.getInscompany()+"-"+insOrders.getLicenseno()+"-"+ insAreaCompany.getId()+"-"+policyNo+"-";
         if(org.apache.commons.lang3.StringUtils.isBlank(policyNo)){
            return null;
         }