diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java index 3c544eb..c485ab4 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java @@ -912,13 +912,12 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi } - // 2023/11/16 kk:上传OSS转下载地址关闭,改为直接返回大象的文件流 - invoice.setInvoicePdfUrl(ELE_File_URL + pdfFileId + ";" + "http://127.0.0.1:8081/invoice/xmlFileUrl/" + xmlFileId); ICompanyservicePropService companyserviceProp = SpringUtils.getBean(ICompanyservicePropService.class); - CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "elephant_invoice_file_dc"); - if (secretIdProp != null) { + CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "weijiao_invoice_key"); + invoice.setInvoicePdfUrl(ELE_File_URL + pdfFileId + ";" + secretIdProp.getValue() + xmlFileId); + /*if (secretIdProp != null) { invoice.setInvoicePdfUrl(secretIdProp.getValue() + fileId); - } + }*/ } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index 645e80e..9d285e8 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -1019,13 +1019,13 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { } - // 2023/11/16 kk:上传OSS转下载地址关闭,改为直接返回大象的文件流 - invoice.setInvoicePdfUrl(ELE_File_URL + pdfFileId + ";" + "http://127.0.0.1:8081/invoice/xmlFileUrl/" + xmlFileId); + ICompanyservicePropService companyserviceProp = SpringUtils.getBean(ICompanyservicePropService.class); - CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "elephant_invoice_file_dc"); - if (secretIdProp != null) { + CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "weijiao_invoice_key"); + invoice.setInvoicePdfUrl(ELE_File_URL + pdfFileId + ";" + secretIdProp.getValue() + xmlFileId); + /*if (secretIdProp != null) { invoice.setInvoicePdfUrl(secretIdProp.getValue() + fileId); - } + }*/ }