diff --git a/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs b/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs
index 69fb450a..3270e665 100644
--- a/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs
+++ b/YLErpDAL/BLL/EodSettlement/RealTimeClientBanlanceService.cs
@@ -1327,8 +1327,7 @@ namespace YLErp.BLL.Eod
var clientPositions = positions.Where(x => clientTradeIds.Contains(x.SwapTradeId)).ToList();
var marginList = clientPositions.Where(x =>ConsTrade.InterestMarginModels.Contains(x.InterestMode)).Sum(s=>s.InterestPrincipalFix * (s.InterestDirection == 1 ? -1 : 1));
balance.SwapMargin =Convert.ToDouble(marginList);
- var floatPositions= positions.Where(x => x.PosiQuantity > 0);
- balance.PositionCount= tradeIds.Count();
+ balance.PositionCount= clientTradeIds.Count();
balance.PositionNotionalPrincipal = Convert.ToDouble(positions.Sum(s=>s.PosiNotionalValue));//实时
}
var eodSwapQuery = DbContext.eod_swap.Where(x => clientIds.Contains(x.ClientId) && x.ValueDate >= lastSettletDate && x.ValueDate <= startDate).AsEnumerable().GroupBy(x => x.SwapTradeId)
diff --git a/YLErpDAL/Model/ClientBalanceForTrsResponse.cs b/YLErpDAL/Model/ClientBalanceForTrsResponse.cs
index db0a9777..bf813393 100644
--- a/YLErpDAL/Model/ClientBalanceForTrsResponse.cs
+++ b/YLErpDAL/Model/ClientBalanceForTrsResponse.cs
@@ -38,62 +38,6 @@ namespace YLErp.Model
/// 授信额度
///
public double Credit { get; set; }
- ///
- /// 期初结存
- ///
- public double LastDayRemainFund { get; set; }
- ///
- /// 出金入金
- ///
- public double NetFund { get; set; }
- ///
- /// 互换成交收支
- ///
- public double OptionPremiumSwap { get; set; }
- ///
- /// 互换了结收支
- ///
- public double SwapBalance { get; set; }
- ///
- /// 其他收支
- ///
- public double OtherFund { get; set; }
- ///
- /// 期末结存
- ///
- public double AmountFund { get; set; }
- ///
- /// 质押市值
- ///
- public double GuaranteesTotalAmount { get; set; }
- ///
- /// 预付金占用
- ///
- public double MinusPayableMarginTotal { get; set; }
- ///
- /// 应付了结交易款
- ///
- public double ClosedTradePayableFundTotal { get; set; }
- ///
- /// 应付存续交易款
- ///
- public double PositionTradePayableFundTotal { get; set; }
- ///
- /// 追保金额
- ///
- public double MarginByPayableMarginTotal { get; set; }
- ///
- /// 应付资金总额
- ///
- public double PayableFundTotal { get; set; }
- ///
- /// 可取资金
- ///
- public double DesirableFundTotal { get; set; }
- ///
- /// 实现盈亏
- ///
- public double WinLoss { get; set; }
///
/// 实际可用资金