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}有未簿记的流水未处理");