From f3ed08f71b8a3d6edccf656195f686469498fc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= Date: Thu, 27 Aug 2026 14:33:12 +0800 Subject: [PATCH] =?UTF-8?q?#EQD-6949=20=E5=9B=BD=E8=81=94=E6=B0=91?= =?UTF-8?q?=E7=94=9F-=E6=94=AF=E6=8C=81=E4=BC=B0=E5=80=BC=E6=A0=B8?= =?UTF-8?q?=E5=AF=B9=EF=BC=88=E5=90=AB=E6=9C=9F=E5=88=9D=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E7=9B=91=E6=8E=A7=EF=BC=89=EF=BC=88=E8=B5=84=E9=87=91?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs | 6 ++++-- YLErpWeb/Controllers/clientController.cs | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) 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)