From 0174b4f179ae22df51d4094e5bda92201f484146 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 1 Jun 2022 15:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/OrderController.cs            | 20 ++++++-------
 .../Business/OrderBusiness.cs                 | 29 +++++++++++++++----
 .../Dto/Request/Order/QueryLogRequest.cs      | 11 +++++++
 .../Dto/Request/Order/QueryOrderRequest.cs    | 11 +++++++
 .../Order/ExecutionLogPageResponse.cs         | 13 +++++++++
 .../Response/Order/SpotOrderPageResponse.cs   | 13 +++++++++
 6 files changed, 82 insertions(+), 15 deletions(-)
 create mode 100644 Binance.TradeRobot.Model/Dto/Request/Order/QueryLogRequest.cs
 create mode 100644 Binance.TradeRobot.Model/Dto/Request/Order/QueryOrderRequest.cs
 create mode 100644 Binance.TradeRobot.Model/Dto/Response/Order/ExecutionLogPageResponse.cs
 create mode 100644 Binance.TradeRobot.Model/Dto/Response/Order/SpotOrderPageResponse.cs

diff --git a/Binance.TradeRobot.API/Controllers/OrderController.cs b/Binance.TradeRobot.API/Controllers/OrderController.cs
index 7962408..cb0ac27 100644
--- a/Binance.TradeRobot.API/Controllers/OrderController.cs
+++ b/Binance.TradeRobot.API/Controllers/OrderController.cs
@@ -17,25 +17,25 @@ namespace Binance.TradeRobot.API.Controllers
         }
 
         /// <summary>
-        /// 获取现货/逐仓杠杆订单记录(最近20条)
+        /// 获取现货/逐仓杠杆订单记录
         /// </summary>
-        /// <param name="robotId"></param>
+        /// <param name="queryOrderRequest"></param>
         /// <returns></returns>
-        [HttpGet("{robotId}")]
-        public IList<SpotOrderResponse> GetSpotOrderList([FromRoute] long robotId)
+        [HttpPost("{robotId}")]
+        public SpotOrderPageResponse GetSpotOrderList([FromBody] QueryOrderRequest queryOrderRequest)
         {
-            return orderBusiness.GetSpotOrderList(robotId);
+            return orderBusiness.GetSpotOrderList(queryOrderRequest);
         }
 
         /// <summary>
-        /// 获取执行日志记录(最近50条)
+        /// 获取执行日志记录
         /// </summary>
-        /// <param name="robotId"></param>
+        /// <param name="queryLogRequest"></param>
         /// <returns></returns>
-        [HttpGet("{robotId}")]
-        public IList<ExecutionLogResponse> GetExecutionLogList([FromRoute] long robotId)
+        [HttpPost("{robotId}")]
+        public ExecutionLogPageResponse GetExecutionLogList([FromBody] QueryLogRequest queryLogRequest)
         {
-            return orderBusiness.GetExecutionLogList(robotId);
+            return orderBusiness.GetExecutionLogList(queryLogRequest);
         }
     }
 }
diff --git a/Binance.TradeRobot.Business/Business/OrderBusiness.cs b/Binance.TradeRobot.Business/Business/OrderBusiness.cs
index bcc6dfc..0eb3382 100644
--- a/Binance.TradeRobot.Business/Business/OrderBusiness.cs
+++ b/Binance.TradeRobot.Business/Business/OrderBusiness.cs
@@ -3,7 +3,6 @@ using Binance.TradeRobot.Model.Db;
 using Binance.TradeRobot.Model.Dto;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Generic;
 using Yitter.IdGenerator;
 
 namespace Binance.TradeRobot.Business
@@ -16,14 +15,34 @@ namespace Binance.TradeRobot.Business
 
         }
 
