diff --git a/BBWYB.Server.API/Controllers/ProductController.cs b/BBWYB.Server.API/Controllers/ProductController.cs index e5e2973..7d34e71 100644 --- a/BBWYB.Server.API/Controllers/ProductController.cs +++ b/BBWYB.Server.API/Controllers/ProductController.cs @@ -18,7 +18,7 @@ namespace BBWYB.Server.API.Controllers /// /// [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 /// /// [HttpPost] - public OP_ProductSkuListResponse GetProductSkuList([FromBody] OP_SearchProductSkuRequest request) + public OP_ProductSkuListResponse GetProductSkuList([FromBody] OP_QueryProductSkuRequest request) { return productBusiness.GetProductSkuList(request); } diff --git a/BBWYB.Server.Business/Product/ProductBusiness.cs b/BBWYB.Server.Business/Product/ProductBusiness.cs index af7fbdc..39d0d55 100644 --- a/BBWYB.Server.Business/Product/ProductBusiness.cs +++ b/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); } diff --git a/QuanTan.SDK/Client/Supplier/QuanTan_Supplier_OrderClient.cs b/QuanTan.SDK/Client/Supplier/QuanTan_Supplier_OrderClient.cs new file mode 100644 index 0000000..1a19457 --- /dev/null +++ b/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 GetOrderList(QuanTan_Supplier_QueryOrderReuqest request, string appId, string appSecret) + { + return SendRequest("api/platform/supply/order/list", request, appId, appSecret); + } + } +} diff --git a/QuanTan.SDK/Models/Buyer/Request/Order/QuanTan_Buyer_CreateOrderRequest.cs b/QuanTan.SDK/Models/Buyer/Request/Order/QuanTan_Buyer_CreateOrderRequest.cs index 61c023a..3b0e2f7 100644 --- a/QuanTan.SDK/Models/Buyer/Request/Order/QuanTan_Buyer_CreateOrderRequest.cs +++ b/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 { } } diff --git a/QuanTan.SDK/Models/QuanTanListResponse.cs b/QuanTan.SDK/Models/QuanTanListResponse.cs new file mode 100644 index 0000000..a505c36 --- /dev/null +++ b/QuanTan.SDK/Models/QuanTanListResponse.cs @@ -0,0 +1,13 @@ +namespace QuanTan.SDK.Models +{ + public class QuanTanListResponse where T : class + { + public int Count { get; set; } + + public int Page { get; set; } + + public int PageSize { get; set; } + + public IList List { get; set; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs b/QuanTan.SDK/Models/Supplier/Request/Order/QuanTan_Supplier_QueryOrderReuqest.cs new file mode 100644 index 0000000..7fb30af --- /dev/null +++ b/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; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_DeliveryResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_DeliveryResponse.cs new file mode 100644 index 0000000..f2fc530 --- /dev/null +++ b/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 + { + /// + /// 物流公司Id + /// + public string ExpressId { get; set; } + + /// + /// 物流公司名称 + /// + public string ExpressName { get; set; } + + /// + /// 快递单号 + /// + public string ExpressSn { get; set; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_OrderProductResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_OrderProductResponse.cs new file mode 100644 index 0000000..f7a1b76 --- /dev/null +++ b/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; } + + /// + /// 商品名称 + /// + public string Title { get; set; } + + /// + /// 商品图片 + /// + public string Image { get; set; } + + /// + /// 订单商品数量 + /// + public int Quantity { get; set; } + + /// + /// 商品单价 + /// + public decimal Price { get; set; } + + /// + /// 商品总金额 + /// + public decimal ProductPrice { get; set; } + + /// + /// 运费 + /// + public decimal PostagePrice { get; set; } + + /// + /// 总金额 + /// + 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; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs new file mode 100644 index 0000000..fff26c5 --- /dev/null +++ b/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 + { + + } + + 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; } + + /// + /// 货款 + /// + public decimal ProductPrice { get; set; } + + /// + /// 运费 + /// + public decimal TotalPostage { get; set; } + + /// + /// 订单总额 + /// + public decimal TotalPrice { get; set; } + + /// + /// 订单状态：-1、已退款；0、待发货；1、待收货；2、待评价；3、已完成； + /// + public int Status { get; set; } + + /// + /// 支付状态 + /// + public int Paid { get; set; } + + /// + /// 支付时间 + /// + public DateTime? PayTime { get; set; } + + /// + /// 下单时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 最后更新时间 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 下单方式 1、普通下单  2、售罄下单 + /// + public int StockType { get; set; } + + /// + /// 下单来源:0、拳探  1、步步为盈C端 + /// + public int Source { get; set; } + + /// + /// 收货对象 + /// + public QuanTan_Supplier_ReceiptResponse Receipt { get; set; } + + /// + /// 快递信息 + /// + public QuanTan_Supplier_DeliveryResponse Delivery { get; set; } + + /// + /// 订单商品集合 + /// + public IList OrderProduct { get; set; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_ReceiptResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_ReceiptResponse.cs new file mode 100644 index 0000000..57431b3 --- /dev/null +++ b/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; } + } +} diff --git a/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductListResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductListResponse.cs index 500d6f5..c56f556 100644 --- a/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductListResponse.cs +++ b/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 List { get; set; } + public class QuanTan_Supplier_ProductListResponse : QuanTanListResponse + { } } diff --git a/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductSkuListResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductSkuListResponse.cs index 6d1786e..51d8c36 100644 --- a/QuanTan.SDK/Models/Supplier/Response/Product/QuanTan_Supplier_ProductSkuListResponse.cs +++ b/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 List { get; set; } + public class QuanTan_Supplier_ProductSkuListResponse : QuanTanListResponse + { } } diff --git a/SDKAdapter/AdapterEnums.cs b/SDKAdapter/AdapterEnums.cs new file mode 100644 index 0000000..198a38d --- /dev/null +++ b/SDKAdapter/AdapterEnums.cs @@ -0,0 +1,31 @@ +namespace SDKAdapter +{ + public class AdapterEnums + { + public enum PlatformType + { + 淘宝 = 0, + 京东 = 1, + 阿里巴巴 = 2, + 拼多多 = 3, + 微信 = 4, + 拳探 = 10 + } + + /// + /// 排序时间类型(Start = 0, Modify = 1) + /// + public enum SortTimeField + { + Start = 0, Modify = 1 + } + + /// + /// 排序类型(Asc = 0, Desc = 1) + /// + public enum SortType + { + Asc = 0, Desc = 1 + } + } +} diff --git a/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs b/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs index a16c414..f6c06da 100644 --- a/SDKAdapter/OperationPlatform/Client/Base/OP_PlatformClient.cs +++ b/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(); } + + } } diff --git a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs index 1ae90e8..60dbe74 100644 --- a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs +++ b/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() { diff --git a/SDKAdapter/OperationPlatform/Models/Request/Order/OP_QueryOrderRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Order/OP_QueryOrderRequest.cs new file mode 100644 index 0000000..b23d546 --- /dev/null +++ b/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; } + + /// + /// 排序时间字段 + /// + public AdapterEnums.SortTimeField SortTimeField { get; set; } + + /// + /// 排序类型 + /// + public AdapterEnums.SortType SortType { get; set; } + } +} diff --git a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs similarity index 84% rename from SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs rename to SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs index 4ff70ef..7889d8e 100644 --- a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductRequest.cs +++ b/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; } diff --git a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductSkuRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs similarity index 85% rename from SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductSkuRequest.cs rename to SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductSkuRequest.cs index 922120e..e0330fd 100644 --- a/SDKAdapter/OperationPlatform/Models/Request/OP_SearchProductSkuRequest.cs +++ b/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 { /// /// 当Spu有值时会忽略Sku diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs new file mode 100644 index 0000000..a4f8da0 --- /dev/null +++ b/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; } + + /// + /// 支付类型 + /// 京东【 货到付款 = 1,邮局汇款 = 2,自提 = 3,在线支付 = 4,公司转账 = 5,银行卡转账 = 6】 + /// 拳探【】 + /// + public int PayType { get; set; } + + /// + /// 下单来源 + /// 京东【】 + /// 拳探【0 = 拳探,1 = 步步为盈C端】 + /// + public int OrderSource { get; set; } + + + } +} diff --git a/SDKAdapter/OperationPlatform/Models/Response/OP_ProductResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Product/OP_ProductResponse.cs similarity index 100% rename from SDKAdapter/OperationPlatform/Models/Response/OP_ProductResponse.cs rename to SDKAdapter/OperationPlatform/Models/Response/Product/OP_ProductResponse.cs diff --git a/SDKAdapter/PurchasePlatform/Models/AdapterEnums.cs b/SDKAdapter/PurchasePlatform/Models/AdapterEnums.cs deleted file mode 100644 index 34b969b..0000000 --- a/SDKAdapter/PurchasePlatform/Models/AdapterEnums.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace SDKAdapter.PurchasePlatform.Models -{ - public class AdapterEnums - { - public enum PlatformType - { - 淘宝 = 0, - 京东 = 1, - 阿里巴巴 = 2, - 拼多多 = 3, - 微信 = 4, - 拳探 = 10 - } - } -}