From 893d30ab29f17f10aaaf4f68f7a640b620010950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 22 Apr 2025 16:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E7=9B=98=E8=BF=BD=E4=BF=9D=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E8=B5=84=E9=87=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs | 2 +- .../Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs b/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs index f13ec384..80591faa 100644 --- a/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs +++ b/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs @@ -259,7 +259,7 @@ namespace YLErp.BLL.Eod item.LastDayRemainFundWithProduct = item.LastDayRemainFund + item.LastGuaranteesTotalAmount; //当前账号资金 - item.AmountFund = item.AmountFund + item.NetFund + item.OtherFund + item.OptionPremium + item.OptionPremiumSwap + item.SwapBalance + item.SettlementBalance+item.VmFundSum; + item.AmountFund = item.AmountFund + item.NetFund + item.OtherFund + item.OptionPremium + item.OptionPremiumSwap + item.SwapBalance + item.SettlementBalance+ item.VmInFund-item.VmOutFund; item.WinLoss += item.WinLoss2; diff --git a/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs b/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs index 256078f2..20106ec9 100644 --- a/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs +++ b/YLErpDAL/Modules/EodModule/SettlementModule/EodClientBalanceCalc.cs @@ -1106,6 +1106,8 @@ namespace YLErp.Modules.EodModule.SettlementModule clientbalancedaily.InFundSum = 0; clientbalancedaily.OutFundSum = 0; clientbalancedaily.OtherFundSum = 0; + clientbalancedaily.vm_in_fund_sum = 0; + clientbalancedaily.vm_out_fund_sum = 0; foreach (var item in currencyCodes) { var rateObj = new eod_currency_rate