diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs index 5772c6ba..232622b4 100644 --- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs @@ -408,7 +408,7 @@ namespace YLErp.Modules.SwapModule // EOD 恢复会改变入场基准和有效平仓数量;按当前平仓价重算前端派生盈亏。 // FloatPnlSum 是只读属性,由 MarkClosePnl、费用和分红自动派生,不能直接写入。 - RecalculateNormalizedUnwindAmounts(unwindData); + UnwindNormalizer.RecalculateNormalizedUnwindAmounts(unwindData); } return true; } diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index 07bbac84..3e1a6350 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -791,18 +791,18 @@ namespace YLErp.Modules.SwapModule position.PosiQuantity, position.ContractSize, shortRatio); - position.PosiMtmPnL = RoundMoney(MtmCalc.UnrealizedPnl( + position.PosiMtmPnL = EodPnlCalculator.RoundMoney(MtmCalc.UnrealizedPnl( position.UnderlyingPrice, position.PosiGrossPrice, position.PosiQuantity, position.ContractSize, shortRatio, directionRatio)); - position.PosiProfitSum = RoundMoney(MtmCalc.ReturnLegProfitSum( + position.PosiProfitSum = EodPnlCalculator.RoundMoney(MtmCalc.ReturnLegProfitSum( position.PosiMtmPnL, position.PosiDividendSum, position.PosiFeePending)); - position.SwapPositionValue = RoundMoney(PositionValueCalc.Calc( + position.SwapPositionValue = EodPnlCalculator.RoundMoney(PositionValueCalc.Calc( position.InterestProfitSum, position.PosiProfitSum)); position.PosiStatus = position.PosiQuantity == 0 ? 1 : 0;