chfei/KJD
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD

Browse Source
This commit is contained in:
chfei committed 2026-10-21 17:06:19 +08:00
2 parents b9aae35111 a0e2449981
commit 833c653d3e
10 files changed
+1215 -1129
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/BaseClass.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 1351;
public static int VersionCount = 1358;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
AllBase/GetHtml.cs
+14 -1
View File
@@ -5,6 +5,7 @@
*
*/
using NaiBa.Util.Extension;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -12,6 +13,7 @@ using System.Drawing;
using System.Globalization;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Runtime.InteropServices;
@@ -54,11 +56,22 @@ namespace AllBase
public static Image GetUrlImg(string imgUrl, out string rst)
{
rst = "";
if (imgUrl.IsNullOrEmpty())
{
rst = "图片路径为空";
return null;
}
//return LoadImage(imgUrl);
if (imgUrl.Contains("wxapp") || imgUrl.Contains("mmecimage.cn"))
{
return ImageBuild.LoadBitmapLoadBitmipImageFromUrl(imgUrl, out rst);
imgUrl = imgUrl.Split('?').FirstOrDefault() + "?imageView2/2/w/800/h/800/format/jpg/q/80";
var im = ImageBuild.LoadBitmapLoadBitmipImageFromUrl(imgUrl, out rst);
return im;
//if (im != null && string.IsNullOrEmpty(rst))
// return im;
//else
// rst = string.Empty;
}
Image image = null;
AllBase/ImageBuild.cs
+24 -9
View File
@@ -592,17 +592,32 @@ namespace AllBase
public static Image LoadBitmapLoadBitmipImageFromUrl(string url, out string error)
{
try
BitmapImage bi = null;
try
{
BitmapImage bi = LoadBitmipImageFromUrl(url, out error);
return BitmapImageToSystemDrawingImage(bi);
bi = LoadBitmipImageFromUrl(url, out error);
if (bi == null || !string.IsNullOrEmpty(error))
{
error = "获取图片失败 " + error;
return null;
}
}
catch (Exception e)
{
error = e.Message;
error = "获取图片失败 " + e.Message;
return null;
}
}
try
{
return BitmapImageToSystemDrawingImage(bi);
}
catch (Exception e)
{
error = "转换图片失败 " + e.Message;
return null;
}
}
public static Image BitmapImageToSystemDrawingImage(BitmapImage bitmapImage)
{
@@ -632,10 +647,10 @@ namespace AllBase
Bitmap bitmap = new Bitmap(stream);
stream.Close();
//// 现在你可以将这个Bitmap对象用于Windows Forms的PictureBox或其他图像显示控件
//PictureBox pictureBox = new PictureBox();
//pictureBox.Image = bitmap; // 或者如果你已经有了一个PictureBox控件，直接设置其Image属性
return bitmap;
//// 现在你可以将这个Bitmap对象用于Windows Forms的PictureBox或其他图像显示控件
//PictureBox pictureBox = new PictureBox();
//pictureBox.Image = bitmap; // 或者如果你已经有了一个PictureBox控件，直接设置其Image属性
return bitmap;
}
}
PackTools/Publish/Publish/Form1.Designer.cs
Generated
+1
View File
@@ -88,6 +88,7 @@ namespace Publish
this.lstOrderFile.FormattingEnabled = true;
this.lstOrderFile.ItemHeight = 12;
this.lstOrderFile.Items.AddRange(new object[] {
"OrderSupportTicket.dll",
"WxOrder.Framework.dll",
"WPFCommon.dll",
"29WxOrderWork.dll",
TEMUKJD/MainForm.cs
+1 -1
View File
@@ -319,7 +319,7 @@ namespace TemuKJD
{
Thread.Sleep(500);
}
if (BaseClass.UserAuthority.Contains("充值用户"))
if (BaseClass.UserAuthority.Contains("充值用户") && this.Created)
{
Invoke(new Action(() =>
{
TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs
Generated
+992 -964
View File
File diff suppressed because it is too large. Load diff
TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.cs
+31 -1
View File
@@ -1,6 +1,8 @@
using AllBase;
using AllBase.Helper;
using AllBase.Model.Param.TemuProductManage;
using AllBase.Model.Result;
using CefSharp.DevTools.FedCm;
using NaiBa.Util;
using NaiBa.Util.Extension;
using Newtonsoft.Json;
@@ -17,6 +19,7 @@ using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
using System.Windows.Forms;
using TemuKJD.BaseForms;
using TemuKJD.BLL;
@@ -201,7 +204,7 @@ namespace TemuKJD.WXForms.AdminForms
break;
var shopInfo = lstAdminShopInfo.FirstOrDefault(v => v.LoginName == loginName);
if (shopInfo != null && !string.IsNullOrEmpty(shopInfo.LoginName) && !string.IsNullOrEmpty(shopInfo.Password))
if (shopInfo != null && !string.IsNullOrEmpty(shopInfo.LoginName) /*&& !string.IsNullOrEmpty(shopInfo.Password)*/)
{
WXAdminShopLoginForm shopLoginForm = new WXAdminShopLoginForm(shopInfo);
shopLoginForm.openType = EnumOpenType.login;
@@ -578,11 +581,13 @@ namespace TemuKJD.WXForms.AdminForms
{
this.dgvShop.Columns["colEdit"].Visible = true;
this.dgvShop.Columns["colDelete"].Visible = true;
this.btnDelSelect.Visible = true;
}
else
{
this.dgvShop.Columns["colEdit"].Visible = false;
this.dgvShop.Columns["colDelete"].Visible = false;
this.btnDelSelect.Visible = false;
}
}
@@ -802,6 +807,31 @@ namespace TemuKJD.WXForms.AdminForms
this.pbLoading.Visible = false;
}
}
private void btnDelSelect_Click(object sender, EventArgs e)
{
if (BaseMsgForm.ShowConfirm("确定删除店铺吗？删除后不可恢复！").DialogResult == DialogResult.Cancel)
return;
var shopLoginNameList = dgvShop.Rows.Cast<DataGridViewRow>().Where(c => c.Cells["colSelect"].Value.ParseToBool() == true).ToList();
if (!shopLoginNameList.Any())
{
BaseMsgForm.ShowError("请选择需要检测的店铺");
return;
}
Task.Run(() =>
{
foreach (var dgvRow in shopLoginNameList)
{
Thread.Sleep(50);
var shop = lstAdminShopInfo.FirstOrDefault(v => v.UserName == dgvRow.Cells["colUser"].Value.ParseToString() && v.ShopId == dgvRow.Cells["colShopId"].Value.ParseToString());
ShopBLL.AdminDelServerShop(shop);
}
SearchShop(this.ucSplitPage1.CurrentPage);
});
}
}
TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs
+30 -45
View File
@@ -544,37 +544,10 @@ namespace TemuKJD.WXForms.AiTalkForms
Thread.Sleep(500);
}
int pageSize = 5000;
for (int i = 1; i <= 100; i++)
{
var shopIds = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ShopId));
url = AiTalkUrl + "/api/stores?page=" + i + "&pageSize=" + pageSize + "&keyword=" + shopIds;
refer = AiTalkUrl + "/api/stores";
var adminCookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null));
rst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(adminCookies) }, url, refer);
if (rst.Contains("\"stores\":["))
{
List<ShopAiTalkInfo> aiTalkInfoLst = JsonHelper.DeserializeJsonToList<ShopAiTalkInfo>(JsonHelper.JObjectParse(rst)["stores"].ParseToString());
foreach (var shop in GlobalConfig.ShopLoginList)
{
shop.shopAiTalkInfo = aiTalkInfoLst.FirstOrDefault(s => s.id == shop.ShopId);
}
if (aiTalkInfoLst.Count < pageSize)
break;
}
else
{
BaseMsgForm.ShowError("AI客服账户登录失败，请稍候重试！");
return;
}
}
// 刷新Ai客服店铺状态
refreshAiStatus(GlobalConfig.ShopLoginList.Select(s => s.ShopId).ToList(), true);
Thread.Sleep(1000);
foreach (var shop in GlobalConfig.ShopLoginList)
{
BindAiTalkStatus(shop);
}
Thread.Sleep(1000);
Invoke(new Action(() => {
pnlCover.Visible = false;
@@ -1393,23 +1366,35 @@ namespace TemuKJD.WXForms.AiTalkForms
});
}
void refreshAiStatus(List<string> shopIds)
void refreshAiStatus(List<string> shopIds, bool showLoginErr = false)
{
var url = AiTalkUrl + "/api/stores?page=1&pageSize=5000&keyword=" + string.Join(",", shopIds);
var refer = AiTalkUrl + "/api/stores";
var adminCookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null));
var rst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(adminCookies) }, url, refer);
while (shopIds.Count > 0)
{
var tmpShopIds = shopIds.Take(300).ToList();
shopIds.RemoveAll(id => tmpShopIds.Contains(id));
if (rst.Contains("\"stores\":["))
{
List<ShopAiTalkInfo> aiTalkInfoLst = JsonHelper.DeserializeJsonToList<ShopAiTalkInfo>(JsonHelper.JObjectParse(rst)["stores"].ParseToString());
foreach (var shopId in shopIds)
{
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
if (shop != null)
shop.shopAiTalkInfo = aiTalkInfoLst.FirstOrDefault(ai => ai.id == shop.ShopId);
}
}
// http://14.103.99.254/api/stores?page=1&pageSize=5000&keyword=
var url = AiTalkUrl + "/api/stores?page=1&pageSize=1000&keyword=" + string.Join(",", tmpShopIds);
var refer = AiTalkUrl + "/api/stores";
var adminCookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null));
var rst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(adminCookies) }, url, refer);
if (rst.Contains("\"stores\":["))
{
List<ShopAiTalkInfo> aiTalkInfoLst = JsonHelper.DeserializeJsonToList<ShopAiTalkInfo>(JsonHelper.JObjectParse(rst)["stores"].ParseToString());
foreach (var shopId in tmpShopIds)
{
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
if (shop != null)
shop.shopAiTalkInfo = aiTalkInfoLst.FirstOrDefault(ai => ai.id == shop.ShopId);
}
}
else if (showLoginErr)
{
BaseMsgForm.ShowError("AI客服账户登录失败，请稍候重试！");
return;
}
}
foreach (var shop in GlobalConfig.ShopLoginList)
{
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs
Generated
+109 -106
View File
@@ -40,6 +40,7 @@ namespace TemuKJD.WXForms.ProductForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnClearAll = new DevComponents.DotNetBar.PanelEx();
@@ -242,6 +243,10 @@ namespace TemuKJD.WXForms.ProductForms
this.txtSinglePriceAdd = new System.Windows.Forms.TextBox();
this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -264,10 +269,6 @@ namespace TemuKJD.WXForms.ProductForms
this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -3200,6 +3201,86 @@ namespace TemuKJD.WXForms.ProductForms
this.dgvSelectProduct.TabIndex = 187;
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
//
// splitContainer4
//
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer4.Location = new System.Drawing.Point(0, 0);
this.splitContainer4.Name = "splitContainer4";
//
// splitContainer4.Panel1
//
this.splitContainer4.Panel1.Controls.Add(this.statusBar);
//
// splitContainer4.Panel2
//
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
this.splitContainer4.Size = new System.Drawing.Size(1710, 25);
this.splitContainer4.SplitterDistance = 1019;
this.splitContainer4.TabIndex = 3;
//
// statusBar
//
this.statusBar.BackColor = System.Drawing.Color.White;
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
this.statusBar.Size = new System.Drawing.Size(1019, 25);
this.statusBar.TabIndex = 2;
//
// btnClear
//
this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClear.Location = new System.Drawing.Point(475, 1);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(90, 21);
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.Style.GradientAngle = 90;
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.TabIndex = 440;
this.btnClear.Text = "清空结果";
this.btnClear.Visible = false;
//
// panelEx1
//
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx1.Location = new System.Drawing.Point(568, 2);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(115, 21);
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.panelEx1.Style.GradientAngle = 90;
this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.panelEx1.TabIndex = 668;
this.panelEx1.Text = "停止当前操作";
this.panelEx1.Visible = false;
//
// colCheck
//
this.colCheck.Frozen = true;
@@ -3382,91 +3463,13 @@ namespace TemuKJD.WXForms.ProductForms
//
// colOpResult
//
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOpResult.DefaultCellStyle = dataGridViewCellStyle9;
this.colOpResult.HeaderText = "操作结果";
this.colOpResult.Name = "colOpResult";
this.colOpResult.ReadOnly = true;
this.colOpResult.Width = 280;
//
// splitContainer4
//
this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer4.Location = new System.Drawing.Point(0, 0);
this.splitContainer4.Name = "splitContainer4";
//
// splitContainer4.Panel1
//
this.splitContainer4.Panel1.Controls.Add(this.statusBar);
//
// splitContainer4.Panel2
//
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
this.splitContainer4.Size = new System.Drawing.Size(1710, 25);
this.splitContainer4.SplitterDistance = 1019;
this.splitContainer4.TabIndex = 3;
//
// statusBar
//
this.statusBar.BackColor = System.Drawing.Color.White;
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
this.statusBar.Size = new System.Drawing.Size(1019, 25);
this.statusBar.TabIndex = 2;
//
// btnClear
//
this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClear.Location = new System.Drawing.Point(475, 1);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(90, 21);
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.Style.GradientAngle = 90;
this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnClear.TabIndex = 440;
this.btnClear.Text = "清空结果";
this.btnClear.Visible = false;
//
// panelEx1
//
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx1.Location = new System.Drawing.Point(568, 2);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(115, 21);
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.panelEx1.Style.GradientAngle = 90;
this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.panelEx1.TabIndex = 668;
this.panelEx1.Text = "停止当前操作";
this.panelEx1.Visible = false;
//
// WXDBProdUploadForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -3664,28 +3667,6 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
private System.Windows.Forms.DataGridViewLinkColumn colLogin;
private System.Windows.Forms.DataGridViewLinkColumn colInShop;
private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
private System.Windows.Forms.DataGridViewTextBoxColumn colSkuFakeImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colSkuFakeImg;
private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId;
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
private System.Windows.Forms.Label label25;
private System.Windows.Forms.TextBox txtDefaultBestBefore;
private UserComponent.UcCheckBox chkDefaultBestBefore;
@@ -3764,5 +3745,27 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.Label label43;
private System.Windows.Forms.NumericUpDown numNotUploadShopProdMoreThan;
private UserComponent.UcCheckBox chkNotUploadShopProdMoreThan;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
private System.Windows.Forms.DataGridViewLinkColumn colLogin;
private System.Windows.Forms.DataGridViewLinkColumn colInShop;
private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
private System.Windows.Forms.DataGridViewTextBoxColumn colSkuFakeImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colSkuFakeImg;
private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId;
private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
}
}
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+12 -1
View File
@@ -3906,7 +3906,7 @@ namespace TemuKJD.WXForms.ProductForms
}
if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料" || prodInfo.detail.cats.FirstOrDefault() == "食品饮料")
{
if (propInfo.name == "厂名")
if (propInfo.name == "厂名" && !prodInfo.property.goods_properties.Any(p => p.name == "生产企业名称"))
attr = productAttr.attr.FirstOrDefault(r => r.name == "生产企业名称");
else if (propInfo.name == "食品生产许可证编号")
attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号");
@@ -4505,6 +4505,15 @@ namespace TemuKJD.WXForms.ProductForms
}
}
}
foreach (var param in upProdParam.product.info.param.ToList())
{
var nameExistParams = upProdParam.product.info.param.Where(c => c.categorys?.FirstOrDefault()?.name == param.categorys?.FirstOrDefault()?.name).ToList();
for (int i = 0; i < 10 && nameExistParams.Count > 1; i++)
{
upProdParam.product.info.param.Remove(nameExistParams.LastOrDefault());
nameExistParams = upProdParam.product.info.param.Where(c => c.categorys?.FirstOrDefault()?.name == param.categorys?.FirstOrDefault()?.name).ToList();
}
}
#endregion
#region sku规格属性
@@ -6226,6 +6235,8 @@ namespace TemuKJD.WXForms.ProductForms
//生成主图base64字符串
string getImgError;
//if (!img_url.Contains("wst.wxapp.tc.qq.com") && !img_url.Contains("mmecimage.cn"))
//优选靓键店 登录 进店 397652670 重庆川味百年传奇山椒笋尖低脂解馋泡椒脆笋脆嫩爽口开胃解腻追剧办公解馋休闲小零食独立小包装 547009 371857150 0 初始化图片上传失败 值不能为 null。
//参数名: source https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/6acd9a520004f3272b49791884351f15000000a100004f50 14秒
if (!img_url.Contains("wxapp") && !img_url.Contains("mmecimage.cn"))
img_url = img_url.Replace("https://", "http://");
var image = GetHtml.GetUrlImg(img_url, out getImgError);