From fc235ad6ade36f637871186a951b12a1afd5bde1 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 26 Jul 2023 22:16:06 +0800 Subject: [PATCH] 10030 --- .../APIServices/PurchaseProductAPIService.cs | 58 +++++++++++++----- BBWYB.Client/GlobalContext.cs | 23 ++++++- BBWYB.Client/Resources/Images/bbwylogo.ico | Bin 915 -> 67646 bytes BBWYB.Client/ViewModels/MainViewModel.cs | 2 - 4 files changed, 63 insertions(+), 20 deletions(-) diff --git a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs index 4ad8e49..17b0308 100644 --- a/BBWYB.Client/APIServices/PurchaseProductAPIService.cs +++ b/BBWYB.Client/APIServices/PurchaseProductAPIService.cs @@ -25,6 +25,10 @@ namespace BBWYB.Client.APIServices private IDictionary _1688ProductDetailRequestHeader; + private List _1688ColorPropertyFieldIdList; + private List locationIdList; + private List priceIdList; + public PurchaseProductAPIService(RestApiService restApiService, IMemoryCache memoryCache) { this.restApiService = restApiService; @@ -38,6 +42,10 @@ namespace BBWYB.Client.APIServices { "Accept-Language","zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"} }; purchaseProductCacheTimeSpan = TimeSpan.FromDays(1); + + _1688ColorPropertyFieldIdList = new List() { 3216, 1627207, 1234, 3151, 7853, 446, 374, 404, 100019516, 3114, 2068 }; + locationIdList = new List() { "1081181309101", "16347413030323", "13772573013156" }; + priceIdList = new List() { "1081181309582", "1081181309582", "16347413030316", "13772573013151" }; } public (Purchaser purchaser, IList purchaseSchemeProductSkus)? GetProductInfo(Platform platform, string productId, string skuId, string purchaseProductId, PurchaseOrderMode priceMode, PurchaseProductAPIMode apiMode) @@ -186,31 +194,47 @@ namespace BBWYB.Client.APIServices var jsonStr = match.Groups[2].Value; var jobject = JObject.Parse(jsonStr); + var location = ""; + for (var i = 0; i < locationIdList.Count(); i++) + { + if (jobject["data"][locationIdList[i]] != null) + { + location = jobject["data"][locationIdList[i]]["data"]["location"].ToString(); + break; + } + } + //16347413030323 var purchaser = new Purchaser() { Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(), Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(), Name = jobject["globalData"]["tempModel"]["companyName"].ToString(), - Location = jobject["data"]["1081181309101"] != null ? - jobject["data"]["1081181309101"]["data"]["location"].ToString() : - jobject["data"]["16347413030323"]["data"]["location"].ToString() + Location = location, + Platform = platform }; - var colorsProperty = jobject["globalData"]["skuModel"]["skuProps"].FirstOrDefault(j => j.Value("fid") == 3216 || - j.Value("fid") == 1627207 || - j.Value("fid") == 1234 || - j.Value("fid") == 3151)["value"] - .Children() - .Select(j => new - { - name = j.Value("name"), - imageUrl = j.Value("imageUrl") - }).ToList(); - - 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 fidJToken = jobject["globalData"]["skuModel"]["skuProps"].FirstOrDefault(j => _1688ColorPropertyFieldIdList.Contains(j.Value("fid"))); + if (fidJToken == null) + fidJToken = jobject["globalData"]["skuModel"]["skuProps"].FirstOrDefault(j => j.Value("prop").Contains("颜色")); + if (fidJToken == null && jobject["globalData"]["skuModel"]["skuProps"].Children().Count() == 1) + fidJToken = jobject["globalData"]["skuModel"]["skuProps"].FirstOrDefault(); + var colorsProperty = fidJToken["value"].Children() + .Select(j => new + { + name = j.Value("name"), + imageUrl = j.Value("imageUrl") + }).ToList(); + + var firstPrice = 0.0M; + for (var i = 0; i < priceIdList.Count(); i++) + { + if (jobject["data"][priceIdList[i]] != null) + { + firstPrice = jobject["data"][priceIdList[i]]["data"]["priceModel"]["currentPrices"][0].Value("price"); + break; + } + } var purchaseSchemeProductSkus = new List(); diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 02ac109..dcc7452 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -1,4 +1,5 @@ using BBWYB.Client.APIServices; +using BBWYB.Client.Helpers; using BBWYB.Client.Models; using BBWYB.Client.ViewModels; using BBWYB.Client.Views.PackPurchaseTaska; @@ -7,6 +8,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows; @@ -20,7 +22,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10029"; + BBWYBApiVersion = "10030"; } private User user; @@ -57,6 +59,25 @@ namespace BBWYB.Client return BBWYBApiVersion; } + public void CallALiWangWang(string sellerLoginId) + { + var url = $"aliim:sendmsg?siteid=cnalichn&portalId=&gid=&itemsId=&touid=cnalichn{sellerLoginId}&status=1"; + try + { + //Process.Start("explorer.exe", url); + ShellExecuteHelper.ShellExecute(IntPtr.Zero, "open", url, string.Empty, string.Empty, ShellExecuteHelper.ShowCommands.SW_SHOWNORMAL); + } + catch (Exception ex) + { + try + { + Clipboard.SetText(url); + } + catch { } + MessageBox.Show($"{ex.Message}\r\n唤醒旺旺失败,唤醒链接已复制到剪切板,请手动打开浏览器唤醒", "提示"); + } + } + /// /// 对web版提供的修改打包任务方法 /// diff --git a/BBWYB.Client/Resources/Images/bbwylogo.ico b/BBWYB.Client/Resources/Images/bbwylogo.ico index 5fb3f35cc9aaa93fe187a5c0211fbfa597d607f4..c743326916abf73524b1c8dbbd9c031416f0d7a8 100644 GIT binary patch literal 67646 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 diff --git a/BBWYB.Client/ViewModels/MainViewModel.cs b/BBWYB.Client/ViewModels/MainViewModel.cs index dc308ca..41da673 100644 --- a/BBWYB.Client/ViewModels/MainViewModel.cs +++ b/BBWYB.Client/ViewModels/MainViewModel.cs @@ -1,13 +1,11 @@ using BBWYB.Client.APIServices; using BBWYB.Client.Models; -using BBWYB.Client.Views; using BBWYB.Client.Views.SelectShop; using BBWYB.Client.Views.WebB; using BBWYB.Common.Extensions; using BBWYB.Common.Models; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; -using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Collections.ObjectModel;