|
@ -74,12 +74,15 @@ namespace BBWY.Server.Business |
|
|
|
|
|
|
|
|
public override ProductListResponse GetProductList(SearchProductRequest searchProductRequest) |
|
|
public override ProductListResponse GetProductList(SearchProductRequest searchProductRequest) |
|
|
{ |
|
|
{ |
|
|
|
|
|
if (searchProductRequest.PageSize == 0) |
|
|
|
|
|
searchProductRequest.PageSize = 5; |
|
|
|
|
|
|
|
|
var jdClient = GetJdClient(searchProductRequest.AppKey, searchProductRequest.AppSecret); |
|
|
var jdClient = GetJdClient(searchProductRequest.AppKey, searchProductRequest.AppSecret); |
|
|
var req_productList = new WareReadSearchWare4ValidRequest() |
|
|
var req_productList = new WareReadSearchWare4ValidRequest() |
|
|
{ |
|
|
{ |
|
|
orderField = "modified", |
|
|
orderField = "modified", |
|
|
orderType = "desc", |
|
|
orderType = "desc", |
|
|
pageSize = 5, //5
|
|
|
pageSize = searchProductRequest.PageSize, |
|
|
pageNo = searchProductRequest.PageIndex |
|
|
pageNo = searchProductRequest.PageIndex |
|
|
}; |
|
|
}; |
|
|
if (!string.IsNullOrEmpty(searchProductRequest.Spu)) |
|
|
if (!string.IsNullOrEmpty(searchProductRequest.Spu)) |
|
@ -193,6 +196,8 @@ namespace BBWY.Server.Business |
|
|
fbpReq.colType = "1"; |
|
|
fbpReq.colType = "1"; |
|
|
fbpReq.optionalFields = searchFields; |
|
|
fbpReq.optionalFields = searchFields; |
|
|
fbpReq.sortType = "1"; |
|
|
fbpReq.sortType = "1"; |
|
|
|
|
|
if (searchOrderRequest.SortTimeType != null) |
|
|
|
|
|
fbpReq.dateType = ((int)searchOrderRequest.SortTimeType).ToString(); |
|
|
|
|
|
|
|
|
var fbpResponse = jdClient.Execute(fbpReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); |
|
|
var fbpResponse = jdClient.Execute(fbpReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); |
|
|
if (searchOrderRequest.SaveResponseLog) |
|
|
if (searchOrderRequest.SaveResponseLog) |
|
@ -226,6 +231,8 @@ namespace BBWY.Server.Business |
|
|
sopReq.page = searchOrderRequest.PageIndex.ToString(); |
|
|
sopReq.page = searchOrderRequest.PageIndex.ToString(); |
|
|
sopReq.pageSize = searchOrderRequest.PageSize.ToString(); |
|
|
sopReq.pageSize = searchOrderRequest.PageSize.ToString(); |
|
|
sopReq.sortType = "1"; |
|
|
sopReq.sortType = "1"; |
|
|
|
|
|
if (searchOrderRequest.SortTimeType != null) |
|
|
|
|
|
sopReq.dateType = ((int)searchOrderRequest.SortTimeType).ToString(); |
|
|
//sopReq.dateType = "";
|
|
|
//sopReq.dateType = "";
|
|
|
|
|
|
|
|
|
var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); |
|
|
var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); |
|
@ -265,66 +272,6 @@ namespace BBWY.Server.Business |
|
|
orderJtokens.Add(orderInfo); |
|
|
orderJtokens.Add(orderInfo); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//foreach (var orderToken in orderJtokens)
|
|
|
|
|
|
//{
|
|
|
|
|
|
// var order = new OrderResponse()
|
|
|
|
|
|
// {
|
|
|
|
|
|
// Id = orderToken.Value<string>("orderId"),
|
|
|
|
|
|
// BuyerAccount = orderToken.Value<string>("pin"),
|
|
|
|
|
|
// BuyerRemark = orderToken.Value<string>("orderRemark"),
|
|
|
|
|
|
// Consignee = new ConsigneeResponse()
|
|
|
|
|
|
// {
|
|
|
|
|
|
// Address = orderToken["consigneeInfo"].Value<string>("fullAddress"),
|
|
|
|
|
|
// City = orderToken["consigneeInfo"].Value<string>("city"),
|
|
|
|
|
|
// Province = orderToken["consigneeInfo"].Value<string>("province"),
|
|
|
|
|
|
// County = orderToken["consigneeInfo"].Value<string>("county"),
|
|
|
|
|
|
// Town = orderToken["consigneeInfo"].Value<string>("town"),
|
|
|
|
|
|
// ContactName = orderToken["consigneeInfo"].Value<string>("fullname"),
|
|
|
|
|
|
// Mobile = orderToken["consigneeInfo"].Value<string>("mobile"),
|
|
|
|
|
|
// TelePhone = orderToken["consigneeInfo"].Value<string>("telephone")
|
|
|
|
|
|
// },
|
|
|
|
|
|
// FreightPrice = orderToken.Value<decimal>("freightPrice"),
|
|
|
|
|
|
// OrderEndTime = orderToken.Value<DateTime?>("orderEndTime"),
|
|
|
|
|
|
// OrderStartTime = orderToken.Value<DateTime>("orderStartTime"),
|
|
|
|
|
|
// OrderPayment = orderToken.Value<decimal>("orderPayment"),
|
|
|
|
|
|
// OrderSellerPrice = orderToken.Value<decimal>("orderSellerPrice"),
|
|
|
|
|
|
// OrderTotalPrice = orderToken.Value<decimal>("orderTotalPrice"),
|
|
|
|
|
|
// OrderType = (Enums.OrderType)orderToken.Value<int>("orderType"),
|
|
|
|
|
|
// OrderStateText = orderToken.Value<string>("orderStateRemark"),
|
|
|
|
|
|
// Platform = Enums.Platform.京东,
|
|
|
|
|
|
// //Sh = orderToken.Value<string>("venderId"),
|
|
|
|
|
|
// VenderRemark = orderToken.Value<string>("venderRemark"),
|
|
|
|
|
|
// WaybillNo = orderToken.Value<string>("waybill"),
|
|
|
|
|
|
// StoreOrder = orderToken.Value<string>("storeOrder"),
|
|
|
|
|
|
// ItemList = ((JArray)orderToken["itemInfoList"]).Select(skuToken => new OrderSkuResponse()
|
|
|
|
|
|
// {
|
|
|
|
|
|
// Id = skuToken.Value<string>("skuId"),
|
|
|
|
|
|
// ItemTotal = skuToken.Value<int>("itemTotal"),
|
|
|
|
|
|
// Price = skuToken.Value<decimal>("jdPrice"),
|
|
|
|
|
|
// ProductId = skuToken.Value<string>("wareId"),
|
|
|
|
|
|
// Title = skuToken.Value<string>("skuName").SimplifySkuName(),
|
|
|
|
|
|
// ProductNo = skuToken.Value<string>("productNo")
|
|
|
|
|
|
// }).ToList()
|
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
|
|
// if (order.StoreOrder == "京仓订单")
|
|
|
|
|
|
// order.StorageType = Enums.StorageType.京仓;
|
|
|
|
|
|
// else if (order.StoreOrder == "云仓订单")
|
|
|
|
|
|
// order.StorageType = Enums.StorageType.云仓;
|
|
|
|
|
|
|
|
|
|
|
|
// var payType = orderToken.Value<string>("payType");
|
|
|
|
|
|
// if (payType.Contains("-"))
|
|
|
|
|
|
// order.PayType = (Enums.PayType)Convert.ToInt32(payType.Substring(0, 1));
|
|
|
|
|
|
|
|
|
|
|
|
// //翻译订单状态
|
|
|
|
|
|
// //未付款 NOT_PAY
|
|
|
|
|
|
// #region
|
|
|
|
|
|
|
|
|
|
|
|
// #endregion
|
|
|
|
|
|
|
|
|
|
|
|
// //response.Items.Add(order);
|
|
|
|
|
|
//}
|
|
|
|
|
|
return orderJtokens; |
|
|
return orderJtokens; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|