From 1e4ab52c1e4f746c13ff023f3d91896a7382ff81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= Date: Mon, 29 Jun 2026 15:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E4=BB=93=E6=80=BB=E9=A2=9D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index 6cd59d66..c9ee0921 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -413,9 +413,9 @@ namespace YLErp.Modules.SwapModule var ratio = x.InterestDirection == (int)SwapDirectionEnum.收取 ? 1 : -1; interestTotal += x.InterestClosePnL * ratio; }); - unwindData.SwapCloseAmount = interestTotal; + unwindData.SwapCloseAmount = interestTotal + unwindData.SwapMarginRebatePnl;//需要算上预付金利息，只是不要算预付金返还 unwindData.SwapDividendPnl = 0; - unwindData.SwapRealizedPnL = unwindData.SwapCloseAmount + unwindData.SwapMarginRebatePnl; + unwindData.SwapRealizedPnL = unwindData.SwapCloseAmount; SaveAutoSwapDeal(td, autoInterests, unwindData, interval); } @@ -491,7 +491,7 @@ namespace YLErp.Modules.SwapModule unwindData.PosiNotionalValue = curEodPositions.Sum(x => x.PosiNotionalValue); unwindData.PayDate = dividendPayDate; unwindData.SwapDividendPnl = dividendTotal; - unwindData.SwapCloseAmount = 0; + unwindData.SwapCloseAmount = dividendTotal;//需要算上分红 unwindData.SwapMarginRebatePnl = 0; unwindData.SwapRealizedPnL = dividendTotal;