From d2bd36b4f8c8bb1d20e5860434be3a94c1d4a5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 14:16:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E6=AC=BE=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D=E6=94=B9=E5=8F=96A301-1?=
 =?UTF-8?q?=E4=B8=BB=E5=8D=95=E5=85=A5=E8=B4=A6=E9=87=91=E9=A2=9Dinneracco?=
 =?UTF-8?q?untamount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/KingdeeReceiptFlow.java       |  2 +-
 .../service/impl/ReceiptFlowServiceImpl.java  | 25 +++++--------------
 .../thirdparty/bfi/pojo/vo/BfiRecBillVO.java  |  5 ++++
 ...�A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md |  2 +-
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java
index 16a09b7b..40d5c393 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java
@@ -89,7 +89,7 @@ public class KingdeeReceiptFlow extends TenantEntity {
 	 */
 	private String payerName;
 	/**
-	 * 收款金额（A301-1 流水分录 bei_creditamount，兜底主单 actrecamt）
+	 * 收款金额（A301-1 主单入账金额 inneraccountamount）
 	 */
 	private BigDecimal receiptAmount;
 	/**
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
index f7ced5f8..1ea5162e 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
@@ -471,13 +471,14 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 				if (validRows.containsKey(detailSerialNo)) {
 					throw new ServiceException("明细流水号" + detailSerialNo + "重复");
 				}
-				BigDecimal receiptAmount = parseEntryAmount(flowEntry.getBeiCreditamount(), recBill.getActrecamt());
+				// 收款金额取主单入账金额 inneraccountamount（金蝶口径，非流水分录 bei_creditamount）
+				BigDecimal receiptAmount = money(recBill.getInneraccountAmount());
 				if (receiptAmount.compareTo(BigDecimal.ZERO) <= 0) {
-					log.warn("收款流水同步跳过：收款单[{}]流水分录收款金额为空或小于0", recBill.getBillno());
+					log.warn("收款流水同步跳过：收款单[{}]收款金额（inneraccountamount）为空或小于0", recBill.getBillno());
 					skippedCount++;
 					continue;
 				}
-				validRows.put(detailSerialNo, new BfiRecBillRow(recBill, flowEntry, detailSerialNo, receiptAmount));
+				validRows.put(detailSerialNo, new BfiRecBillRow(recBill, detailSerialNo, receiptAmount));
 			}
 		}
 		log.info("收款流水数据校验完成：有效 {} 条，跳过 {} 条", validRows.size(), skippedCount);
@@ -579,7 +580,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	/**
 	 * A301-1 收款单查询返回的收款单 + 流水分录展开行（同步过程传递用）
 	 */
-	private record BfiRecBillRow(BfiRecBillVO recBill, BfiRecBillFlowVO flowEntry,
+	private record BfiRecBillRow(BfiRecBillVO recBill,
 								 String detailSerialNo, BigDecimal receiptAmount) {
 	}
 
@@ -816,7 +817,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		target.setPayerName(trimToEmpty(source.getPayername()));
 		// 收款人（收款公司名称）
 		target.setPayeeName(trimToNull(source.getOrgName()));
-		// 收款金额（流水分录金额）
+		// 收款金额（主单入账金额 inneraccountamount）
 		target.setReceiptAmount(row.receiptAmount());
 		// 对方单位名称（取付款人名称）
 		target.setCounterpartyName(trimToEmpty(source.getPayername()));
@@ -859,20 +860,6 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		return KingdeeBfiConstant.KINGDEE_STATUS_FAILED;
 	}
 
-	/**
-	 * 流水分录收款金额解析：bei_creditamount 为字符串，空或非法时回退主单收款金额
-	 */
-	private BigDecimal parseEntryAmount(String entryAmount, BigDecimal fallbackAmount) {
-		if (Func.isNotEmpty(entryAmount)) {
-			try {
-				return new BigDecimal(entryAmount.trim());
-			} catch (NumberFormatException exception) {
-				log.warn("解析金蝶流水分录收款金额失败，原始值：{}，回退主单收款金额", entryAmount);
-			}
-		}
-		return money(fallbackAmount);
-	}
-
 	private String firstNonBlank(String... values) {
 		for (String value : values) {
 			if (Func.isNotEmpty(value)) {
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/vo/BfiRecBillVO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/vo/BfiRecBillVO.java
index fd0bbab6..6b3596b8 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/vo/BfiRecBillVO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/vo/BfiRecBillVO.java
@@ -135,6 +135,11 @@ public class BfiRecBillVO implements Serializable {
 	 */
 	@JsonProperty("txt_description")
 	private String txtDescription;
+	/**
+	 * 收款金额（入账金额，收款流水收款金额取此字段）
+	 */
+	@JsonProperty("inneraccountamount")
+	private BigDecimal inneraccountAmount;
 	/**
 	 * 收款金额
 	 */
diff --git a/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md b/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
index a4bf4b55..6fccc714 100644
--- a/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
+++ b/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
@@ -74,7 +74,7 @@ A301-1 收款单查询（业务日期窗口取 `thirdParty.bfi.recBillSync.days`
 | receipt_notice_no / kingdee_bill_no | `billno` | 金蝶收款单号（两处同值） |
 | kingdee_bill_status | `billstatus` 映射 | A/B已提交→pushed、C已审核→approved、D已收款→received、其余（含G退单）→failed |
 | detail_serial_no | `infoentry[].bei_detailid`，兜底 `bei_bankdetailno` | **幂等键**；每条流水分录展开为一行流水 |
-| receipt_amount | `infoentry[].bei_creditamount`，兜底主单 `actrecamt` | 流水分录收款金额 |
+| receipt_amount | 主单 `inneraccountamount` | 收款金额（入账金额口径，非流水分录 bei_creditamount） |
 | unclaimed_amount | `unmatchamountrec` | 未匹配收款金额，**认领上限口径** |
 | payer_name / counterparty_name | `payername` | 付款人名称 |
 | payee_name | `org_name` | 收款公司名称 |