From 9382499d745af02cd0be9b6da657696db14379fb Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Tue, 28 Feb 2023 15:44:46 +0800 Subject: [PATCH] 1 --- BBWY.Server.API/Startup.cs | 2 +- .../PlatformSDK/QuanTanBusiness.cs | 23 +++- .../OnlinePurchaseOrderSimpleResponse.cs | 1 + QuanTan.SDK/Client/QuanTanOrderClient.cs | 5 + .../Order/QuanTanGetOrderDetailRequest.cs | 9 ++ .../Request/Order/QuanTanGetOrderRequest.cs | 11 -- .../Order/QuanTanOrderDetailResponse.cs | 101 ++++++++++++++++++ 7 files changed, 139 insertions(+), 13 deletions(-) create mode 100644 QuanTan.SDK/Model/Request/Order/QuanTanGetOrderDetailRequest.cs delete mode 100644 QuanTan.SDK/Model/Request/Order/QuanTanGetOrderRequest.cs create mode 100644 QuanTan.SDK/Model/Response/Order/QuanTanOrderDetailResponse.cs diff --git a/BBWY.Server.API/Startup.cs b/BBWY.Server.API/Startup.cs index 0478b2db..8d9f26b6 100644 --- a/BBWY.Server.API/Startup.cs +++ b/BBWY.Server.API/Startup.cs @@ -81,7 +81,7 @@ namespace BBWY.Server.API services.BatchRegisterServices(new Assembly[] { Assembly.Load("BBWY.Server.Business") }, typeof(IDenpendency)); services.AddSingleton(); services.AddSingleton(); - + services.AddSingleton(); //var stores = Configuration.GetSection("Stores").Get>(); services.Configure(Configuration.GetSection("GlobalSetting")); diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs index 7a985d43..2477252e 100644 --- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs @@ -89,7 +89,28 @@ namespace BBWY.Server.Business public override OnlinePurchaseOrderSimpleResponse GetOrderSimpleInfo(GetOrderInfoRequest getOrderInfoRequest) { - return base.GetOrderSimpleInfo(getOrderInfoRequest); + var qtResponse = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest() + { + orderId = getOrderInfoRequest.OrderId, + userAccount = getOrderInfoRequest.AppToken + }, getOrderInfoRequest.AppKey, getOrderInfoRequest.AppSecret); + if (qtResponse.Status != 200) + throw new BusinessException($"获取订单详情失败{getOrderInfoRequest.OrderId},{qtResponse.Message}"); + return new OnlinePurchaseOrderSimpleResponse() + { + PurchaseOrderId = getOrderInfoRequest.OrderId, + FreightAmount = qtResponse.Data.TotalPostage, + ProductAmount = qtResponse.Data.ProductPrice, + TotalAmount = qtResponse.Data.TotalPrice, + ItemList = qtResponse.Data.OrderProduct.Select(o => new OnlinePurchaseOrderSkuSimpleResponse() + { + ProductAmount = o.ProductPrice, + Price = o.Price, + ProductId = o.ProductId, + SkuId = o.ProductSku, + Quantity = o.Quantity + }).ToList() + }; } } } diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs index 0bbb1c31..dc1d6899 100644 --- a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs +++ b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs @@ -31,6 +31,7 @@ namespace BBWY.Server.Model.Dto /// 采购单简单明细列表 /// public IList ItemList { get; set; } + } /// diff --git a/QuanTan.SDK/Client/QuanTanOrderClient.cs b/QuanTan.SDK/Client/QuanTanOrderClient.cs index 45b770c7..ebc1bb8e 100644 --- a/QuanTan.SDK/Client/QuanTanOrderClient.cs +++ b/QuanTan.SDK/Client/QuanTanOrderClient.cs @@ -25,5 +25,10 @@ namespace QuanTan.SDK.Client { return SendRequest("api/platform/order/add", request, appId, appSecret); } + + public QuanTanResponse GetOrderDetail(QuanTanGetOrderDetailRequest request, string appId, string appSecret) + { + return SendRequest("api/platform/order/detail", request, appId, appSecret); + } } } diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderDetailRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderDetailRequest.cs new file mode 100644 index 00000000..057eaf15 --- /dev/null +++ b/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderDetailRequest.cs @@ -0,0 +1,9 @@ +namespace QuanTan.SDK.Model +{ + public class QuanTanGetOrderDetailRequest + { + public string userAccount { get; set; } + + public string orderId { get; set; } + } +} diff --git a/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderRequest.cs b/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderRequest.cs deleted file mode 100644 index 263a7dce..00000000 --- a/QuanTan.SDK/Model/Request/Order/QuanTanGetOrderRequest.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace QuanTan.SDK.Model -{ - public class QuanTanGetOrderRequest - { - - } -} diff --git a/QuanTan.SDK/Model/Response/Order/QuanTanOrderDetailResponse.cs b/QuanTan.SDK/Model/Response/Order/QuanTanOrderDetailResponse.cs new file mode 100644 index 00000000..f7926889 --- /dev/null +++ b/QuanTan.SDK/Model/Response/Order/QuanTanOrderDetailResponse.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; + +namespace QuanTan.SDK.Model +{ + public class QuanTanOrderDetailResponse + { + public string OrderId { get; set; } + + public string OrderSn { get; set; } + + public string ClientOrderId { get; set; } + + public string GroupOrderId { 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; } + + /// + /// 支付状态：0、待支付  1、已支付 + /// + public int Paid { get; set; } + + public DateTime? PayTime { get; set; } + + /// + /// 下单方式:1、普通下单  2、售罄下单 + /// + public int StockType { get; set; } + + public QuanTanOrderDetailReceipt Receipt { get; set; } + + public IList OrderProduct { get; set; } + } + + public class QuanTanOrderDetailReceipt : QuanTanPreviewOrderReceipt + { + + } + + public class QuanTanOrderDetailProduct + { + public string OrderProductId { get; set; } + + public string ProductId { get; set; } + + public string ProductSku { 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 QuanTanOrderDetailProductSku SkuInfo { get; set; } + } + + public class QuanTanOrderDetailProductSku + { + 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; } + } +}