diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs index 3b44d623..ae13fc52 100644 --- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs @@ -688,7 +688,7 @@ namespace YLErp.Modules.SwapModule { realPositions ??= new List(); var futureFlows = (completedFlowEvents ?? Enumerable.Empty()) - .Where(x => x.EventType == (int)SwapEventTypeEnum.平仓 && x.EventDate > settleDate) + .Where(x => x.EventType == (int)SwapEventTypeEnum.平仓 && x.UnwindDate > settleDate) .ToList(); var originalNotional = origPositions.Where(x => x.PosiDirection > 0) .Sum(x => x.PosiNotionalValue); @@ -701,7 +701,7 @@ namespace YLErp.Modules.SwapModule .GroupBy(x => x.PositionId) .ToDictionary(x => x.Key, x => x.Sum(v => v.InterestPrincipal)); var priorClosePositionIds = new HashSet((completedFlowEvents ?? Enumerable.Empty()) - .Where(x => x.EventType == (int)SwapEventTypeEnum.平仓 && x.EventDate <= settleDate) + .Where(x => x.EventType == (int)SwapEventTypeEnum.平仓 && x.UnwindDate <= settleDate) .Select(x => x.PositionId)); return origPositions.Where(x => x.PosiDirection == 0).Select(p =>