From 3ecd0a235737f2afa13e62b6afa0b101d829fc31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Mon, 21 Apr 2025 16:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E6=9C=AB=E7=BB=93=E5=AD=98=E6=9C=AA?= =?UTF-8?q?=E7=AE=97=E4=B8=8A=E8=BF=BD=E4=BF=9D=E8=B4=A6=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs | 2 +- .../Modules/EodModule/SettlementModule/EodCheckSwapFlow.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs b/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs index be1ac174..f13ec384 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.AmountFund = item.AmountFund + item.NetFund + item.OtherFund + item.OptionPremium + item.OptionPremiumSwap + item.SwapBalance + item.SettlementBalance+item.VmFundSum; item.WinLoss += item.WinLoss2; diff --git a/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSwapFlow.cs b/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSwapFlow.cs index e46b4202..14878b57 100644 --- a/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSwapFlow.cs +++ b/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSwapFlow.cs @@ -20,8 +20,12 @@ namespace YLErp.Modules.EodModule.SettlementModule public void Execute() { var settleDate = _context.SettleDate; + var clienIds = _context.Request.ClientIds; var swapFlowList = DbContext.swap_flow.Where(x=>x.OccurTime==settleDate&&x.DataState==(int)SwapFlowDateStateEnum.等待完成); - + if (clienIds != null && clienIds.Any()) + { + swapFlowList = swapFlowList.Where(x => clienIds.Contains(x.ClientId ?? 0)); + } if (swapFlowList.Any()) { _context.RaiseError(Step, $"{settleDate:yyyy-MM-dd}有未簿记的流水未处理");