diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index c6032c2c..88785d2c 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs index 2477252e..b3f7c4a4 100644 --- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs @@ -5,6 +5,7 @@ using BBWY.Server.Model.Dto; using Microsoft.Extensions.Caching.Memory; using QuanTan.SDK.Client; using QuanTan.SDK.Model; +using System; using System.Collections.Generic; using System.Linq; namespace BBWY.Server.Business diff --git a/QuanTan.SDK/Client/BaseClient.cs b/QuanTan.SDK/Client/BaseClient.cs index 528dc052..d836a87f 100644 --- a/QuanTan.SDK/Client/BaseClient.cs +++ b/QuanTan.SDK/Client/BaseClient.cs @@ -25,19 +25,21 @@ namespace QuanTan.SDK.Client if (param == null) param = new object[] { }; + var paramStr = JsonConvert.SerializeObject(param); + var jmStr = JsonConvert.SerializeObject(new QuanTanSignParam() { appId = appId, appSecret = appSecret, callTime = callTime, - _params = JsonConvert.SerializeObject(param), + _params = paramStr, randomNum = randomNum }); var md5Str = jmStr.Md5Encrypt(); var qtToken = $"{appId}-{callTime}-{md5Str}-{randomNum}"; var requestParam = new QuanTanRequestParam() { - Params = param, + Params = paramStr, token = qtToken }; diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs index 94aa29b6..ab308648 100644 --- a/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs +++ b/QuanTan.SDK/Model/Request/Order/QuanTanPreviewOrderRequest.cs @@ -4,8 +4,6 @@ namespace QuanTan.SDK.Model { public class QuanTanPreviewOrderRequest { - public string clientOrderId { get; set; } - public string userAccount { get; set; } public IList buyInfo { get; set; }