From 4a18dd874e5b94ece5e708378bd2b0c6da1c7b29 Mon Sep 17 00:00:00 2001 From: hjhan Date: Wed, 11 Feb 2026 17:27:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(swap):=20EQD-4485=20=E4=BF=AE=E5=A4=8DFR007?= =?UTF-8?q?=E6=96=B9=E5=90=91=E4=B8=BA=E7=A9=BA=E5=A4=B4=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=20eod=5Fswap=5Fposition=E7=9A=84'=E4=BA=92?= =?UTF-8?q?=E6=8D=A2=E6=8C=81=E4=BB=93=E4=BB=B7=E5=80=BC'=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20SwapPositionValue=20=E9=87=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=88=A9=E6=81=AF=E6=B1=87=E6=80=BB=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=80=83=E8=99=91=E6=96=B9=E5=90=91=EF=BC=8C=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=B8=A6=E6=96=B9=E5=90=91=E7=9A=84=20InterestClosePn?= =?UTF-8?q?L?= 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 e5eb3ec2..b1e81299 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -716,7 +716,7 @@ namespace YLErp.Modules.SwapModule } var interests = new SwapDealService(this).GetInterests(td, td.trade_extend, valueDate, valueDate, preEodPositions, positions, posiNotionalValue, posiLongNotional, posiShortNational, posiNotionalValue, closePercent, (int)SwapEventTypeEnum.自动互换, false, true, grossPrice, orginPv, true); decimal InterestAmount = interests.Sum(x => x.InterestAmount); - decimal TdInterestAmount = interests.Sum(x => x.TdInterestAmount); + decimal TdInterestAmount = interests.Sum(x => x.InterestClosePnL); newEodPayPosition.ValueDate = valueDate; newEodPayPosition.PositionId = position.id; @@ -823,7 +823,7 @@ namespace YLErp.Modules.SwapModule List preEodPositions = new List(); preEodPositions.Add(eodPayPosition); var interests = new SwapDealService(this).GetInterests(td, td.trade_extend, valueDate, valueDate, preEodPositions, positions, posiNotionalValue, posiLongNotional, posiShortNational, closeNational, 1, eventType, false, true, grossPrice, orginPv, true); - decimal TdInterestAmount = interests.Sum(x => x.TdInterestAmount); + decimal TdInterestAmount = interests.Sum(x => x.InterestClosePnL); newEodPayPosition.ValueDate = valueDate; newEodPayPosition.PositionId = position.id; @@ -975,7 +975,7 @@ namespace YLErp.Modules.SwapModule newEodPayPosition.Invalid = false; newEodPayPosition.ValueDate = valueDate; decimal InterestAmount = interests.Sum(s => s.InterestAmount); - decimal TdInterestAmount = interests.Sum(x => x.TdInterestAmount); + decimal TdInterestAmount = interests.Sum(x => x.InterestClosePnL); //利息端估值用信息 newEodPayPosition.TdInterestPrincipal = interests.Count > 0 ? interests.First().InterestPrincipal : 0; newEodPayPosition.TdInterestRate = interests.Count > 0 ? interests.First().InterestRate : 0;