1

BBWYB.Server.API/Controllers/ProductController.cs

@@ -18,7 +18,7 @@ namespace BBWYB.Server.API.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public OP_ProductListResponse GetProductList([FromBody] OP_SearchProductRequest request)
+        public OP_ProductListResponse GetProductList([FromBody] OP_QueryProductRequest request)
         {
             return productBusiness.GetProductList(request);
         }
@@ -29,7 +29,7 @@ namespace BBWYB.Server.API.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public OP_ProductSkuListResponse GetProductSkuList([FromBody] OP_SearchProductSkuRequest request)
+        public OP_ProductSkuListResponse GetProductSkuList([FromBody] OP_QueryProductSkuRequest request)
         {
             return productBusiness.GetProductSkuList(request);
         }

BBWYB.Server.Business/Product/ProductBusiness.cs

@@ -15,12 +15,12 @@ namespace BBWYB.Server.Business
             this.opPlatformClientFactory = opPlatformClientFactory;
         }
        
-        public OP_ProductListResponse GetProductList(OP_SearchProductRequest request)
+        public OP_ProductListResponse GetProductList(OP_QueryProductRequest request)
         {
             return opPlatformClientFactory.GetClient(request.Platform).GetProductList(request);
         }
 
-        public OP_ProductSkuListResponse GetProductSkuList(OP_SearchProductSkuRequest request)
+        public OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest request)
         {
             return opPlatformClientFactory.GetClient(request.Platform).GetProductSkuList(request);
         }

QuanTan.SDK/Client/Supplier/QuanTan_Supplier_OrderClient.cs

@@ -0,0 +1,18 @@
+using BBWYB.Common.Http;
+using QuanTan.SDK.Model;
+using QuanTan.SDK.Models.Supplier;
+
+namespace QuanTan.SDK.Client.Supplier
+{
+    public class QuanTan_Supplier_OrderClient : BaseClient
+    {
+        public QuanTan_Supplier_OrderClient(RestApiService restApiService) : base(restApiService)
+        {
+        }
+
+        public QuanTanResponse<QuanTan_Supplier_QueryOrderListResponse> GetOrderList(QuanTan_Supplier_QueryOrderReuqest request, string appId, string appSecret)
+        {
+            return SendRequest<QuanTan_Supplier_QueryOrderListResponse>("api/platform/supply/order/list", request, appId, appSecret);
+        }
+    }
+}

QuanTan.SDK/Models/Buyer/Request/Order/QuanTan_Buyer_CreateOrderRequest.cs

@@ -8,9 +8,9 @@
 
         public string cartIds { get; set; }
 
-        public QuanTanCreateOrderReceipt receipt { get; set; }
+        public QuanTan_Buyer_CreateOrderReceipt receipt { get; set; }
     }
 
-    public class QuanTanCreateOrderReceipt : QuanTan_Buyer_PreviewOrderReceipt
+    public class QuanTan_Buyer_CreateOrderReceipt : QuanTan_Buyer_PreviewOrderReceipt
     { }
 }

QuanTan.SDK/Models/QuanTanListResponse.cs

