Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/PreviewOrderResponse.cs

@@ -21,5 +21,10 @@
         /// 支持的交易方式
         /// </summary>
         public OrderTradeTypeResponse OrderTradeType { get; set; }
+
+        /// <summary>
+        /// 扩展数据
+        /// </summary>
+        public string Extensions { get; set; }
     }
 }

QuanTan.SDK/Client/BaseClient.cs

@@ -1,8 +1,8 @@
 using BBWY.Common.Http;
 using Newtonsoft.Json;
 using QuanTan.SDK.Extensions;
-using QuanTan.SDK.Model.Request;
+using QuanTan.SDK.Model;
-using QuanTan.SDK.Model.Response;
+using QuanTan.SDK.Model;
 using System;
 using System.Net.Http;
 

QuanTan.SDK/Client/QuanTanOrderClient.cs

@@ -0,0 +1,24 @@
+using BBWY.Common.Http;
+using QuanTan.SDK.Model;
+
+namespace QuanTan.SDK.Client
+{
+    public class QuanTanOrderClient : BaseClient
+    {
+        public QuanTanOrderClient(RestApiService restApiService) : base(restApiService)
+        {
+        }
+
+        /// <summary>
+        /// 预览订单
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="appId"></param>
+        /// <param name="appSecret"></param>
+        /// <returns></returns>
+        public QuanTanResponse<QuanTanPreviewOrderResponse> PreviewOrder(QuanTanPreviewOrderRequest request, string appId, string appSecret)
+        {
+            return SendRequest<QuanTanPreviewOrderResponse>("api/platform/cart/add", request, appId, appSecret);
+        }
+    }
+}

QuanTan.SDK/Client/QuanTanProductClient.cs

@@ -1,6 +1,5 @@
 using BBWY.Common.Http;
-using QuanTan.SDK.Model.Response;
+using QuanTan.SDK.Model;
-using QuanTan.SDK.Model.Response.Product;
 namespace QuanTan.SDK.Client
 {
     public class QuanTanProductClient : BaseClient

QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+
+namespace QuanTan.SDK.Model
+{
+    public class QuanTanPreviewOrderRequest
+    {
+        public string clientOrderId { get; set; }
+
+        public string userAccount { get; set; }
+
+        public IList<QuanTanPreviewOrderProduct> buyInfo { get; set; }
+
+        public QuanTanPreviewOrderReceipt receipt { get; set; }
+    }
+
+    public class QuanTanPreviewOrderProduct
+    {
+        public string productId { get; set; }
+
+        public string productSku { get; set; }
+
+        public int quantity { get; set; }
+    }
+
+    public class QuanTanPreviewOrderReceipt
+    {
+        public string province { get; set; }
+
+        public string city { get; set; }
+
+        public int 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/Model/Request/QuanTanBaseParam.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace QuanTan.SDK.Model.Request
+namespace QuanTan.SDK.Model
 {
     public class QuanTanSignParam
     {

QuanTan.SDK/Model/Response/Order/QuanTanPreviewOrderResponse.cs

@@ -0,0 +1,25 @@
+namespace QuanTan.SDK.Model
+{
+    public class QuanTanPreviewOrderResponse
+    {
+        /// <summary>
+        /// 货款
+        /// </summary>
+        public decimal ProductPrice { get; set; }
+
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal PostagePrice { get; set; }
+
+        /// <summary>
+        /// 总费用
+        /// </summary>
+        public decimal TotalPrice { get; set; }
+
+        /// <summary>
+        /// 购物车Id
+        /// </summary>
+        public string CartIds { get; set; }
+    }
+}

QuanTan.SDK/Model/Response/Product/QuanTanProductResponse.cs

@@ -1,9 +1,7 @@
 using QuanTan.SDK.Model.Vender;
-using System;
 using System.Collections.Generic;
-using System.Text;
 
-namespace QuanTan.SDK.Model.Response.Product
+namespace QuanTan.SDK.Model
 {
     public class QuanTanProductResponse
     {

QuanTan.SDK/Model/Response/QuanTanResponse.cs

@@ -1,4 +1,4 @@
-namespace QuanTan.SDK.Model.Response
+namespace QuanTan.SDK.Model
 {
     public class QuanTanResponse
     {

QuanTan.SDK/Model/Vender/Supplier.cs → QuanTan.SDK/Model/Response/Vender/Supplier.cs

@@ -1,4 +1,4 @@
-namespace QuanTan.SDK.Model.Vender
+namespace QuanTan.SDK.Model
 {
     public class Supplier
     {