From cf567144a32fe2d01892249325ba6acbbd46d12d Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 26 Aug 2026 15:54:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Update/Update/MainForm.cs | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/Update/Update/MainForm.cs b/Update/Update/MainForm.cs index ae754e5..d13581f 100644 --- a/Update/Update/MainForm.cs +++ b/Update/Update/MainForm.cs @@ -6,6 +6,8 @@ using System.Drawing; using System.IO; using System.IO.Compression; using System.Linq; +using System.Net; +using System.Reflection.Emit; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -69,22 +71,37 @@ namespace Update progressBar1.Visible = true; progressBar1.Maximum = 100;//fileNameArr.Count(); progressBar1.Value = 0; - new TaskFactory().StartNew(() => + Task.Run(async() => { string tempFile = upTempPath + "\\" + Program.updateUrl.Substring(Program.updateUrl.LastIndexOf("/") + 1); - bool result = Program.DownloadFile(Program.updateUrl, tempFile); + //bool result = Program.DownloadFile(Program.updateUrl, tempFile); - while (true) + //while (true) + //{ + // Invoke(new Action(() => + // { + // progressBar1.Value = Program.progress; + // })); + // if (Program.progress == 100) + // break; + //} + + ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; + using (var downloadClient = new WebClient()) { - Invoke(new Action(() => + downloadClient.Proxy = null; + + downloadClient.DownloadProgressChanged += (s, args) => { - progressBar1.Value = Program.progress; - })); - if (Program.progress == 100) - break; + Invoke(new Action(() => { progressBar1.Value = args.ProgressPercentage; })); + + }; + + await downloadClient.DownloadFileTaskAsync(new Uri(Program.updateUrl), tempFile); } - if (result) + if (1 == 1) + //if (result) { ZipFile.ExtractToDirectory(tempFile, upTempPath); File.Delete(tempFile); From 438c580da145f5799e29bd86653ab11cd8d02e30 Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 26 Aug 2026 16:21:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEMUKJD CEFv138.sln | 8 ++++---- TEMUKJD/KJD.csproj | 2 +- TEMUKJD/KJD.csproj.user | 11 ++++++++--- test/KJD.Test/KJD.Test.csproj | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/TEMUKJD CEFv138.sln b/TEMUKJD CEFv138.sln index a2e406b..1381571 100644 --- a/TEMUKJD CEFv138.sln +++ b/TEMUKJD CEFv138.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.8.12023.21 stable +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36221.1 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AllBase", "AllBase\AllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}" EndProject @@ -67,8 +67,8 @@ Global {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x86.Build.0 = Debug|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|Any CPU.Build.0 = Release|Any CPU - {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x64.ActiveCfg = Release|Any CPU - {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x64.Build.0 = Release|Any CPU + {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x64.ActiveCfg = Release|x64 + {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x64.Build.0 = Release|x64 {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x86.ActiveCfg = Release|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index e4c1f7b..0e03441 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -12,7 +12,7 @@ false x64 false - + AnyCPU;x64 diff --git a/TEMUKJD/KJD.csproj.user b/TEMUKJD/KJD.csproj.user index e041bfa..d1079ee 100644 --- a/TEMUKJD/KJD.csproj.user +++ b/TEMUKJD/KJD.csproj.user @@ -16,6 +16,14 @@ false ProjectDebugger + + false + ProjectDebugger + + + false + ProjectDebugger + @@ -45,9 +53,6 @@ Form - - Form - Form diff --git a/test/KJD.Test/KJD.Test.csproj b/test/KJD.Test/KJD.Test.csproj index b3a3ab5..ca792d5 100644 --- a/test/KJD.Test/KJD.Test.csproj +++ b/test/KJD.Test/KJD.Test.csproj @@ -6,6 +6,7 @@ enable enable false + AnyCPU;x64 From 4096fbcfa34e483309f40073d2197c4c84784bf6 Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 27 Aug 2026 08:54:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A9=E6=89=8B?= =?UTF-8?q?=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEMUKJD CEFv138.sln | 6 +++--- TEMUKJD/KJD.csproj.user | 8 +++++++- .../WXForms/AdminForms/WXSaleAssistantForm.Designer.cs | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TEMUKJD CEFv138.sln b/TEMUKJD CEFv138.sln index 1381571..6d4e54c 100644 --- a/TEMUKJD CEFv138.sln +++ b/TEMUKJD CEFv138.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.14.36221.1 d17.14 +VisualStudioVersion = 17.14.36221.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AllBase", "AllBase\AllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}" EndProject @@ -61,8 +61,8 @@ Global {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x86.Build.0 = Release|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x64.ActiveCfg = Debug|Any CPU - {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x64.Build.0 = Debug|Any CPU + {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x64.ActiveCfg = Debug|x64 + {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x64.Build.0 = Debug|x64 {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x86.ActiveCfg = Debug|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Debug|x86.Build.0 = Debug|Any CPU {9BCF10B0-85A2-4F0A-9D44-2C0555D28FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/TEMUKJD/KJD.csproj.user b/TEMUKJD/KJD.csproj.user index d1079ee..777485d 100644 --- a/TEMUKJD/KJD.csproj.user +++ b/TEMUKJD/KJD.csproj.user @@ -10,7 +10,7 @@ zh-CN false - Development + Production false @@ -24,6 +24,12 @@ false ProjectDebugger + + ProjectDebugger + + + ProjectDebugger + diff --git a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs index 479f81a..152c2b0 100644 --- a/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs @@ -938,7 +938,6 @@ namespace TemuKJD.ToolForms this.ClientSize = new System.Drawing.Size(1404, 478); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "WXSaleAssistantForm"; this.Text = "微信带货助手"; From c38777ec3136eccf7ba16b733388b07dc67e257c Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 27 Aug 2026 14:23:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E5=BA=97=E9=93=BA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=AF=8F=E5=A4=A9=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=80=E6=AC=A1=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=202=E4=B8=8A=E8=B4=A7sku=E7=BC=BA=E5=A4=B1=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs | 14 +++++++------- TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 93043d7..8807bed 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -4212,13 +4212,6 @@ namespace TemuKJD.WXForms.ProductForms } Thread.Sleep(Randomx.GetId(100, 300)); - var maxSkuSpecCnt = prodInfo.detail.sku.Max(x => x.spec?.Count).ParseToInt(); - foreach(var skuTmp in prodInfo.detail.sku.ToList()) - { - if (skuTmp.spec?.Count != maxSkuSpecCnt) - prodInfo.detail.sku.Remove(skuTmp); - } - upProdParam.product.info.productSaleAttrs = new List(); if (prodInfo.detail.sku == null) prodInfo.detail.sku = new List(); @@ -4231,6 +4224,13 @@ namespace TemuKJD.WXForms.ProductForms if (prodInfo.detail.sku.FirstOrDefault().thumb_url.IsNullOrEmpty()) prodInfo.detail.sku.FirstOrDefault().thumb_url = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1)?.url; + var maxSkuSpecCnt = prodInfo.detail.sku.Max(x => x.spec?.Count).ParseToInt(); + foreach (var skuTmp in prodInfo.detail.sku.ToList()) + { + if (skuTmp.spec?.Count != maxSkuSpecCnt) + prodInfo.detail.sku.Remove(skuTmp); + } + // 处理系统指定的规格名称 //if ((upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料" || prodInfo.detail.cats.FirstOrDefault() == "食品饮料") && // (selectProd.cat_name == "坚果炒货" || selectProd.cat_name == "果干")) diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs index 57b159a..e1a86d2 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs @@ -327,7 +327,7 @@ namespace TemuKJD.WXForms.ShopForms statistics.WxShopAmount.totalAmount * 0.01m, // 货款金额 statistics.WxShopAmount.availableAmount * 0.01m, // 可提现余额 statistics.WxShopAmount.pendingAmount * 0.01m, // 待结算金额 - statistics.WxShopAmount.DepositBalance * 0.01m // 抱枕金 + statistics.WxShopAmount.DepositBalance * 0.01m // 保证金 ); row = dgvShop.Rows[rowId]; (row.Cells["colLoginStatus"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Green : Color.Red; @@ -795,6 +795,7 @@ namespace TemuKJD.WXForms.ShopForms statistics.WxShopSaleInfo1Day.LastRefreshDate = DateTime.MinValue; statistics.WxShopSaleInfo7Day.LastRefreshDate = DateTime.MinValue; statistics.WxShopSaleInfo30Day.LastRefreshDate = DateTime.MinValue; + statistics.WxShopAmount.LastRefreshDate = DateTime.MinValue; statistics.lastRefreshDate = DateTime.MinValue; } //this.lstSubOrderInfo.RemoveAll(o => o.supplierId.ParseToString() == shop.ShopId);