From 3b0ecae72d1fed786fcb4d861504fe89c30ccbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= <wufanghai@ylkj7.wecom.work>
Date: Wed, 9 Apr 2025 17:25:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealTimeClientBanlanceService.cs          |  3 +-
 YLErpDAL/Model/ClientBalanceForTrsResponse.cs | 56 -------------------
 2 files changed, 1 insertion(+), 58 deletions(-)

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
         ///  授信额度
         /// </summary>
         public double Credit { get; set; }
-        /// <summary>
-        /// 期初结存
-        /// </summary>
-        public double LastDayRemainFund { get; set; }
-        /// <summary>
-        /// 出金入金
-        /// </summary>
-        public double NetFund { get; set; }
-        /// <summary>
-        /// 互换成交收支
-        /// </summary>
-        public double OptionPremiumSwap { get; set; }
-        /// <summary>
-        /// 互换了结收支
-        /// </summary>
-        public double SwapBalance { get; set; }
-        /// <summary>
-        /// 其他收支
-        /// </summary>
-        public double OtherFund { get; set; }
-        /// <summary>
-        /// 期末结存
-        /// </summary>
-        public double AmountFund { get; set; }
-        /// <summary>
-        /// 质押市值
-        /// </summary>
-        public double GuaranteesTotalAmount { get; set; }
-        /// <summary>
-        /// 预付金占用
-        /// </summary>
-        public double MinusPayableMarginTotal { get; set; }
-        /// <summary>
-        /// 应付了结交易款
-        /// </summary>
-        public double ClosedTradePayableFundTotal { get; set; }
-        /// <summary>
-        /// 应付存续交易款
-        /// </summary>
-        public double PositionTradePayableFundTotal { get; set; }
-        /// <summary>
-        /// 追保金额
-        /// </summary>
-        public double MarginByPayableMarginTotal { get; set; }
-        /// <summary>
-        /// 应付资金总额
-        /// </summary>
-        public double PayableFundTotal { get; set; }
-        /// <summary>
-        /// 可取资金
-        /// </summary>
-        public double DesirableFundTotal { get; set; }
-        /// <summary>
-        /// 实现盈亏
-        /// </summary>
-        public double WinLoss { get; set; }
 
         /// <summary>
         /// 实际可用资金