diff --git a/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs b/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs
index ac81a01d..c30cd72d 100644
--- a/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs
+++ b/YLErpDAL/BLL/EodSettlement/ClientBalanceUtility.cs
@@ -211,34 +211,6 @@ namespace YLErp.BLL.EodSettlement
                             //data.AvailableStockEqvNotional = balance.AvailableStockEqvNotional;
                             data.LastSettlemetTime = balance.LastSettlemetTime;
                             data.LastHTSettlemetTime = balance.LastHTSettlemetTime;
-                            if (PS.Config.Is国投)
-                            {
-                                data.AvailableAmount = data.AmountFund + data.TotalCredit + data.PayableMargin;
-                            }
-                            else if (PS.Config.Is伴兴 || PS.Config.Is湘财)
-                            {
-                                data.AvailableAmount += data.TotalCredit;
-                            }
-                            else if (PS.Config.Is东吴)
-                            {
-                                // 可用金额
-                                var client = DataCacheProvider.GetClientDataSource().GetData(balance.ClientId);
-                                var marginRate = client?.MarginRate ?? 0;
-                                data.AvailableAmount = data.AmountFund + (data.PayableMargin * marginRate);
-                            }
-                            else
-                            {
-                                //data.AvailableAmount = data.AmountFund + data.TotalCredit + data.PayableMargin + data.GuaranteesTotalAmount;
-                                var AvailableMoney = data.AmountFund + data.TotalCredit + data.PayableMargin + data.GuaranteesTotalAmount;
-                                data.AvailableAmount = AvailableMoney - data.FrozenMarginMoney;
-                                data.MinusPayableMarginTotal = data.MinusPayableMargin;
-                                data.MarginByPayableMarginTotal = data.MarginByPayableMargin;
-                            }
-                            if (PS.Config.Is湘财)
-                            {
-                                data.MarginByPayableMarginTotal = Math.Max(-data.AvailableAmount, 0);
-                            }
-                           
                         }
                         dic[data.ClientId] = data;
                         data.UpdateDate = DateTime.Now;
@@ -329,7 +301,12 @@ namespace YLErp.BLL.EodSettlement
                             balance.TotalCredit = data.TotalCredit;
                             balance.PayableMargin = data.PayableMargin;
                             balance.GuaranteesTotalAmount = data.GuaranteesTotalAmount;
-                            balance.AvailableAmount = balance.AmountFund + balance.TotalCredit + balance.PayableMargin + balance.GuaranteesTotalAmount;
+                            balance.FrozenMarginMoney = data.FrozenMarginMoney;
+                            balance.DaliyPnl = data.DaliyPnl;
+                            balance.RoundedDaliyPnl = data.RoundedPositionPnl - (lastClientBalanceDaily?.RoundedPositionPnl ?? 0);
+                            balance.PositionPnl = data.PositionPnl;
+                            balance.RoundedPositionPnl = data.RoundedPositionPnl;
+                            balance.AvailableAmount = balance.AmountFund + balance.TotalCredit + balance.PayableMargin + balance.GuaranteesTotalAmount + balance.RoundedPositionPnl - balance.FrozenMarginMoney;
                             balance.DeltaMargin = data.DeltaMargin;
                             balance.SwapPayableMargin = data.SwapPayableMargin;
                             balance.SwapUnMargin = data.SwapUnPayableMargin;
@@ -350,10 +327,6 @@ namespace YLErp.BLL.EodSettlement
                             balance.RoundedPositionPv = data.RoundedPositionPv;
                             balance.SellPv = data.SellPv;
                             balance.PrepaymentAmount = data.PrepaymentAmount;
-                            balance.DaliyPnl = data.DaliyPnl;
-                            balance.RoundedDaliyPnl = data.RoundedPositionPnl - (lastClientBalanceDaily?.RoundedPositionPnl ?? 0);
-                            balance.PositionPnl = data.PositionPnl;
-                            balance.RoundedPositionPnl = data.RoundedPositionPnl;
                             balance.ClientSellPositionPnl = data.ClientSellPositionPnl;
                             balance.PositionPremiumNetCash = data.PositionPremiumNetCash;
                             balance.SellTradePrice = data.SellTradePrice ?? 0;
@@ -368,6 +341,8 @@ namespace YLErp.BLL.EodSettlement
                             balance.ClientName = client.Name;
                             balance.MaintenanceLine = data.MaintenanceLine ?? 0;
                             balance.PositionNotionalPrincipal = data.TotalNominal??0;
+                            balance.DesirableFund = balance.AvailableAmount;
+                            balance.MarginByPayableMarginTotal = 0;
                         }
                     }
                 }
diff --git a/YLErpWeb/App/KafkaTask/ClientBalanceTask.cs b/YLErpWeb/App/KafkaTask/ClientBalanceTask.cs
index f1d389ba..2e126dec 100644
--- a/YLErpWeb/App/KafkaTask/ClientBalanceTask.cs
+++ b/YLErpWeb/App/KafkaTask/ClientBalanceTask.cs
@@ -71,8 +71,7 @@ namespace YLErp.Web.App
                            {
                                var cbs = new RealTimeClientBanlanceService(new OptUserInfo(0, "实时客户资金服务", OptUserFrom.Service)).GetBanlances(new List<int>() { req.clientId }, lastBalanceDate.AddDays(1), calcDate: valuedateBLL.ValueDate);
                                var cb = cbs.FirstOrDefault();
-                               var AvailableMoney = cb.AmountFund + cb.TotalCredit + cb.PayableMargin + cb.GuaranteesTotalAmount;
-                               cb.AvailableAmount = AvailableMoney - cb.FrozenMarginMoney;
+                               var AvailableMoney = cb.AvailableAmount + cb.FrozenMarginMoney;
                                var obj = new ClientBalanceForTrsResponse
                                {
                                    TotalAmountTotal = cb.RoundedTotalAmountTotal,