From d693ff5ade4ff23509df4e18eef82e9bd060d077 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 16 Dec 2022 15:56:08 +0800 Subject: [PATCH] 10069 --- .../APIServices/PurchaseProductAPIService.cs | 9 ++++-- .../Purchase/1688PreviewPurchaseViewModel.cs | 17 ----------- BBWY.Client/Views/MainWindow.xaml | 2 +- BBWY.Test/JDServiceAPITest.cs | 30 +++++++++++++++++++ BBWY.Test/ProductAPITest.cs | 25 ++++++++++++++++ BBWY.Test/Program.cs | 10 +++++-- 6 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 BBWY.Test/JDServiceAPITest.cs create mode 100644 BBWY.Test/ProductAPITest.cs diff --git a/BBWY.Client/APIServices/PurchaseProductAPIService.cs b/BBWY.Client/APIServices/PurchaseProductAPIService.cs index 223bf934..98884f85 100644 --- a/BBWY.Client/APIServices/PurchaseProductAPIService.cs +++ b/BBWY.Client/APIServices/PurchaseProductAPIService.cs @@ -192,11 +192,14 @@ namespace BBWY.Client.APIServices var jsonStr = match.Groups[2].Value; var jobject = JObject.Parse(jsonStr); + //16347413030323 var purchaser = new Purchaser() { Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(), Name = jobject["globalData"]["tempModel"]["companyName"].ToString(), - Location = jobject["data"]["1081181309101"]["data"]["location"].ToString() + Location = jobject["data"]["1081181309101"] != null ? + jobject["data"]["1081181309101"]["data"]["location"].ToString() : + jobject["data"]["16347413030323"]["data"]["location"].ToString() }; var colorsProperty = jobject["globalData"]["skuModel"]["skuProps"].FirstOrDefault(j => j.Value("fid") == 3216 || @@ -209,7 +212,9 @@ namespace BBWY.Client.APIServices imageUrl = j.Value("imageUrl") }).ToList(); - var firstPrice = jobject["data"]["1081181309582"]["data"]["priceModel"]["currentPrices"][0].Value("price"); + var firstPrice = jobject["data"]["1081181309582"] != null ? + jobject["data"]["1081181309582"]["data"]["priceModel"]["currentPrices"][0].Value("price") : + jobject["data"]["16347413030316"]["data"]["priceModel"]["currentPrices"][0].Value("price"); var purchaseSchemeProductSkus = new List(); diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs index faab9a96..596fdfba 100644 --- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs +++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs @@ -166,23 +166,6 @@ namespace BBWY.Client.ViewModels private void LoadPurchaseProduct(Platform platform, PurchaseSchemeProduct purchaseSchemeProduct, OrderSku orderSku, ManualResetEvent ewh) { - //var purchaseSchemeProductSkuList = LoadPurchaseProductCore(purchaseSchemeProduct, out string errorMsg); - //if (purchaseSchemeProductSkuList != null && purchaseSchemeProductSkuList.Count > 0) - //{ - // App.Current.Dispatcher.Invoke(() => - // { - // foreach (var purchaseSchemeProductSku in purchaseSchemeProductSkuList) - // { - // if (purchaseSchemeProduct.SelectedSkuIdList.Any(s => s == purchaseSchemeProductSku.PurchaseSkuId)) - // { - // PurchaseSchemeProductSkuList.Add(purchaseSchemeProductSku); - // purchaseSchemeProductSku.ItemTotal = orderSku.ItemTotal; - // purchaseSchemeProductSku.OnItemTotalChanged = OnItemTotalChanged; - // } - // } - // }); - //} - var data = purchaseProductAPIService.GetProductInfo(platform, purchaseSchemeProduct.ProductId, purchaseSchemeProduct.SkuId, diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index ddf9d235..db8c5bf6 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/BBWY.Test/JDServiceAPITest.cs b/BBWY.Test/JDServiceAPITest.cs new file mode 100644 index 00000000..7e3b8059 --- /dev/null +++ b/BBWY.Test/JDServiceAPITest.cs @@ -0,0 +1,30 @@ +using Jd.Api; +using Jd.Api.Request; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Test +{ + public class JDServiceAPITest + { + public void GetServiceDetail(IJdClient client, string token) + { + + var req = new AscQueryViewRequest(); + + req.buId = "10598776"; + req.operatePin = "布莱特玩具"; + req.operateNick = "布莱特玩具"; + req.serviceId = 1597963593; + req.orderId = 256149123505; + + //req.extJsonStr = "abc"; + + + var response = client.Execute(req, token, DateTime.Now.ToLocalTime()); + Console.WriteLine(JsonConvert.SerializeObject(response)); + } + } +} diff --git a/BBWY.Test/ProductAPITest.cs b/BBWY.Test/ProductAPITest.cs new file mode 100644 index 00000000..c5e24dc2 --- /dev/null +++ b/BBWY.Test/ProductAPITest.cs @@ -0,0 +1,25 @@ +using Jd.Api; +using Jd.Api.Request; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Test +{ + public class ProductAPITest + { + public void GetSkus(IJdClient client, string token, string spu) + { + var req_skuList = new SkuReadSearchSkuListRequest() + { + pageSize = 50,//50 + field = "logo,saleAttrs,status,created,barCode,categoryId,multiCateProps" + }; + + req_skuList.wareId = spu; + var response = client.Execute(req_skuList, token, DateTime.Now.ToLocalTime()); + Console.WriteLine(JsonConvert.SerializeObject(response)); + } + } +} diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 61286098..8b8470e6 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -17,10 +17,14 @@ namespace BBWY.Test var token = "2ace3023200c4ea9aa682bbf8bffee18jztm"; //"b46065ef5b894f2297686e28d39cb37a2mdy";//"2ace3023200c4ea9aa682bbf8bffee18jztm"; IJdClient client = GetJdClient(appkey, appSecret); - var test1 = new JDBaoBiaoAPITest(); + // var test1 = new ProductAPITest(); + //test1.GetSkus(client,token, "10023500913672"); - var ddTest = new DingDingAPITest(); - ddTest.Send(); + var testService = new JDServiceAPITest(); + testService.GetServiceDetail(client, token); + + //var ddTest = new DingDingAPITest(); + //ddTest.Send(); Console.ReadKey(); }