diff --git a/BBWY.Client/APIServices/BatchPurchaseService.cs b/BBWY.Client/APIServices/BatchPurchaseService.cs index d24e2351..b9c0b993 100644 --- a/BBWY.Client/APIServices/BatchPurchaseService.cs +++ b/BBWY.Client/APIServices/BatchPurchaseService.cs @@ -93,11 +93,12 @@ namespace BBWY.Client.APIServices BelongSkuTitle = productSkuWithScheme.Title, BelongLogo = productSkuWithScheme.Logo, BelongQuantity = productSkuWithScheme.Quantity, - BelongPurchaseSchemeId = productSkuWithScheme.PurchaseSchemeId + BelongPurchaseSchemeId = productSkuWithScheme.PurchaseSchemeId, + }); } } - + string autoPay = "fail"; return SendRequest(globalContext.BBYWApiHost, "api/BatchPurchase/BatchCreateOrder", new { consignee, @@ -106,6 +107,7 @@ namespace BBWY.Client.APIServices productParamList, extensions, remark, + autoPay, globalContext.User.Shop.ShopId, globalContext.User.Shop.ShopName }, null, HttpMethod.Post); @@ -135,5 +137,41 @@ namespace BBWY.Client.APIServices endDate }, null, HttpMethod.Post); } + + + public ApiResponse PayOrder(string orderId, Platform PurchasePlatform, PurchaseAccount purchaseAccount) + { + return SendRequest(globalContext.BBYWApiHost, "api/BatchPurchase/PayPurchaseOrder", new + { + orderId, + PurchasePlatform, + purchaseAccount, + globalContext.User.Shop.ShopId, + globalContext.User.Shop.ShopName, + globalContext.User.Shop.AppKey, + globalContext.User.Shop.AppSecret, + globalContext.User.Shop.AppToken + }, null, HttpMethod.Post); + } + + public ApiResponse CancelOrder(string orderId,Platform PurchasePlatform, PurchaseAccount purchaseAccount, string remark="") + { + return SendRequest(globalContext.BBYWApiHost, "api/BatchPurchase/CancelPurchaseOrder", new + { + + orderId, + PurchasePlatform, + purchaseAccount, + remark, + globalContext.User.Shop.ShopId, + globalContext.User.Shop.ShopName, + globalContext.User.Shop.AppKey, + globalContext.User.Shop.AppSecret, + globalContext.User.Shop.AppToken + }, null, HttpMethod.Post); + } + + + } } diff --git a/BBWY.Client/App.xaml b/BBWY.Client/App.xaml index 02766afa..5a21853b 100644 --- a/BBWY.Client/App.xaml +++ b/BBWY.Client/App.xaml @@ -17,7 +17,7 @@ - + diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index 9622efaf..3c6663c7 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -1,6 +1,6 @@ { - //"BBWYApiHost": "http://localhost:5000", - "BBWYApiHost": "http://bbwytest.qiyue666.com", + "BBWYApiHost": "http://localhost:5000", + //"BBWYApiHost": "http://bbwytest.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/BatchCreareOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/BatchCreareOrderResponse.cs index 49eed28c..4a17b47c 100644 --- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/BatchCreareOrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/BatchCreareOrderResponse.cs @@ -18,4 +18,11 @@ namespace BBWY.Client.Models public string ErrorMsg { get; set; } } + public class PayPurchaseOrderResponse + { + public bool Success { get; set; } + + public string Msg { get; set; } + } + } diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs index 0839dce2..5d87d8a3 100644 --- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs +++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs @@ -5,19 +5,19 @@ using BBWY.Common.Extensions; using BBWY.Common.Models; using BBWY.Controls; using GalaSoft.MvvmLight.Command; -using HandyControl.Controls; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; +using System.Windows; using System.Windows.Input; namespace BBWY.Client.ViewModels { public class BatchPurchaseOrderListViewModel : BaseVM, IDenpendency { - private BatchPurchaseService batchPurchaseService; + private BatchPurchaseService batchPurchaseService; private GlobalContext globalContext; private DateTime startDate; private DateTime endDate; @@ -40,6 +40,9 @@ namespace BBWY.Client.ViewModels public ICommand OnPageIndexChangedCommand { get; set; } + public ICommand PayPurchaseOrderCommand { get; set; } + + public ICommand CancelPurchaseOrderCommand { get; set; } public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } } public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } } @@ -66,6 +69,9 @@ namespace BBWY.Client.ViewModels SearchPurchaseOrderCommand = new RelayCommand(InitQueryPurchaseOrder); OpenCreateNewPurchaseOrderDialogCommand = new RelayCommand(OpenCreateNewPurchaseOrderDialog); OnPageIndexChangedCommand = new RelayCommand(OnPageIndexChanged); + + PayPurchaseOrderCommand = new RelayCommand(PayPurchaseOrder); + CancelPurchaseOrderCommand = new RelayCommand(CancelPurchaseOrder); PageSize = 10; this.globalContext = globalContext; EndDate = DateTime.Now.Date; @@ -74,6 +80,51 @@ namespace BBWY.Client.ViewModels InitQueryPurchaseOrder(); } + + + private void CancelPurchaseOrder(object obj) + { + MessageBoxResult result = MessageBox.Show("确定取消订单?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning); + if (result != MessageBoxResult.Yes) return; + //; + var parameters = (object[])obj ; + + var PurchasePlatform = (Platform)parameters[0] ;//采购平台 + + + var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform); + + var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount, ""); + if (res.Success) + { + Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex)); + return; + } + MessageBox.Show(res.Data.Msg); + } + + private void PayPurchaseOrder(object obj) + { + + MessageBoxResult result = MessageBox.Show("确定支付订单?", "提示", + MessageBoxButton.YesNo, + MessageBoxImage.Warning); + if (result != MessageBoxResult.Yes) return; + + var parameters = (object[])obj; + var PurchasePlatform = (Platform)parameters[0];//采购平台 + var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform); + var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount); + if (res.Success) + { + Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex)); + return; + } + MessageBox.Show(res.Data.Msg); + + } private void InitQueryPurchaseOrder() { diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml index c409998f..46b3e9e0 100644 --- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml +++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml @@ -144,6 +144,10 @@ Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:#8080FF:#F2F2F2}" Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:White:#4A4A4A}" Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.已完成}"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs index ee6a7fb8..8511321f 100644 --- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs +++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs @@ -58,5 +58,17 @@ namespace BBWY.Server.API.Controllers { return batchPurchaseBusiness.GetPurchaseOrderList(request); } + + [HttpPost] + public PayPurchaseOrderResponse PayPurchaseOrder([FromBody] PayPurchaseOrderRequest request) + { + return batchPurchaseBusiness.PayPurchaseOrder(request); + } + + [HttpPost] + public CancelPurchaseOrderResponse CancelPurchaseOrder([FromBody] CancelPurchaseOrderRequest request) + { + return batchPurchaseBusiness.CancelPurchaseOrder(request); + } } } diff --git a/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs b/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs index a20fb6d6..9cf355de 100644 --- a/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs @@ -83,6 +83,14 @@ namespace BBWY.Server.Business throw new NotImplementedException(); } + public virtual PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest) + { + throw new NotImplementedException(); + } + public virtual CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request) + { + throw new NotImplementedException(); + } public virtual CreateOnlinePurchaseOrderResponse FastCreateOrder(CreateOnlinePurchaseOrderRequest createOnlinePurchaseOrderRequest) { throw new NotImplementedException(); @@ -108,6 +116,8 @@ namespace BBWY.Server.Business throw new NotImplementedException(); } + + public virtual JArray GetJDShopSopularizeRecordList(SyncShopPopularizeRequest syncShopPopularizeRequest) { throw new NotImplementedException(); @@ -202,5 +212,7 @@ namespace BBWY.Server.Business { throw new NotImplementedException(); } + + } } diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs index f4a9b4ca..a306eb31 100644 --- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs @@ -19,6 +19,46 @@ namespace BBWY.Server.Business this.quanTanOrderClient = new QuanTanOrderClient(restApiService, nLogManager.Default()); } + public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest) + { + var data = payPurchaseOrderRequest.PurchaseAccount; + var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest { orderId= payPurchaseOrderRequest.OrderId, + userAccount= data.AccountName + }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret); + if (qtResponse.Status != 200) + return new PayPurchaseOrderResponse + { + Success = false, Msg=qtResponse.Message + }; + + return new PayPurchaseOrderResponse { Success = true }; + + } + public override CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request) + { + + var data = request.PurchaseAccount; + + var qtResponse = quanTanOrderClient.CancelOrder(new QuanTanCancelOrderRequest + { + orderId = request.OrderId, + userAccount = data.AccountName, + remark =request.Remark, + }, request.PurchaseAccount.AppKey, request.PurchaseAccount.AppSecret); + if (qtResponse.Status != 200) + return new CancelPurchaseOrderResponse + { + Success = false, + Msg = qtResponse.Message + }; + + //将数据库设置取消 + + return new CancelPurchaseOrderResponse { Success = true }; + } + + + public override PreviewOrderResponse PreviewOrder(PreviewOrderReuqest previewOrderReuqest) { var quantanPreviewOrderRequest = new QuanTanPreviewOrderRequest() @@ -64,6 +104,7 @@ namespace BBWY.Server.Business clientOrderId = createOnlinePurchaseOrderRequest.OrderId, userAccount = createOnlinePurchaseOrderRequest.AppToken, cartIds = createOnlinePurchaseOrderRequest.Extensions, + autoPay= createOnlinePurchaseOrderRequest.AutoPay, receipt = new QuanTanCreateOrderReceipt() { province = createOnlinePurchaseOrderRequest.Consignee.Province, diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index 5718e969..5716df40 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Yitter.IdGenerator; +using static System.Net.Mime.MediaTypeNames; namespace BBWY.Server.Business { @@ -257,7 +258,9 @@ namespace BBWY.Server.Business SpecId = p.PurchaseSpecId }).ToList(), TradeMode = tradeMode, - Extensions = cardId + Extensions = cardId, + AutoPay = request.AutoPay, + }); @@ -385,5 +388,45 @@ namespace BBWY.Server.Business purchaseOrder.ItemList = purchaseOrderSkuList.Where(posku => posku.PurchaseOrderId == purchaseOrder.Id).ToList(); return new PurchaseOrderV2ListResponse() { Count = total, ItemList = purchaseOrderList }; } + + public PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest request) + { + var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.PurchasePlatform); + var payOrderResponse = platformSDKBusiness.PayPurchaseOrder(request); + + if (payOrderResponse.Success) + { + var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); + + fsql.Update(order) + .Set(a => a.OrderState, Enums.PurchaseOrderState.待发货) + .ExecuteAffrows(); + } + + return new PayPurchaseOrderResponse() { Success= payOrderResponse.Success, + Msg = payOrderResponse.Msg + }; + } + + public CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request) + { + var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.PurchasePlatform); + var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request); + + if (payOrderResponse.Success) + { + var order =fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); + fsql.Update(order) + .Set(a => a.OrderState, Enums.PurchaseOrderState.已取消) + .ExecuteAffrows(); + } + + + return new CancelPurchaseOrderResponse() + { + Success = payOrderResponse.Success, + Msg = payOrderResponse.Msg + }; + } } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs index 2d979e28..62f3d1db 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs @@ -51,5 +51,10 @@ public string SourceSku { get; set; } public string SourceShopName { get; set; } + + /// + /// fail 不自动支付 success :自动支付 + /// + public string AutoPay { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/BatchPurchaseCreateOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/BatchPurchaseCreateOrderRequest.cs index 17128f94..c6a8e359 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/BatchPurchaseCreateOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/BatchPurchaseCreateOrderRequest.cs @@ -15,5 +15,9 @@ public long ShopId { get; set; } public string ShopName { get; set; } + + public string AutoPay { get; set; } + + } } diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs new file mode 100644 index 00000000..6bf72d6e --- /dev/null +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs @@ -0,0 +1,22 @@ +using BBWY.Server.Model.Db; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class CancelPurchaseOrderRequest: PlatformRequest + { + public string OrderId { get; set; } + + + public string Remark { get; set; } + + public PurchaseAccount PurchaseAccount { get; set; } + + /// + /// 采购平台 + /// + public Enums.Platform PurchasePlatform { get; set; } + } +} diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs new file mode 100644 index 00000000..214041e0 --- /dev/null +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs @@ -0,0 +1,20 @@ +using BBWY.Server.Model.Db; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class PayPurchaseOrderRequest : PlatformRequest + { + public string OrderId { get; set; } + + public PurchaseAccount PurchaseAccount { get; set; } + + + /// + /// 采购平台 + /// + public Enums.Platform PurchasePlatform { get; set; } + } +} diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderResponse.cs new file mode 100644 index 00000000..6adc8a75 --- /dev/null +++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderResponse.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class CancelPurchaseOrderResponse + { + public bool Success { get; set; } + + public string Msg { get; set; } + } +} diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderResponse.cs new file mode 100644 index 00000000..710c4412 --- /dev/null +++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderResponse.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class PayPurchaseOrderResponse + { + public bool Success { get; set; } + + public string Msg { get; set; } + } +} diff --git a/QuanTan.SDK/Client/BaseClient.cs b/QuanTan.SDK/Client/BaseClient.cs index d36544d1..53011e2f 100644 --- a/QuanTan.SDK/Client/BaseClient.cs +++ b/QuanTan.SDK/Client/BaseClient.cs @@ -28,12 +28,19 @@ namespace QuanTan.SDK.Client if (param == null) param = new object[] { }; +#if DEBUG + appId = "BBWY2023022001"; + appSecret = "908e131365d5448ca651ba20ed7ddefe"; +#endif + var paramStr = JsonConvert.SerializeObject(param); var jmStr = JsonConvert.SerializeObject(new QuanTanSignParam() { + //appId = appId, appId = appId, - appSecret = appSecret, + appSecret = appSecret,// + callTime = callTime, _params = paramStr, randomNum = randomNum diff --git a/QuanTan.SDK/Client/QuanTanOrderClient.cs b/QuanTan.SDK/Client/QuanTanOrderClient.cs index 46013ca3..005d2613 100644 --- a/QuanTan.SDK/Client/QuanTanOrderClient.cs +++ b/QuanTan.SDK/Client/QuanTanOrderClient.cs @@ -30,5 +30,14 @@ namespace QuanTan.SDK.Client { return SendRequest("api/platform/order/detail", request, appId, appSecret); } + + public QuanTanResponse PayOrder(QuanTanPayOrderRequest request, string appId, string appSecret) + { + return SendRequest("api/platform/order/pay", request, appId, appSecret); + } + public QuanTanResponse CancelOrder(QuanTanCancelOrderRequest request, string appId, string appSecret) + { + return SendRequest("api/platform/order/cancel", request, appId, appSecret); + } } } diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanCancelOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanCancelOrderRequest.cs new file mode 100644 index 00000000..b3dc25e5 --- /dev/null +++ b/QuanTan.SDK/Model/Request/Order/QuanTanCancelOrderRequest.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace QuanTan.SDK.Model +{ + public class QuanTanCancelOrderRequest + { + public string userAccount { get; set; } + + public string orderId { get; set; } + + public string remark { get; set; } + } +} diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs index 9c04a2ab..d4a3c485 100644 --- a/QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs +++ b/QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs @@ -11,6 +11,8 @@ public QuanTanCreateOrderReceipt receipt { get; set; } public string extended { get; set; } + + public string autoPay { get; set; } } public class QuanTanCreateOrderReceipt : QuanTanPreviewOrderReceipt diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanPayOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanPayOrderRequest.cs new file mode 100644 index 00000000..e51c87b5 --- /dev/null +++ b/QuanTan.SDK/Model/Request/Order/QuanTanPayOrderRequest.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace QuanTan.SDK.Model +{ + public class QuanTanPayOrderRequest + { + public string userAccount { get; set; } + + public string orderId { get; set; } + } +} diff --git a/QuanTan.SDK/Model/Response/Order/QuanTanCancelOrderResponse.cs b/QuanTan.SDK/Model/Response/Order/QuanTanCancelOrderResponse.cs new file mode 100644 index 00000000..96701386 --- /dev/null +++ b/QuanTan.SDK/Model/Response/Order/QuanTanCancelOrderResponse.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace QuanTan.SDK.Model +{ + public class QuanTanCancelOrderResponse + { + ///// + ///// 200成功 400失败 + ///// + //public string Status { get; set; } + + //public string message { get; set; } + + public int OrderId { get; set; } + + public int GroupOrderId { get; set; } + + public string OrderSn { get; set; } + + public string CancelStatus { get; set; } + } +} diff --git a/QuanTan.SDK/Model/Response/Order/QuanTanPayOrderResponse.cs b/QuanTan.SDK/Model/Response/Order/QuanTanPayOrderResponse.cs new file mode 100644 index 00000000..d9f3ca3a --- /dev/null +++ b/QuanTan.SDK/Model/Response/Order/QuanTanPayOrderResponse.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace QuanTan.SDK.Model +{ + public class QuanTanPayOrderResponse + { + ///// + ///// 200成功 400失败 + ///// + //public string Status { get; set; } + + public string PayStatus { get; set; } + + public string GroupOrderId { get; set; } + + public string OrderSn { get; set; } + + + } +}