From e52f5bfeb56f2406fa68105dc64b214399aa4c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=86=B0=E5=86=B0?= <437394478@qq.com>
Date: Fri, 28 Aug 2026 11:28:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=93=E7=AE=97=E5=8D=95-=E6=9C=9F?=
 =?UTF-8?q?=E9=97=B4=E5=88=86=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TradeSettleBillGenerator.cs                 |  6 ------
 .../SwapSettlementBillRowBuilder.cs             | 17 +++++++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeSettleBillGenerator.cs b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeSettleBillGenerator.cs
index 1521fbb4..1109b485 100644
--- a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeSettleBillGenerator.cs
+++ b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeSettleBillGenerator.cs
@@ -74,11 +74,6 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator
                 var underlying = Context.GetTradeUnderlying(flowEventGroup.UnderlyingCode);
                 var closeNotionalValue = unwindData?.CloseNotionalValue
                     ?? flowEventGroup.Quantity * flowEventGroup.ContractSize * posi.PosiGrossPrice;
-                var settlementDate = flowEventGroup.UnwindDate
-                    ?? throw new ServiceException($"平仓事件{flowEventGroup.id}缺少结算日");
-                var currentDayFloatingDividend = Context.GetEodPositions(tradeId, settlementDate)
-                    .FirstOrDefault(x => x.PositionId == flowEventGroup.PositionId)
-                    ?.TdPosiDividend ?? 0m;
 
                 // 行构造器统一处理客户视角、结算公式、品种差异和模板展示精度。
                 var row = SwapSettlementBillRowBuilder.Build(new SwapSettlementBillRowInput
@@ -91,7 +86,6 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator
                     Positions = positions,
                     UnderlyingInstrumentType = underlying?.UnderlyingInstrumentType,
                     CloseNotionalValue = closeNotionalValue,
-                    CurrentDayFloatingDividend = currentDayFloatingDividend,
                     // 与提前终止详情页保持同一来源：读取 swap_flow_event 中的平仓浮动腿记录。
                     ExitYtm = flowEventGroup.ExitYtm,
                     IncludePeriodPaymentInNetting = (tradeExtend?.ExtendObj?.DividendPayDate ?? 1) == 0
diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/SwapSettlementBillRowBuilder.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/SwapSettlementBillRowBuilder.cs
index d6063274..70e81e8a 100644
--- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/SwapSettlementBillRowBuilder.cs
+++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/SwapSettlementBillRowBuilder.cs
@@ -9,7 +9,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule;
 
 /// <summary>
 /// 构造普通收益互换结算单单行数据所需的业务输入。
-/// 数据来自平仓事件、关联交易及结算日日终持仓。
+/// 数据来自平仓事件及其关联交易。
 /// </summary>
 public sealed class SwapSettlementBillRowInput
 {
@@ -40,9 +40,6 @@ public sealed class SwapSettlementBillRowInput
     /// <summary>平仓事件浮动腿记录的期末结算收益率（展示态数值）。</summary>
     public decimal? ExitYtm { get; set; }
 
-    /// <summary>结算日日终持仓中的当日浮动端分红，保留原始收付方向。</summary>
-    public decimal CurrentDayFloatingDividend { get; set; }
-
     /// <summary>期间付息或分红是否计入本次净额结算。</summary>
     public bool IncludePeriodPaymentInNetting { get; set; }
 }
@@ -89,6 +86,7 @@ public static class SwapSettlementBillRowBuilder
         var floatingAmount = -input.CloseFlow.MarkClosePnl;
         var fee = -(input.CloseFlow.TradingFee + input.CloseFlow.TradingFeePending);
         var marginInterest = -marginEvents.Sum(x => x.InterestClosePnL);
+        var periodAmount = -input.CloseFlow.DividendPending;
         var initialMargin = SumMargin(effectiveMargins, InterestModeEnum.初始预付金);
       
         var additionalMarginPositions = positions
@@ -106,6 +104,9 @@ public static class SwapSettlementBillRowBuilder
 
        
         var isCashBond = ConsGlobal.InstrumentType.IsBond(input.UnderlyingInstrumentType);
+        var isEtf = ConsGlobal.InstrumentType.Fund.Equals(
+            input.UnderlyingInstrumentType,
+            StringComparison.OrdinalIgnoreCase);
 
 
         return new ExcelReportModel
@@ -121,11 +122,11 @@ public static class SwapSettlementBillRowBuilder
             PosiNotionalValue = input.CloseNotionalValue.ToString("0.00"),
             Quantity = input.CloseFlow.Quantity.ToString("0.00"),
             DividendIn = isCashBond
-                ? input.CurrentDayFloatingDividend.ToString("0.00")
+                ? periodAmount.ToString("0.00")
+                : string.Empty,
+            PeriodDividend = isEtf
+                ? periodAmount.ToString("0.00")
                 : string.Empty,
-            PeriodDividend = isCashBond
-                ? string.Empty
-                : input.CurrentDayFloatingDividend.ToString("0.00"),
             PosiNetPrice = ((settlementPosition?.PosiGrossPrice ?? 0m) * 100m).ToString("0.00000000"),
             InitYtm = isCashBond && input.Trade.InitYtm.HasValue
                 ? input.Trade.InitYtm.Value.ToString("0.####%")