@@ -0,0 +1,13 @@
+namespace QuanTan.SDK.Models
+{
+    public class QuanTanListResponse<T> where T : class
+    {
+        public int Count { get; set; }
+
+        public int Page { get; set; }
+
+        public int PageSize { get; set; }
+
+        public IList<T> List { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs

@@ -0,0 +1,21 @@
+namespace QuanTan.SDK.Models.Supplier
+{
+    public class QuanTan_Supplier_QueryOrderReuqest
+    {
+        public string stroeId { get; set; }
+
+        public string stockType { get; set; }
+
+        public DateTime? createStart { get; set; }
+
+        public DateTime? createEnd { get; set; }
+
+        public DateTime? updateStart { get; set; }
+
+        public DateTime? updateEnd { get; set; }
+
+        public int page { get; set; }
+
+        public int pageSize { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_DeliveryResponse.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QuanTan.SDK.Models.Supplier
+{
+    public class QuanTan_Supplier_DeliveryResponse
+    {
+        /// <summary>
+        /// 物流公司Id
+        /// </summary>
+        public string ExpressId { get; set; }
+
+        /// <summary>
+        /// 物流公司名称
+        /// </summary>
+        public string ExpressName { get; set; }
+
+        /// <summary>
+        /// 快递单号
+        /// </summary>
+        public string ExpressSn { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_OrderProductResponse.cs

@@ -0,0 +1,61 @@
+namespace QuanTan.SDK.Models.Supplier
+{
+    public class QuanTan_Supplier_OrderProductResponse
+    {
+        public string OrderProductId { get; set; }
+
+        public string ProductId { get; set; }
+
+        public string ProductSku { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 商品图片
+        /// </summary>
+        public string Image { get; set; }
+
+        /// <summary>
+        /// 订单商品数量
+        /// </summary>
+        public int Quantity { get; set; }
+
+        /// <summary>
+        /// 商品单价
+        /// </summary>
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 商品总金额
+        /// </summary>
+        public decimal ProductPrice { get; set; }
+
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal PostagePrice { get; set; }
+
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        public decimal TotalPrice { get; set; }
+
+        public QuanTan_Supplier_OrderProductSkuResponse SkuInfo { get; set; }
+    }
+
+    public class QuanTan_Supplier_OrderProductSkuResponse
+    {
+        public string ProductId { get; set; }
+
+        public string ProductSku { get; set; }
+
+        public string Title { get; set; }
+
+        public string Image { get; set; }
+
+        public decimal Price { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs

@@ -0,0 +1,83 @@
+namespace QuanTan.SDK.Models.Supplier
+{
+    public class QuanTan_Supplier_QueryOrderListResponse : QuanTanListResponse<QuanTan_Supplier_QueryOrderResponse>
+    {
+
+    }
+
+    public class QuanTan_Supplier_QueryOrderResponse
+    {
+        public string OrderId { get; set; }
+
+        public string OrderSn { get; set; }
+
+        public string ClientOrderId { get; set; }
+
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 货款
+        /// </summary>
+        public decimal ProductPrice { get; set; }
+
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal TotalPostage { get; set; }
+
+        /// <summary>
+        /// 订单总额
+        /// </summary>
+        public decimal TotalPrice { get; set; }
+
+        /// <summary>
+        /// 订单状态：-1、已退款；0、待发货；1、待收货；2、待评价；3、已完成； 
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 支付状态
+        /// </summary>
+        public int Paid { get; set; }
+
+        /// <summary>
+        /// 支付时间
+        /// </summary>
+        public DateTime? PayTime { get; set; }
+
+        /// <summary>
+        /// 下单时间
+        /// </summary>
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        public DateTime? UpdateTime { get; set; }
+
+        /// <summary>
+        /// 下单方式 1、普通下单  2、售罄下单
+        /// </summary>
+        public int StockType { get; set; }
+
+        /// <summary>
+        /// 下单来源:0、拳探  1、步步为盈C端
+        /// </summary>
+        public int Source { get; set; }
+
+        /// <summary>
+        /// 收货对象
+        /// </summary>
+        public QuanTan_Supplier_ReceiptResponse Receipt { get; set; }
+
+        /// <summary>
+        /// 快递信息
+        /// </summary>
+        public QuanTan_Supplier_DeliveryResponse Delivery { get; set; }
+
+        /// <summary>
+        /// 订单商品集合
+        /// </summary>
+        public IList<QuanTan_Supplier_OrderProductResponse> OrderProduct { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_ReceiptResponse.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QuanTan.SDK.Models.Supplier
+{
+    public class QuanTan_Supplier_ReceiptResponse
+    {
+        public string Province { get; set; }
+
+        public string City { get; set; }
+
+        public string Area { get; set; }
+
+        public string Town { get; set; }
+
+        public string Address { get; set; }
+
+        public string RealName { get; set; }
+
+        public string Phone { get; set; }
+    }
+}

QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductListResponse.cs

@@ -11,14 +11,7 @@
         public string StoreId { get; set; }
     }
 
-    public class QuanTan_Supplier_ProductListResponse
-    { 
-        public int Count { get; set; }
-
-        public int Page { get; set; }
-
-        public int PageSize { get; set; }
-
-        public IList<QuanTan_Supplier_Product> List { get; set; }
+    public class QuanTan_Supplier_ProductListResponse : QuanTanListResponse<QuanTan_Supplier_Product>
+    {
     }
 }

QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductSkuListResponse.cs

@@ -19,14 +19,7 @@
         public string StoreId { get; set; }
     }
 
-    public class QuanTan_Supplier_ProductSkuListResponse
-    { 
-        public int Count { get; set; }
-
-        public int Page { get; set; }
-
-        public int PageSize { get; set; }
-
-        public IList<QuanTan_Supplier_ProductSku> List { get; set; }
+    public class QuanTan_Supplier_ProductSkuListResponse : QuanTanListResponse<QuanTan_Supplier_ProductSku>
+    {
     }
 }

SDKAdapter/AdapterEnums.cs

@@ -0,0 +1,31 @@
+namespace SDKAdapter
+{
+    public class AdapterEnums
+    {
+        public enum PlatformType
+        {
+            淘宝 = 0,
+            京东 = 1,
+            阿里巴巴 = 2,
+            拼多多 = 3,
+            微信 = 4,
+            拳探 = 10
+        }
+
+        /// <summary>
+        /// 排序时间类型(Start = 0, Modify = 1)
+        /// </summary>
+        public enum SortTimeField
+        {
+            Start = 0, Modify = 1
+        }
+
+        /// <summary>
+        /// 排序类型(Asc = 0, Desc = 1)
+        /// </summary>
+        public enum SortType
+        {
+            Asc = 0, Desc = 1
+        }
+    }
+}

SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs

@@ -18,14 +18,16 @@ namespace SDKAdapter.OperationPlatform.Client
             this.restApiService = restApiService;
         }
 
-        public virtual OP_ProductListResponse GetProductList(OP_SearchProductRequest searchProductRequest)
+        public virtual OP_ProductListResponse GetProductList(OP_QueryProductRequest searchProductRequest)
         {
             throw new NotImplementedException();
         }
 
-        public virtual OP_ProductSkuListResponse GetProductSkuList(OP_SearchProductSkuRequest searchProductSkuRequest)
+        public virtual OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest searchProductSkuRequest)
         {
             throw new NotImplementedException();
         }
+
+
     }
 }

SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs

@@ -17,7 +17,7 @@ namespace SDKAdapter.OperationPlatform.Client
 
         public override AdapterEnums.PlatformType Platform => AdapterEnums.PlatformType.拳探;
 
-        public override OP_ProductListResponse GetProductList(OP_SearchProductRequest searchProductRequest)
+        public override OP_ProductListResponse GetProductList(OP_QueryProductRequest searchProductRequest)
         {
             var qtResponse = supplier_ProductClient.GetProductList(new QuanTan_Supplier_SearchSpuRequest()
             {
@@ -46,7 +46,7 @@ namespace SDKAdapter.OperationPlatform.Client
             };
         }
 
-        public override OP_ProductSkuListResponse GetProductSkuList(OP_SearchProductSkuRequest searchProductSkuRequest)
+        public override OP_ProductSkuListResponse GetProductSkuList(OP_QueryProductSkuRequest searchProductSkuRequest)
         {
             var qtResponse = supplier_ProductClient.GetProductSkuList(new QuanTan_Supplier_SearchSkuRequest()
             {

SDKAdapter/OperationPlatform/Models/Request/Order/OP_QueryOrderRequest.cs

@@ -0,0 +1,25 @@
+namespace SDKAdapter.OperationPlatform.Models
+{
+    public class OP_QueryOrderRequest : BasePlatformRequest
+    {
+        public DateTime? StartDate { get; set; }
+
+        public DateTime? EndDate { get; set; }
+
+        public int PageIndex { get; set; }
+
+        public int PageSize { get; set; }
+
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 排序时间字段
+        /// </summary>
+        public AdapterEnums.SortTimeField SortTimeField { get; set; }
+
+        /// <summary>
+        /// 排序类型
+        /// </summary>
+        public AdapterEnums.SortType SortType { get; set; }
+    }
+}

SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs → SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs

@@ -1,6 +1,6 @@
 namespace SDKAdapter.OperationPlatform.Models
 {
-    public class OP_SearchProductRequest : BasePlatformRequest
+    public class OP_QueryProductRequest : BasePlatformRequest
     {
         public string Spu { get; set; }
 

SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductSkuRequest.cs → SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs

@@ -1,6 +1,6 @@
 namespace SDKAdapter.OperationPlatform.Models
 {
-    public class OP_SearchProductSkuRequest : BasePlatformRequest
+    public class OP_QueryProductSkuRequest : BasePlatformRequest
     {
         /// <summary>
         /// 当Spu有值时会忽略Sku

SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs

@@ -0,0 +1,31 @@
+namespace SDKAdapter.OperationPlatform.Models
+{
+    public class OP_OrderResponse
+    {
+        public string OrderId { get; set; }
+
+        public DateTime StartTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+
+        public DateTime ModifyTime { get; set; }
+
+        public AdapterEnums.PlatformType OrderPlatform { get; set; }
+
+        /// <summary>
+        /// 支付类型
+        /// <para>京东【 货到付款 = 1,邮局汇款 = 2,自提 = 3,在线支付 = 4,公司转账 = 5,银行卡转账 = 6】</para>
+        /// <para>拳探【】</para>
+        /// </summary>
+        public int PayType { get; set; }
+
+        /// <summary>
+        /// 下单来源
+        /// <para>京东【】</para>
+        /// <para>拳探【0 = 拳探,1 = 步步为盈C端】</para>
+        /// </summary>
+        public int OrderSource { get; set; }
+
+
+    }
+}

SDKAdapter/PurchasePlatform/Models/AdapterEnums.cs

@@ -1,15 +0,0 @@
-namespace SDKAdapter.PurchasePlatform.Models
-{
-    public class AdapterEnums
-    {
-        public enum PlatformType
-        {
-            淘宝 = 0,
-            京东 = 1,
-            阿里巴巴 = 2,
-            拼多多 = 3,
-            微信 = 4,
-            拳探 = 10
-        }
-    }
-}