From 1d37596c2d16b9fb3868733a8ea71d8cf47ee0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Mon, 5 Oct 2026 15:52:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A5=A8=E6=B1=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E5=8F=96PDF=E7=89=88=E5=BC=8F(taxPdfUrl)?=
 =?UTF-8?q?=E5=B9=B6=E6=8C=89=E5=AE=9E=E9=99=85=E6=A0=BC=E5=BC=8F=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=BF=AE=E5=A4=8DOFD=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A2=AB=E5=BD=93.pdf=E9=A2=84=E8=A7=88/=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InvoiceReceiptServiceImpl.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
index 823337ea..96e9ed49 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
@@ -1244,13 +1244,21 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 	}
 
 	private String buildAttachmentJson(BfiInvoicePoolVO row) {
-		if (Func.isEmpty(row.getDownloadUrl())) {
+		// 数电票 downloadUrl 可能是 OFD 版式（fileType=4，ZIP 容器），前端按扩展名选预览器：
+		// 依次取 PDF 版式地址（taxPdfUrl/pdfurl，A801-1 样例中两者互有空缺），都缺才用 downloadUrl 并按 fileType 命名
+		String path = Func.isBlank(row.getTaxPdfUrl()) ? row.getPdfurl() : row.getTaxPdfUrl();
+		boolean fromPdfField = !Func.isBlank(path);
+		if (!fromPdfField) {
+			path = row.getDownloadUrl();
+		}
+		if (Func.isBlank(path)) {
 			return null;
 		}
+		boolean ofdOnly = !fromPdfField && "4".equals(row.getFileType());
 		Map<String, Object> attachment = new LinkedHashMap<>();
 		attachment.put("source", "piaozone");
-		attachment.put("path", row.getDownloadUrl());
-		attachment.put("name", row.getInvoiceNo() + ".pdf");
+		attachment.put("path", path);
+		attachment.put("name", row.getInvoiceNo() + (ofdOnly ? ".ofd" : ".pdf"));
 		return JsonUtil.toJson(attachment);
 	}