From a17a0a8b1e4ee2c2c11a5e2a6bd91d682a9191b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 21 Oct 2026 14:43:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E8=BD=AC=E6=AD=A3=E5=BC=8F=E5=90=8E=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9C=AA=E6=89=A3=E5=87=8F=E9=A2=84=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PaymentApplicationServiceImpl.java   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index 2836e87d..d9524ac5 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -321,11 +321,14 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		BigDecimal writeOffAmount = preSettlementReference
 			? projectAdvanceWriteOffService.sumBySettlement(TransportBusiConstant.SETTLEMENT_BILL_PRE, referenceId)
 			: projectAdvanceWriteOffService.sumBySettlement(TransportBusiConstant.SETTLEMENT_BILL_FORMAL, referenceId);
+		// 预结算转正式时，来源预结算的已付预付款已计入正式结算单已付，尾款可付金额需同步扣减
+		BigDecimal advancePaidAmount = preSettlementReference ? BigDecimal.ZERO
+			: this.formalSettlementAdvancePaid(referenceId);
 		PaymentApplicationReferenceAmountVO amount = new PaymentApplicationReferenceAmountVO();
 		amount.setSettlementAmount(settlementAmount);
-		amount.setCumulativeAppliedAmount(cumulativeAppliedAmount.add(writeOffAmount));
+		amount.setCumulativeAppliedAmount(cumulativeAppliedAmount.add(writeOffAmount).add(advancePaidAmount));
 		amount.setPayableAmount(settlementAmount.subtract(cumulativeAppliedAmount).subtract(writeOffAmount)
-			.max(BigDecimal.ZERO));
+			.subtract(advancePaidAmount).max(BigDecimal.ZERO));
 		amount.setPaymentSequence(resolvePaymentSequence(preSettlementReference, referenceId, excludeId));
 		return amount;
 	}
@@ -2358,15 +2361,30 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		return relationAmount.add(legacyAmount);
 	}
 
-	/** 正式结算可付款 = 结算金额 − 已申请付款 − 项目预付核销 */
+	/** 正式结算可付款 = 结算金额 − 已申请付款 − 项目预付核销 − 来源预结算已付预付款 */
 	private BigDecimal payableOfFormalSettlement(Long settlementId, BigDecimal settlementAmount, Long excludeId) {
 		return money(settlementAmount)
 			.subtract(cumulativeFormalSettlementApplied(settlementId, excludeId))
 			.subtract(projectAdvanceWriteOffService.sumBySettlement(
 				TransportBusiConstant.SETTLEMENT_BILL_FORMAL, settlementId))
+			.subtract(this.formalSettlementAdvancePaid(settlementId))
 			.max(BigDecimal.ZERO);
 	}
 
+	/** 正式结算单来源预结算的已付预付款合计（转正式时已计入结算单已付） */
+	private BigDecimal formalSettlementAdvancePaid(Long formalSettlementId) {
+		if (formalSettlementId == null) {
+			return BigDecimal.ZERO;
+		}
+		return formalSettlementSourceMapper.selectList(Wrappers.<FormalSettlementSource>lambdaQuery()
+				.select(FormalSettlementSource::getAdvancePaidAmount)
+				.eq(FormalSettlementSource::getFormalSettlementId, formalSettlementId)
+				.eq(FormalSettlementSource::getIsDeleted, 0)).stream()
+			.map(FormalSettlementSource::getAdvancePaidAmount)
+			.map(this::money)
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+	}
+
 	/** 预结算可付款 = 结算金额 − 已申请付款 − 项目预付核销 */
 	private BigDecimal payableOfPreSettlement(Long preSettlementId, BigDecimal settlementAmount, Long excludeId) {
 		return money(settlementAmount)