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;