From 8dd780a1a6142023d8378dd464eea37ca15074a3 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 16 Jun 2022 02:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E5=B8=81=E6=AF=94=E4=BE=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TradeBusiness/Spot/D21TradeBusiness.cs    |  4 ++--
 SDKTestConsole/Program.cs                     | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Binance.TradeRobot.Business/Business/TradeBusiness/Spot/D21TradeBusiness.cs b/Binance.TradeRobot.Business/Business/TradeBusiness/Spot/D21TradeBusiness.cs
index 9a9f044..9e466d3 100644
--- a/Binance.TradeRobot.Business/Business/TradeBusiness/Spot/D21TradeBusiness.cs
+++ b/Binance.TradeRobot.Business/Business/TradeBusiness/Spot/D21TradeBusiness.cs
@@ -145,8 +145,8 @@ namespace Binance.TradeRobot.Business
                             Content = $"触发策略中交易所最大借币比例限制,交易所最大借币比例{d21Robot.D21Policy.MaxExchangeLoanRatio}%,当前借币比例{diffRatio}%,下单仓位:{previewTradeAmount},账户余额:{balance},按交易所最大借币比例借币"
                         });
                         //diffAmount = previewTradeAmount * (d21Robot.D21Policy.MaxExchangeLoanRatio / 100M);
-                        
-                        diffAmount = balance * d21Robot.D21Policy.MaxExchangeLoanRatio;
+
+                        diffAmount = balance * (d21Robot.D21Policy.MaxExchangeLoanRatio / 100M);
                         //previewTradeAmount = balance + diffAmount; //在策略允许的借币比例范围内的最大下单金额
 
                     }
diff --git a/SDKTestConsole/Program.cs b/SDKTestConsole/Program.cs
index 82d5087..23145a1 100644
--- a/SDKTestConsole/Program.cs
+++ b/SDKTestConsole/Program.cs
@@ -17,8 +17,8 @@ namespace SDKTestConsole
         private static SpotOrderWebSocketClient orderWebSocketClient;
         static void Main(string[] args)
         {
-            var apiKey = "RsQ5RuhYbNRXCTGAQXhwb5Dt3jgPnwKXfR1OXz0qWmf3IsAC7zPQd14WGIr18rDA";
-            var secret = "yxW4PPb65rVpdo7fMt2mZcbNOtjOe3J4fMSRVtX5YJfj7kRzHW3dY6xfoW4jje1I";
+            var apiKey = "2HiU7O8v3JmADiIRNjfUHQIFwgJS2WQGOB8SW1e9BmCDppTDHpLZnt950JxIfn8Q";
+            var secret = "T3pvxSnutmPpWIh3VI3t8rrTOfbrruJxHzHs5Lp7pXAFlN723z73mcPnct1qaf0g";
             var client = BaseAPIClient.Create(Enums.Exchange.Binance, 0, apiKey, secret);
 
             //逐仓杠杆账户资产
@@ -65,12 +65,20 @@ namespace SDKTestConsole
                 SpotApiOptions = spotClientOption
             });
 
-            //var r = client.GetIsolatedMarginAccountAssets();
+            var r = client.GetIsolatedMarginAccountAssets();
 
-            var r =client.IsolatedMarginRepay("GMTUSDT", 0.00004748M);
-            var r1 = client.IsolatedMarginRepay("APEUSDT", 0.00003912M);
-            var r3 = client.GetIsolatedMarginAccountAssets();
+            //var clientOrder = CreateClientOrder(288617629646917,Enums.TradePolicy.D21);
+            //client.IsolatedMarginPlaceOrder("APEUSDT", Enums.TradeDirection.Sell, Enums.OrderType.MARKET, quantity: 3.08M, newClientOrderId: clientOrder);
+
+            //client.IsolatedMarginRepay("APEUSDT", 8.29717105M);
             Console.ReadKey();
         }
+
+        private static string CreateClientOrder(long robotId, Enums.TradePolicy tradePolicy) 
+        {
+            var guid = Guid.NewGuid();
+            var random = new Random(guid.GetHashCode());
+            return $"{Convert.ToChar(random.Next(97, 123))}{guid.ToString().Substring(0, 4)}_{robotId}_{(int)tradePolicy}";
+        }
     }
 }