From 06e6c9543f5b00683971c6f226447d41506928d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 22 Sep 2026 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20syncKingdeeInvoiceResult=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96N+1=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=92=8C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5/=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InvoiceApplicationServiceImpl.java   | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
index b3558f83..40c18b2d 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.transport.service.impl;
 
+import com.baomidou.mybatisplus.extension.toolkit.Db;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -790,6 +791,12 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 						continue;
 					}
 					log.info("金蝶开票结果回写批次查询成功：serialNo=[{}]，返回单据数={}", batchSerialNos, result.getData().size());
+					// 批量查询当前批次已存在的发票号码（避免 N+1）
+					Set<String> existingInvoiceNos = batchQueryExistingInvoiceNos(batch);
+					log.debug("金蝶开票结果回写：批次已存在发票号码数={}", existingInvoiceNos.size());
+					// 收集待插入的发票记录和待更新的开票申请
+					List<InvoiceApplicationInvoice> toInsertInvoices = new ArrayList<>();
+					List<InvoiceApplication> toUpdateApplications = new ArrayList<>();
 					for (BfiInvoiceApplyOpenApiBillVO bill : result.getData()) {
 						String billNo = bill.getBillNo();
 						InvoiceApplication application = applicationBySerialNo.get(billNo);
@@ -802,11 +809,8 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 							if (Func.isBlank(invoiceNo)) {
 								continue;
 							}
-							Long exists = invoiceApplicationInvoiceMapper.selectCount(
-								Wrappers.<InvoiceApplicationInvoice>lambdaQuery()
-									.eq(InvoiceApplicationInvoice::getInvoiceApplicationId, application.getId())
-									.eq(InvoiceApplicationInvoice::getInvoiceNo, invoiceNo));
-							if (exists != null && exists > 0) {
+							// 使用批量查询结果判断是否已存在
+							if (existingInvoiceNos.contains(invoiceNo)) {
 								log.debug("金蝶开票结果回写：发票号码[{}]已存在，跳过", invoiceNo);
 								continue;
 							}
@@ -817,8 +821,10 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 							record.setInvoiceDate(parseInvoiceDateTimestamp(invoice.getInvoiceDate()));
 							record.setInvoiceAmount(invoice.getIncludeTaxAmount());
 							record.setRawJson(JsonUtil.toJson(invoice));
-							invoiceApplicationInvoiceMapper.insert(record);
+							toInsertInvoices.add(record);
 							inserted++;
+							// 标记为已存在，避免同批次重复插入
+							existingInvoiceNos.add(invoiceNo);
 							log.info("金蝶开票结果回写：写入发票，申请单号=[{}]，单据编号=[{}]，发票号码=[{}]，含税金额=[{}]",
 								application.getApplicationNo(), billNo, invoiceNo, invoice.getIncludeTaxAmount());
 						}
@@ -826,11 +832,21 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 							invoiceWritten += inserted;
 							// 查到发票：开票申请单推进开票完成（终态）
 							application.setKingdeeStatus(KingdeeBfiConstant.KINGDEE_STATUS_INVOICED);
-							updateById(application);
+							toUpdateApplications.add(application);
 							invoicedCount++;
 							log.info("金蝶开票结果回写：开票申请[{}]状态推进为invoiced，本次写入发票{}张", application.getApplicationNo(), inserted);
 						}
 					}
+					// 批量插入发票记录
+					if (!toInsertInvoices.isEmpty()) {
+						Db.saveBatch(toInsertInvoices);
+						log.info("金蝶开票结果回写：批量插入发票记录{}条", toInsertInvoices.size());
+					}
+					// 批量更新开票申请状态
+					if (!toUpdateApplications.isEmpty()) {
+						updateBatchById(toUpdateApplications);
+						log.info("金蝶开票结果回写：批量更新开票申请状态{}笔", toUpdateApplications.size());
+					}
 				} catch (Exception exception) {
 					failed++;
 					log.error("金蝶开票结果回写批次异常：serialNo=[{}]", batchSerialNos, exception);
@@ -843,6 +859,23 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 			+ "笔），回写发票" + invoiceWritten + "张（开票完成" + invoicedCount + "笔，失败批次" + failed + "个）";
 	}
 
+	/**
+	 * 批量查询当前批次已存在的发票号码
+	 *
+	 * @param serialNos 单据编号列表
+	 * @return 已存在的发票号码集合
+	 */
+	private Set<String> batchQueryExistingInvoiceNos(List<String> serialNos) {
+		List<InvoiceApplicationInvoice> existingList = invoiceApplicationInvoiceMapper.selectList(
+			Wrappers.<InvoiceApplicationInvoice>lambdaQuery()
+				.in(InvoiceApplicationInvoice::getSerialNo, serialNos)
+				.select(InvoiceApplicationInvoice::getInvoiceNo));
+		return existingList.stream()
+			.map(InvoiceApplicationInvoice::getInvoiceNo)
+			.filter(Func::isNotBlank)
+			.collect(Collectors.toSet());
+	}
+
 	/** 从票易通原文 Map 中按候选键顺序取首个非空文本值 */
 	private String firstText(Map<?, ?> map, String... keys) {
 		for (String key : keys) {