diff --git a/BBWY.Client/APIServices/PurchaseOrderService.cs b/BBWY.Client/APIServices/PurchaseOrderService.cs index 0e9d964e..6e323e9e 100644 --- a/BBWY.Client/APIServices/PurchaseOrderService.cs +++ b/BBWY.Client/APIServices/PurchaseOrderService.cs @@ -96,21 +96,23 @@ namespace BBWY.Client.APIServices /// /// /// + /// /// public ApiResponse FastCreateOrder(Consignee consignee, - IList purchaseSchemeProductSkuList, - Platform purchasePlatform, - PurchaseAccount purchaseAccount, - PurchaseOrderMode purchaseOrderMode, - string tradeMode, - string remark, - string orderId, - long shopId, - long purchaseAccountId, - string buyerAccount, - string sellerAccount, - string purchaserId, - decimal platformCommissionRatio) + IList purchaseSchemeProductSkuList, + Platform purchasePlatform, + PurchaseAccount purchaseAccount, + PurchaseOrderMode purchaseOrderMode, + string tradeMode, + string remark, + string orderId, + long shopId, + long purchaseAccountId, + string buyerAccount, + string sellerAccount, + string purchaserId, + decimal platformCommissionRatio, + string extensions) { return SendRequest(globalContext.BBYWApiHost, "api/purchaseOrder/NewFastCreateOrder", new { @@ -137,7 +139,8 @@ namespace BBWY.Client.APIServices buyerAccount, sellerAccount, purchaserId, - platformCommissionRatio + platformCommissionRatio, + extensions }, null, HttpMethod.Post); } diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index d7026e40..eb7321e4 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -287,7 +287,7 @@ namespace BBWY.Client.ViewModels TelePhone = Mobile, Town = Town }, PurchaseSchemeProductSkuList, - Platform.阿里巴巴, + purchaseAccount.PurchasePlatformId, purchaseAccount, PurchaseOrderMode, tradeMode, @@ -298,7 +298,8 @@ namespace BBWY.Client.ViewModels purchaseAccount.AccountName, purchaseSchemeList[0].PurchaserName, purchaser.Id, - globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)).ContinueWith(t => + globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M, + extensions)).ContinueWith(t => { IsLoading = false; var r = t.Result; diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs index b3f7c4a4..01674da6 100644 --- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs @@ -24,6 +24,7 @@ namespace BBWY.Server.Business { var quantanPreviewOrderRequest = new QuanTanPreviewOrderRequest() { + clientOrderId = "", userAccount = previewOrderReuqest.AppToken, receipt = new QuanTanPreviewOrderReceipt() { diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs index ab308648..94aa29b6 100644 --- a/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs +++ b/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs @@ -4,6 +4,8 @@ namespace QuanTan.SDK.Model { public class QuanTanPreviewOrderRequest { + public string clientOrderId { get; set; } + public string userAccount { get; set; } public IList buyInfo { get; set; }