From 949bd8db9d498d1b054638e62a6352cffcf00f6f Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 1 Jun 2022 19:46:17 +0800 Subject: [PATCH] 1 --- BBWY.Server.Business/Order/OrderBusiness.cs | 2 +- .../PlatformSDK/JDBusiness.cs | 6 +- BBWY.Test/BBWY.Test.csproj | 4 +- BBWY.Test/Program.cs | 55 +++++++++++++------ 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index cf818e82..ba30f992 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -915,7 +915,7 @@ namespace BBWY.Server.Business PageSize = 100, Platform = shop.Platform, JDColType = string.IsNullOrEmpty(shop.VenderType) ? "0" : shop.VenderType, - SaveResponseLog = false, + SaveResponseLog = true, OrderId = orderId }, null, HttpMethod.Post); if (orderListApiResult.StatusCode != System.Net.HttpStatusCode.OK) diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index 56ea584a..344a7916 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -211,7 +211,7 @@ namespace BBWY.Server.Business if (searchOrderRequest.StartDate != null) sopReq.startDate = searchOrderRequest.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"); if (searchOrderRequest.EndDate != null) - sopReq.endDate = searchOrderRequest.EndDate.Value.Date.ToString("yyyy-MM-dd HH:mm:ss"); + sopReq.endDate = searchOrderRequest.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"); if (string.IsNullOrEmpty(searchOrderRequest.OrderState)) { //WAIT_SELLER_STOCK_OUT,WAIT_GOODS_RECEIVE_CONFIRM,WAIT_SELLER_DELIVER,PAUSE,FINISHED_L,TRADE_CANCELED,LOCKED @@ -228,10 +228,8 @@ namespace BBWY.Server.Business //sopReq.dateType = ""; var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); - - //logger.Info($"sopResponse is null ${sopResponse == null}"); if (searchOrderRequest.SaveResponseLog) - logger.Info($"sopResponse\r\n{JsonConvert.SerializeObject(sopResponse)}"); + logger.Info($"sopRequest\r\n{JsonConvert.SerializeObject(searchOrderRequest)} \r\nsopResponse\r\n{JsonConvert.SerializeObject(sopResponse)}"); if (sopResponse.IsError) throw new BusinessException($"获取SOP订单失败 {(string.IsNullOrEmpty(sopResponse.ErrorMsg) ? sopResponse.ErrMsg : sopResponse.ErrorMsg)}"); diff --git a/BBWY.Test/BBWY.Test.csproj b/BBWY.Test/BBWY.Test.csproj index a2a4b011..37a5f62f 100644 --- a/BBWY.Test/BBWY.Test.csproj +++ b/BBWY.Test/BBWY.Test.csproj @@ -1,4 +1,4 @@ - + Exe @@ -10,7 +10,9 @@ + + diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 3fde252d..e3f41b66 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -1,5 +1,8 @@ -using BBWY.JDSDK.Request; +using BBWY.Common.Models; +using BBWY.JDSDK.Request; +using BBWY.Server.Model.Dto; using Jd.Api; +using Jd.Api.Request; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -16,25 +19,45 @@ namespace BBWY.Test static void Main(string[] args) { - IJdClient client = new DefaultJdClient("https://api.jd.com/routerjson", "120EA9EC65AB017567D78CC1139EEEA5", "866a9877f5f24b03b537483b4defe75d"); + string searchFields = "orderId,venderId,orderType,payType,orderTotalPrice,orderSellerPrice,orderPayment,freightPrice,orderState,orderStateRemark,orderRemark,orderStartTime,orderEndTime,modified,consigneeInfo,itemInfoList,couponDetailList,taxFee,venderRemark,pin,waybill,storeOrder,storeId,sellerDiscount"; - var req = new AdsDspRtbKuaicheAccountCampaignReportRequest(); - req.pageSize = 20; - req.clickOrOrderDay = 1; - //req.obys = "abc"; - req.giftFlag = 0; - req.orderStatusCategory = 1; - req.endDay = DateTime.Now.Date.AddDays(-1); - req.isDaily = true; - req.startDay = DateTime.Now.Date; - req.page = 1; - //req.platform = "abc"; - req.clickOrOrderCaliber = 0; + IJdClient jdClient = new DefaultJdClient("https://api.jd.com/routerjson", "120EA9EC65AB017567D78CC1139EEEA5", "866a9877f5f24b03b537483b4defe75d"); - var response = client.Execute(req, "ebd15797ff344a8da8e74879cb2acd13mtu3", DateTime.Now.ToLocalTime()); - Console.WriteLine(JsonConvert.SerializeObject(response)); + var str = "{\"StartDate\":\"2022-05-31 19:11:26\",\"EndDate\":\"2022-05-31 22:11:26\",\"PageIndex\":1,\"PageSize\":100,\"OrderId\":\"\",\"JDColType\":\"0\",\"OrderState\":null,\"Platform\":1,\"AppKey\":\"120EA9EC65AB017567D78CC1139EEEA5\",\"AppSecret\":\"866a9877f5f24b03b537483b4defe75d\",\"AppToken\":\"c638226881394594baed9dfc24d33c28diyn\",\"SaveResponseLog\":true}"; + var searchOrderRequest = JsonConvert.DeserializeObject(str); + + var sopReq = new PopOrderEnSearchRequest(); + if (searchOrderRequest.StartDate != null) + sopReq.startDate = searchOrderRequest.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"); + if (searchOrderRequest.EndDate != null) + sopReq.endDate = searchOrderRequest.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"); + if (string.IsNullOrEmpty(searchOrderRequest.OrderState)) + { + //WAIT_SELLER_STOCK_OUT,WAIT_GOODS_RECEIVE_CONFIRM,WAIT_SELLER_DELIVER,PAUSE,FINISHED_L,TRADE_CANCELED,LOCKED + sopReq.orderState = "WAIT_SELLER_STOCK_OUT,WAIT_GOODS_RECEIVE_CONFIRM,PAUSE,FINISHED_L,TRADE_CANCELED,LOCKED,NOT_PAY"; + } + else + { + sopReq.orderState = searchOrderRequest.OrderState; //待转换 + } + sopReq.optionalFields = searchFields; + sopReq.page = searchOrderRequest.PageIndex.ToString(); + sopReq.pageSize = searchOrderRequest.PageSize.ToString(); + sopReq.sortType = "1"; + //sopReq.dateType = ""; + + var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime()); + + if (sopResponse.IsError) + throw new BusinessException($"获取SOP订单失败 {(string.IsNullOrEmpty(sopResponse.ErrorMsg) ? sopResponse.ErrMsg : sopResponse.ErrorMsg)}"); + + if (sopResponse.Json == null) + sopResponse.Json = JObject.Parse(sopResponse.Body); + Console.WriteLine(JsonConvert.SerializeObject(sopResponse)); + //orderCount = sopResponse.Json["jingdong_pop_order_enSearch_responce"]["searchorderinfo_result"].Value("orderTotal"); + //orderJtokens.AddRange((JArray)sopResponse.Json["jingdong_pop_order_enSearch_responce"]["searchorderinfo_result"]["orderInfoList"]); Console.ReadKey(); } }