期末结存未算上追保账户
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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}有未簿记的流水未处理");
|
||||
|
||||
Reference in New Issue
Block a user