diff --git a/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs b/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs index 52ffb2ca..a4cc847b 100644 --- a/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs +++ b/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs @@ -1627,8 +1627,10 @@ namespace YLErp.BLL.EodSettlement VmFundSum = roundFunc(item.VmFundSum), OtherFund = roundFunc(item.OtherFund), AmountFund = roundFunc(item.AmountFund), - MySideMargin = roundFunc(item.MySideMargin), - MaintenanceMargin = roundFunc(item.MaintenanceMargin), + //初始/维持保证金金额与每日估值报告同口径(SettlementReportService 账户状况块): + //初始=应付预付金流水净额(SwapInitMargin),维持=−MySideMargin(client_span 反号聚合) + MySideMargin = roundFunc(item.SwapInitMargin), + MaintenanceMargin = roundFunc(-item.MySideMargin), SwapMarketAmount = roundFunc(item.SwapMarketAmount), SwapMarketAmountPercent = item.SwapMarketAmountPercent, AvailableAmount = roundFunc(item.AvailableAmount), diff --git a/YLErpWeb/Controllers/clientController.cs b/YLErpWeb/Controllers/clientController.cs index f1aaae6d..2c7dd6d7 100644 --- a/YLErpWeb/Controllers/clientController.cs +++ b/YLErpWeb/Controllers/clientController.cs @@ -671,7 +671,8 @@ namespace YLErp.Web.Controllers x.PayableMargin = clientBalance.PayableMargin; x.TwoSideMargin = clientBalance.TwoSideMargin; x.OtherSideMargin = -clientBalance.OtherSideMargin; - x.MySideMargin = clientBalance.MySideMargin; + //初始保证金金额=应付预付金流水收付净额(与每日估值报告"初始保证金金额"同口径,SwapInitMargin) + x.MySideMargin = clientBalance.SwapInitMargin; x.DeltaMargin = -clientBalance.DeltaMargin; x.IsPayableMarginManual = clientBalance?.IsPayableMarginManual; x.AvailableAmount = clientBalance.AvailableAmount; @@ -689,7 +690,9 @@ namespace YLErp.Web.Controllers x.EndDesirableFund = x.NetFund + x.SettlementBalance + clientBalance.EndPremiumSum; x.SwapMarketAmount= clientBalance.SwapMarketAmount; x.SwapMarketAmountPercent=clientBalance.SwapMarketAmountPercent; - x.MaintenanceMargin=clientBalance.MaintenanceMargin; + //维持保证金金额=−MySideMargin(client_span 维持保证金反号聚合,与每日估值报告"维持保证金金额"同口径; + //原取 client_span.VariationMargin——该列全库无写入方恒为0) + x.MaintenanceMargin = -(clientBalance.MySideMargin); x.NeedAddMargin=clientBalance.NeedAddMargin; x.LastDayRemainFund=clientBalance.LastDayRemainFund; if (clientBalance.MarginOccupation == 0)