diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
new file mode 100644
index 0000000..03e8f0f
--- /dev/null
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -0,0 +1,7 @@
+namespace BBWYB.Server.Business.Sync
+{
+ public class OrderSyncBusiness
+ {
+
+ }
+}
diff --git a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
index 35c3aea..e5b1ded 100644
--- a/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
+++ b/QuanTan.SDK/Models/Supplier/Response/Order/QuanTan_Supplier_QueryOrderResponse.cs
@@ -48,12 +48,12 @@
///
/// 下单时间
///
- public DateTime? CreateTime { get; set; }
+ public DateTime CreateTime { get; set; }
///
/// 最后更新时间
///
- public DateTime? UpdateTime { get; set; }
+ public DateTime UpdateTime { get; set; }
///
/// 下单方式 1、普通下单 2、售罄下单
diff --git a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
index 5be10e5..3f44572 100644
--- a/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
+++ b/SDKAdapter/OperationPlatform/Client/Impl/OP_QuanTanClient.cs
@@ -2,7 +2,6 @@
using QuanTan.SDK.Client.Supplier;
using QuanTan.SDK.Models.Supplier;
using SDKAdapter.OperationPlatform.Models;
-using SDKAdapter.PurchasePlatform.Models;
namespace SDKAdapter.OperationPlatform.Client
{
@@ -78,12 +77,87 @@ namespace SDKAdapter.OperationPlatform.Client
public override OP_OrderListResponse GetOrderList(OP_QueryOrderRequest request)
{
- var qtResponse = supplier_OrderClient.GetOrderList(new QuanTan_Supplier_QueryOrderReuqest()
+ request.OrderId = request.OrderId ?? string.Empty;
+ var qtRequest = new QuanTan_Supplier_QueryOrderReuqest()
{
- storeId = request.AppToken
+ storeId = request.AppToken,
+ orderId = request.OrderId,
+ order = request.SortTimeField == AdapterEnums.SortTimeField.Modify ? "update_time" : "create_time",
+ orderBy = request.SortType == AdapterEnums.SortType.Asc ? "asc" : "desc",
+ page = request.PageIndex,
+ pageSize = request.PageSize
+ };
+ if (request.SortTimeField == AdapterEnums.SortTimeField.Modify)
+ {
+ if (request.StartDate != null)
+ qtRequest.updateStart = request.StartDate;
+ if (request.EndDate != null)
+ qtRequest.updateEnd = request.EndDate;
+ }
+ else if (request.SortTimeField == AdapterEnums.SortTimeField.Start)
+ {
+ if (request.StartDate != null)
+ qtRequest.createStart = request.StartDate;
+ if (request.EndDate != null)
+ qtRequest.createEnd = request.EndDate;
+ }
- }, request.AppKey, request.AppSecret);
- return base.GetOrderList(request);
+ var qtResponse = supplier_OrderClient.GetOrderList(qtRequest, request.AppKey, request.AppSecret);
+ if (qtResponse.Status != 200)
+ throw new Exception(qtResponse.Message);
+
+ return new OP_OrderListResponse()
+ {
+ Count = qtResponse.Data.Count,
+ Items = qtResponse.Data.List.Select(qto => new OP_OrderResponse()
+ {
+ OrderPlatform = AdapterEnums.PlatformType.拳探,
+ OrderId = qto.OrderId,
+ BuyerRemark = qto.BuyRemark,
+ VenderRemark = qto.MerRemark,
+ Consignee = new OP_OrderConsigneeResponse()
+ {
+ Address = qto.Receipt.Address,
+ City = qto.Receipt.City,
+ ContactName = qto.Receipt.RealName,
+ County = qto.Receipt.Area,
+ Mobile = qto.Receipt.Phone,
+ Province = qto.Receipt.Province,
+ Town = qto.Receipt.Town
+ },
+ StartTime = qto.CreateTime,
+ ModifyTime = qto.UpdateTime,
+ FreightAmount = qto.TotalPostage,
+ OrderState = qto.Status.ToString(),
+ EndTime = qto.Status == 3 ? qto.UpdateTime : null,
+ OrderPayment = qto.TotalPrice,
+ OrderProductAmount = qto.ProductPrice,
+ OrderSource = qto.Source,
+ OrderTotalAmount = qto.TotalPrice,
+ PaidInAmount = qto.TotalPrice,
+ PayType = 0,
+ IsPay = qto.Paid == 1,
+ PreferentialAmount = 0,
+ SellerPreferentialAmount = 0,
+ OrderSkuList = qto.OrderProduct.Select(qtosku => new OP_OrderProductSkuResponse()
+ {
+ Id = qtosku.OrderProductId,
+ ProductId = qtosku.ProductId,
+ ProductTitle = qtosku.Title,
+ SkuId = qtosku.ProductSku,
+ Quantity = qtosku.Quantity,
+ SkuLogo = qtosku.SkuInfo.Image,
+ SkuPrice = qtosku.SkuInfo.Price,
+ SkuTitle = qtosku.SkuInfo.Title
+ }).ToList(),
+ DeliveryResponse = new OP_OrderDeliveryResponse()
+ {
+ ExpressId = qto.Delivery?.ExpressId ?? string.Empty,
+ ExpressName = qto.Delivery?.ExpressName ?? string.Empty,
+ WayBillNo = qto.Delivery?.ExpressSn ?? string.Empty
+ }
+ }).ToList()
+ };
}
}
}
diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderConsigneeResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderConsigneeResponse.cs
index c37e028..95a5cd8 100644
--- a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderConsigneeResponse.cs
+++ b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderConsigneeResponse.cs
@@ -2,5 +2,18 @@
{
public class OP_OrderConsigneeResponse
{
+ public string ContactName { get; set; }
+
+ public string Address { get; set; }
+
+ public string Mobile { get; set; }
+
+ public string Province { get; set; }
+
+ public string City { get; set; }
+
+ public string County { get; set; }
+
+ public string Town { get; set; }
}
}
diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderDeliveryResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderDeliveryResponse.cs
new file mode 100644
index 0000000..c51ebf4
--- /dev/null
+++ b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderDeliveryResponse.cs
@@ -0,0 +1,11 @@
+namespace SDKAdapter.OperationPlatform.Models
+{
+ public class OP_OrderDeliveryResponse
+ {
+ public string ExpressId { get; set; }
+
+ public string ExpressName { get; set; }
+
+ public string WayBillNo { get; set; }
+ }
+}
diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderProductSkuResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderProductSkuResponse.cs
index 5870eee..b2c246d 100644
--- a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderProductSkuResponse.cs
+++ b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderProductSkuResponse.cs
@@ -7,18 +7,20 @@
///
public string Id { get; set; }
- ///
- /// 订单号
- ///
- public string OrderId { get; set; }
+ /////
+ ///// 订单号
+ /////
+ //public string OrderId { get; set; }
public string ProductId { get; set; }
+ public string ProductTitle { get; set; }
+
public string SkuId { get; set; }
public string SkuTitle { get; set; }
- public string ProductTitle { get; set; }
+ public string SkuLogo { get; set; }
///
/// Sku单价
diff --git a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
index fe5cf90..d8f2674 100644
--- a/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
+++ b/SDKAdapter/OperationPlatform/Models/Response/Order/OP_OrderResponse.cs
@@ -20,6 +20,11 @@
///
public int PayType { get; set; }
+ ///
+ /// 是否支付
+ ///
+ public bool IsPay { get; set; }
+
///
/// 下单来源
/// 京东【】
@@ -27,13 +32,6 @@
///
public int OrderSource { get; set; }
- ///
- /// 仓储类型
- /// 京东【京仓 = 0,云仓 = 1,本地自发 = 2,代发 = 3,SD = 4】
- /// 拳探【本地自发 = 2,代发 = 3】
- ///
- public int StorageType { get; set; }
-
///
/// 订单状态
/// 京东【WAIT_SELLER_STOCK_OUT 等待出库,WAIT_GOODS_RECEIVE_CONFIRM 等待确认收货,WAIT_SELLER_DELIVERY等待发货（只适用于海外购商家，含义为'等待境内发货'标签下的订单,非海外购商家无需使用） , PAUSE 暂停（loc订单可通过此状态获取）,FINISHED_L 完成,TRADE_CANCELED 取消,LOCKED 已锁定,POP_ORDER_PAUSE pop业务暂停】
@@ -88,7 +86,10 @@
#endregion
#region 收货人信息
-
+ ///
+ /// 收货人信息
+ ///
+ public OP_OrderConsigneeResponse Consignee { get; set; }
#endregion
#region 商品信息
@@ -96,12 +97,15 @@
#endregion
#region 物流信息
-
+ public OP_OrderDeliveryResponse DeliveryResponse { get; set; }
#endregion
- #region 各平台独有数据
-
+ #region 京东平台独有数据
+ ///
+ /// 京东独有属性,入仓标识 (京仓|云仓)
+ ///
+ public string JD_StoreOrder { get; set; }
#endregion
}
}