From 75895d518d0187c62a4ff820c2abbb49af2d6c24 Mon Sep 17 00:00:00 2001 From: xingze <13153582609@163.com> Date: Wed, 9 Apr 2025 14:10:42 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E6=BD=8D=E7=84=A6=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2url=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ElephantInvoiceApiV6ByInspurServiceImpl.java | 9 ++++----- .../impl/api/ElephantInvoiceApiV6ServiceImpl.java | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) 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); - } + }*/ }