From ab70531f17289a30a619b8f1e17527308379e9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Fri, 26 Jun 2026 11:03:22 +0800
Subject: [PATCH] =?UTF-8?q?MarkClosePnl=20=E4=B8=8D=E8=A6=81=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=AE=A1=E7=AE=97=E5=88=86=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpDAL/Modules/SwapModule/SwapDealService.cs            | 3 ++-
 YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs     | 2 +-
 YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js | 2 +-
 YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
index d6410ebd..beca764f 100644
--- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
@@ -1099,7 +1099,8 @@ namespace YLErp.Modules.SwapModule
                 floatEvent.TradingFeePending = Math.Round(floatEvent.TradingFeePending, ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
                 floatEvent.TradingFee = closeFee;
                 floatEvent.MarkClosePnl = (unwindPrice - position.PosiGrossPrice) * unwindQty * floatRatio * longRatio;
-                floatEvent.MarkClosePnl = Math.Round(floatEvent.MarkClosePnl + ((floatEvent.TradingFeePending + closeFee) * floatRatio * -1) + floatEvent.DividendIn, ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
+                //修改，盯市不要加上 分红
+                floatEvent.MarkClosePnl = Math.Round(floatEvent.MarkClosePnl + ((floatEvent.TradingFeePending + closeFee) * floatRatio * -1), ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
                 floatEvent.TradingAmount = unwindPrice * floatEvent.Quantity * floatEvent.ContractSize;
                 floatEvent.TradingAmount = Math.Round(floatEvent.TradingAmount, ConsGlobal.MoneyRound, MidpointRounding.AwayFromZero);
                 floatEvent.OptLog = "流水自动";
diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
index 7f82d224..8e1598d7 100644
--- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs
@@ -460,7 +460,7 @@ namespace YLErp.Modules.SwapModule
                     TradingAmountNetAvg = eodPosi.PosiNetNoFeePrice,
                     PosiGrossPrice = eodPosi.PosiGrossPrice,
                     PosiNetPrice = eodPosi.PosiNetPrice,
-                    MarkClosePnl = eodPosi.PosiDividendSum,
+                    MarkClosePnl = 0,//当日盯市不要计算分红
                     DividendIn = eodPosi.PosiDividendSum,
                     CloseFee = 0,
                     TradingFee = 0,
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
index 311f90ef..737ae589 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
@@ -131,7 +131,7 @@ const vue = new Vue({
             let DividendIn = thisObj.floatPosition.DividendIn == "" ? 0 : parseFloat(thisObj.floatPosition.DividendIn ?? 0);
             let scale = thisObj.getPriceScale();
             thisObj.floatPosition.MarkClosePnl = thisObj.deal.CloseNotionalValue * (thisObj.floatPosition.TradingAmountAvg * scale - thisObj.initPosiNetPrice) * floatRatio;
-            thisObj.floatPosition.MarkClosePnl = thisObj.floatPosition.MarkClosePnl + TradingFee + TradingFeePending + DividendIn;
+            thisObj.floatPosition.MarkClosePnl = thisObj.floatPosition.MarkClosePnl + TradingFee + TradingFeePending;//当日盯市不要计算分红
             thisObj.floatPosition.MarkClosePnl = otcformat.trading.StockEqvNotional(thisObj.floatPosition.MarkClosePnl);
             thisObj.calcCloseAmount();
         },
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js
index 41188b2d..eacde904 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js
@@ -202,7 +202,7 @@ const vue = new Vue({
             let scale = thisObj.getPriceScale();
             thisObj.floatPosition.MarkClosePnl = Math.round(thisObj.deal.CloseQty * (thisObj.floatPosition.TradingAmountAvg * scale - thisObj.initPosiNetPrice) * floatRatio * longRatio * 10000) / 10000;
             thisObj.floatPosition.MarkClosePnl = Number(thisObj.floatPosition.MarkClosePnl.toFixed(2));
-            thisObj.floatPosition.MarkClosePnl = thisObj.floatPosition.MarkClosePnl + (TradingFee + TradingFeePending) * floatRatio * -1 + parseFloat(thisObj.floatPosition.DividendIn);
+            thisObj.floatPosition.MarkClosePnl = thisObj.floatPosition.MarkClosePnl + (TradingFee + TradingFeePending) * floatRatio * -1;//当日盯市不要计算分红
             thisObj.floatPosition.MarkClosePnl = otcformat.trading.StockEqvNotional(thisObj.floatPosition.MarkClosePnl);
             thisObj.calcCloseAmount();