-        public IList<SpotOrderResponse> GetSpotOrderList(long robotId)
+        public SpotOrderPageResponse GetSpotOrderList(QueryOrderRequest queryOrderRequest)
         {
-            return fsql.Select<SpotOrder>().Where(o => o.RobotId == robotId).OrderByDescending(o => o.CreateTime).Page(1, 20).ToList<SpotOrderResponse>();
+            if (queryOrderRequest.PageSize > 100)
+                queryOrderRequest.PageSize = 100;
+            return new SpotOrderPageResponse()
+            {
+                Items = fsql.Select<SpotOrder>().Where(o => o.RobotId == queryOrderRequest.RobotId)
+                                           .OrderByDescending(o => o.CreateTime)
+                                           .Page(queryOrderRequest.PageIndex, queryOrderRequest.PageSize)
+                                           .Count(out long totalCount)
+                                           .ToList<SpotOrderResponse>(),
+                TotalCount = totalCount
+            };
         }
 
-        public IList<ExecutionLogResponse> GetExecutionLogList(long robotId)
+        public ExecutionLogPageResponse GetExecutionLogList(QueryLogRequest queryLogRequest)
         {
-            return fsql.Select<ExecutionLog>().Where(l => l.RobotId == robotId).OrderByDescending(l => l.CreateTime).Page(1, 50).ToList<ExecutionLogResponse>();
+            if (queryLogRequest.PageSize > 100)
+                queryLogRequest.PageSize = 100;
+            return new ExecutionLogPageResponse()
+            {
+                Items = fsql.Select<ExecutionLog>().Where(l => l.RobotId == queryLogRequest.RobotId)
+                                              .OrderByDescending(l => l.CreateTime)
+                                              .Page(queryLogRequest.PageIndex, queryLogRequest.PageSize)
+                                              .Count(out long totalCount)
+                                              .ToList<ExecutionLogResponse>(),
+                TotalCount = totalCount
+            };
         }
     }
 }
diff --git a/Binance.TradeRobot.Model/Dto/Request/Order/QueryLogRequest.cs b/Binance.TradeRobot.Model/Dto/Request/Order/QueryLogRequest.cs
new file mode 100644
index 0000000..273401b
--- /dev/null
+++ b/Binance.TradeRobot.Model/Dto/Request/Order/QueryLogRequest.cs
@@ -0,0 +1,11 @@
+namespace Binance.TradeRobot.Model.Dto
+{
+    public class QueryLogRequest
+    {
+        public long RobotId { get; set; }
+
+        public int PageIndex { get; set; }
+
+        public int PageSize { get; set; }
+    }
+}
diff --git a/Binance.TradeRobot.Model/Dto/Request/Order/QueryOrderRequest.cs b/Binance.TradeRobot.Model/Dto/Request/Order/QueryOrderRequest.cs
new file mode 100644
index 0000000..3d619a2
--- /dev/null
+++ b/Binance.TradeRobot.Model/Dto/Request/Order/QueryOrderRequest.cs
@@ -0,0 +1,11 @@
+namespace Binance.TradeRobot.Model.Dto
+{
+    public class QueryOrderRequest
+    {
+        public long RobotId { get; set; }
+
+        public int PageIndex { get; set; }
+
+        public int PageSize { get; set; }
+    }
+}
diff --git a/Binance.TradeRobot.Model/Dto/Response/Order/ExecutionLogPageResponse.cs b/Binance.TradeRobot.Model/Dto/Response/Order/ExecutionLogPageResponse.cs
new file mode 100644
index 0000000..73edbe7
--- /dev/null
+++ b/Binance.TradeRobot.Model/Dto/Response/Order/ExecutionLogPageResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Binance.TradeRobot.Model.Dto
+{
+    public class ExecutionLogPageResponse
+    {
+        public long TotalCount { get; set; }
+
+        public IList<ExecutionLogResponse> Items { get; set; }
+    }
+}
diff --git a/Binance.TradeRobot.Model/Dto/Response/Order/SpotOrderPageResponse.cs b/Binance.TradeRobot.Model/Dto/Response/Order/SpotOrderPageResponse.cs
new file mode 100644
index 0000000..c366130
--- /dev/null
+++ b/Binance.TradeRobot.Model/Dto/Response/Order/SpotOrderPageResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Binance.TradeRobot.Model.Dto
+{
+    public class SpotOrderPageResponse
+    {
+        public long TotalCount { get; set; }
+
+        public IList<SpotOrderResponse> Items { get; set; }
+    }
+}