From 6441918c3ff96ae4b184f38c0ffc65e4d016ae48 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 13 Mar 2023 10:49:18 +0800
Subject: [PATCH] 1

---
 .../QuanTan_Supplier_QueryOrderReuqest.cs     | 17 ++++++++-
 .../QuanTan_Supplier_QueryOrderResponse.cs    | 10 ++++++
 .../Client/Base/OP_PlatformClient.cs          |  9 +++--
 .../Client/Impl/OP_QuanTanClient.cs           | 35 ++++++++++++-------
 .../Models/Response/Order/OP_OrderResponse.cs | 14 ++++++++
 5 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs b/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs
index 7fb30af..0557545 100644
--- a/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs
+++ b/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs
@@ -2,7 +2,7 @@
 {
     public class QuanTan_Supplier_QueryOrderReuqest
     {
-        public string stroeId { get; set; }
+        public string storeId { get; set; }
 
         public string stockType { get; set; }
 
@@ -17,5 +17,20 @@
         public int page { get; set; }
 
         public int pageSize { get; set; }
+
+        /// <summary>
+        /// 排序字段 (create_time,update_time)
+        /// </summary>
+        public string order { get; set; }
+
+        /// <summary>
+        /// 排序方式 (asc,desc)
+        /// </summary>
+        public string orderBy { get; set; }
+
+        /// <summary>
+        /// 订单Id
+        /// </summary>
+        public string orderId { get; set; }
     }
 }
diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
index fff26c5..35c3aea 100644
--- a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
+++ b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
@@ -65,6 +65,16 @@
         /// </summary>
         public int Source { get; set; }
 
+        /// <summary>
+        /// 买家备注
+        /// </summary>
+        public string BuyRemark { get; set; }
+
+        /// <summary>
+        /// 商家备注
+        /// </summary>
+        public string MerRemark { get; set; }
+
         /// <summary>
         /// 收货对象
         /// </summary>
diff --git a/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs b/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs
index f6c06da..61a3aff 100644
--- a/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs
+++ b/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs
@@ -18,16 +18,19 @@ namespace SDKAdapter.OperationPlatform.Client
             this.restApiService = restApiService;
         }
 
-        public virtual OP_ProductListResponse GetProductList(OP_QueryProductRequest searchProductRequest)
+        public virtual OP_ProductListResponse GetProductList(OP_QueryProductRequest request)
         {
             throw new NotImplementedException();
         }
 
-        public virtual OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest searchProductSkuRequest)
+        public virtual OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest request)
         {
             throw new NotImplementedException();
         }
 
-
+        public virtual OP_OrderListResponse GetOrderList(OP_QueryOrderRequest request)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
index 60dbe74..5be10e5 100644
--- a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
+++ b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
@@ -9,6 +9,7 @@ namespace SDKAdapter.OperationPlatform.Client
     public class OP_QuanTanClient : OP_PlatformClient
     {
         private QuanTan_Supplier_ProductClient supplier_ProductClient;
+        private QuanTan_Supplier_OrderClient supplier_OrderClient;
 
         public OP_QuanTanClient(RestApiService restApiService) : base(restApiService)
         {
@@ -17,15 +18,15 @@ namespace SDKAdapter.OperationPlatform.Client
 
         public override AdapterEnums.PlatformType Platform => AdapterEnums.PlatformType.拳探;
 
-        public override OP_ProductListResponse GetProductList(OP_QueryProductRequest searchProductRequest)
+        public override OP_ProductListResponse GetProductList(OP_QueryProductRequest request)
         {
             var qtResponse = supplier_ProductClient.GetProductList(new QuanTan_Supplier_SearchSpuRequest()
             {
-                page = searchProductRequest.PageIndex,
-                pageSize = searchProductRequest.PageSize,
-                productId = searchProductRequest.Spu,
-                storeId = searchProductRequest.AppToken
-            }, searchProductRequest.AppKey, searchProductRequest.AppSecret);
+                page = request.PageIndex,
+                pageSize = request.PageSize,
+                productId = request.Spu,
+                storeId = request.AppToken
+            }, request.AppKey, request.AppSecret);
 
             if (qtResponse.Status != 200)
                 throw new Exception(qtResponse.Message);
@@ -46,15 +47,15 @@ namespace SDKAdapter.OperationPlatform.Client
             };
         }
 
-        public override OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest searchProductSkuRequest)
+        public override OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest request)
         {
             var qtResponse = supplier_ProductClient.GetProductSkuList(new QuanTan_Supplier_SearchSkuRequest()
             {
-                page = searchProductSkuRequest.PageIndex,
-                pageSize = searchProductSkuRequest.PageSize,
-                storeId = searchProductSkuRequest.AppToken,
-                productId = searchProductSkuRequest.Spu
-            }, searchProductSkuRequest.AppKey, searchProductSkuRequest.AppSecret);
+                page = request.PageIndex,
+                pageSize = request.PageSize,
+                storeId = request.AppToken,
+                productId = request.Spu
+            }, request.AppKey, request.AppSecret);
 
             if (qtResponse.Status != 200)
                 throw new Exception(qtResponse.Message);
@@ -74,5 +75,15 @@ namespace SDKAdapter.OperationPlatform.Client
                 }).ToList()
             };
         }
+
+        public override OP_OrderListResponse GetOrderList(OP_QueryOrderRequest request)
+        {
+            var qtResponse = supplier_OrderClient.GetOrderList(new QuanTan_Supplier_QueryOrderReuqest()
+            {
+                storeId = request.AppToken
+
+            }, request.AppKey, request.AppSecret);
+            return base.GetOrderList(request);
+        }
     }
 }
diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
index a4f8da0..c31633f 100644
--- a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
+++ b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
@@ -1,5 +1,12 @@
 namespace SDKAdapter.OperationPlatform.Models
 {
+    public class OP_OrderListResponse
+    {
+        public int Count { get; set; }
+
+        public IList<OP_OrderResponse> Items { get; set; }
+    }
+
     public class OP_OrderResponse
     {
         public string OrderId { get; set; }
@@ -26,6 +33,13 @@
         /// </summary>
         public int OrderSource { get; set; }
 
+        /// <summary>
+        /// 仓储类型
+        /// <para>京东【京仓 = 0,云仓 = 1,本地自发 = 2,代发 = 3,SD = 4】</para>
+        /// <para>拳探【本地自发 = 2,代发 = 3】</para>
+        /// </summary>
+        public int StorageType { get; set; }
+
 
     }
 }