From fa6ae32c322c400f2eaf5b2a11c2cde88cc692d3 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 30 Jul 2022 14:05:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=AE=BE=E7=BD=AE=E6=8E=92=E5=BA=8F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=202.=E4=BA=A7=E5=93=81=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=AF=8F=E9=A1=B5=E8=AE=B0=E5=BD=95=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A45=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlatformSDK/JDBusiness.cs | 69 +++---------------- .../Order/SearchPlatformOrderRequest.cs | 5 ++ .../Request/Product/SearchProductRequest.cs | 2 + BBWY.Server.Model/Enums.cs | 8 +++ 4 files changed, 23 insertions(+), 61 deletions(-) diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index aefcadcf..a81b9335 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -74,12 +74,15 @@ namespace BBWY.Server.Business public override ProductListResponse GetProductList(SearchProductRequest searchProductRequest) { + if (searchProductRequest.PageSize == 0) + searchProductRequest.PageSize = 5; + var jdClient = GetJdClient(searchProductRequest.AppKey, searchProductRequest.AppSecret); var req_productList = new WareReadSearchWare4ValidRequest() { orderField = "modified", orderType = "desc", - pageSize = 5, //5 + pageSize = searchProductRequest.PageSize, pageNo = searchProductRequest.PageIndex }; if (!string.IsNullOrEmpty(searchProductRequest.Spu)) @@ -193,6 +196,8 @@ namespace BBWY.Server.Business fbpReq.colType = "1"; fbpReq.optionalFields = searchFields; fbpReq.sortType = "1"; + if (searchOrderRequest.SortTimeType != null) + fbpReq.dateType = ((int)searchOrderRequest.SortTimeType).ToString(); var fbpResponse = jdClient.Execute(fbpReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); if (searchOrderRequest.SaveResponseLog) @@ -226,6 +231,8 @@ namespace BBWY.Server.Business sopReq.page = searchOrderRequest.PageIndex.ToString(); sopReq.pageSize = searchOrderRequest.PageSize.ToString(); sopReq.sortType = "1"; + if (searchOrderRequest.SortTimeType != null) + sopReq.dateType = ((int)searchOrderRequest.SortTimeType).ToString(); //sopReq.dateType = ""; var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); @@ -265,66 +272,6 @@ namespace BBWY.Server.Business orderJtokens.Add(orderInfo); } } - - //foreach (var orderToken in orderJtokens) - //{ - // var order = new OrderResponse() - // { - // Id = orderToken.Value("orderId"), - // BuyerAccount = orderToken.Value("pin"), - // BuyerRemark = orderToken.Value("orderRemark"), - // Consignee = new ConsigneeResponse() - // { - // Address = orderToken["consigneeInfo"].Value("fullAddress"), - // City = orderToken["consigneeInfo"].Value("city"), - // Province = orderToken["consigneeInfo"].Value("province"), - // County = orderToken["consigneeInfo"].Value("county"), - // Town = orderToken["consigneeInfo"].Value("town"), - // ContactName = orderToken["consigneeInfo"].Value("fullname"), - // Mobile = orderToken["consigneeInfo"].Value("mobile"), - // TelePhone = orderToken["consigneeInfo"].Value("telephone") - // }, - // FreightPrice = orderToken.Value("freightPrice"), - // OrderEndTime = orderToken.Value("orderEndTime"), - // OrderStartTime = orderToken.Value("orderStartTime"), - // OrderPayment = orderToken.Value("orderPayment"), - // OrderSellerPrice = orderToken.Value("orderSellerPrice"), - // OrderTotalPrice = orderToken.Value("orderTotalPrice"), - // OrderType = (Enums.OrderType)orderToken.Value("orderType"), - // OrderStateText = orderToken.Value("orderStateRemark"), - // Platform = Enums.Platform.京东, - // //Sh = orderToken.Value("venderId"), - // VenderRemark = orderToken.Value("venderRemark"), - // WaybillNo = orderToken.Value("waybill"), - // StoreOrder = orderToken.Value("storeOrder"), - // ItemList = ((JArray)orderToken["itemInfoList"]).Select(skuToken => new OrderSkuResponse() - // { - // Id = skuToken.Value("skuId"), - // ItemTotal = skuToken.Value("itemTotal"), - // Price = skuToken.Value("jdPrice"), - // ProductId = skuToken.Value("wareId"), - // Title = skuToken.Value("skuName").SimplifySkuName(), - // ProductNo = skuToken.Value("productNo") - // }).ToList() - // }; - - // if (order.StoreOrder == "京仓订单") - // order.StorageType = Enums.StorageType.京仓; - // else if (order.StoreOrder == "云仓订单") - // order.StorageType = Enums.StorageType.云仓; - - // var payType = orderToken.Value("payType"); - // if (payType.Contains("-")) - // order.PayType = (Enums.PayType)Convert.ToInt32(payType.Substring(0, 1)); - - // //翻译订单状态 - // //未付款 NOT_PAY - // #region - - // #endregion - - // //response.Items.Add(order); - //} return orderJtokens; } diff --git a/BBWY.Server.Model/Dto/Request/Order/SearchPlatformOrderRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SearchPlatformOrderRequest.cs index c066a9bc..e96a9afe 100644 --- a/BBWY.Server.Model/Dto/Request/Order/SearchPlatformOrderRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Order/SearchPlatformOrderRequest.cs @@ -17,5 +17,10 @@ namespace BBWY.Server.Model.Dto public string JDColType { get; set; } public string OrderState { get; set; } + + /// + /// 排序时间类型 + /// + public Enums.SortTimeType? SortTimeType { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Request/Product/SearchProductRequest.cs b/BBWY.Server.Model/Dto/Request/Product/SearchProductRequest.cs index 69d858b8..c1f1ed78 100644 --- a/BBWY.Server.Model/Dto/Request/Product/SearchProductRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Product/SearchProductRequest.cs @@ -13,5 +13,7 @@ public string ProductName { get; set; } public int PageIndex { get; set; } + + public int PageSize { get; set; } } } diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index 589e0dc4..3b3b5fa3 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -133,5 +133,13 @@ 报损 = 2, 换新 = 3 } + + /// + /// 排序时间类型 + /// + public enum SortTimeType + { + ModifyTime = 0, StartTime = 1 + } } }