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

优化web查询 新增学员数据 尝试64位软件

Browse Source
This commit is contained in:
wule committed 2026-07-01 20:24:18 +08:00
1 parent 30beb00fc4
commit caba307ed1
44 files changed
+738 -1769
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+38 -29
View File
@@ -352,7 +352,12 @@ namespace TemuKJD.WXForms.ProductForms
}
if (BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集"))
{
cmbSourceType.Items.Insert(1, "------");
if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
{
cmbSourceType.Items.Insert(1, "--------");
cmbSourceType.Items.Insert(1, "学员数据");
}
cmbSourceType.Items.Insert(1, "--------");
cmbSourceType.Items.Insert(1, "微信商品");
cmbSourceType.Items.Insert(1, "1688商品");
cmbSourceType.Items.Insert(1, "多多商品");
@@ -362,6 +367,12 @@ namespace TemuKJD.WXForms.ProductForms
this.lblSourceType.Visible = true;
this.cmbSourceType.Visible = true;
this.cmbSourceType.Items.Clear();
cmbSourceType.Items.Add("");
if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
{
cmbSourceType.Items.Add("学员数据");
cmbSourceType.Items.Add("--------");
}
this.cmbSourceType.Items.Add("多多商品,1688商品,微信商品");
this.cmbSourceType.Items.Add("多多商品");
this.cmbSourceType.Items.Add("1688商品");
@@ -584,9 +595,9 @@ namespace TemuKJD.WXForms.ProductForms
Invoke(new Action(() =>
{
//cmbGroupFilter.Items.Remove("用户" + mainUserName);
cmbGroupFilter.Items.Remove("------");
cmbGroupFilter.Items.Remove("--------");
cmbGroupFilter.Items.Remove("我的商品");
cmbGroupFilter.Items.Insert(0, "------");
cmbGroupFilter.Items.Insert(0, "--------");
cmbGroupFilter.Items.Insert(0, "我的商品");
}));
}
@@ -1386,7 +1397,7 @@ namespace TemuKJD.WXForms.ProductForms
if (noBanWx)
data += "&ban_wx=0";
if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
data += "&special_prod_type=普通商品,书籍,爆款数据";
data += "&special_prod_type=普通商品,爆款数据";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -3410,6 +3421,15 @@ namespace TemuKJD.WXForms.ProductForms
attrValue = match + " cm";
}
}
else if (attr.value == "mm")
{
var propValue = propInfo.values.FirstOrDefault()?.value;
var match = BaseRegex.GetMatchRegexString(ref propValue, @"([\d]{1,4})mm");
if (!string.IsNullOrEmpty(match))
{
attrValue = match + " mm";
}
}
else if (attr.value.Contains("岁以上") && attr.value.Contains("个月以上"))
{
attrValue = "7 岁以上";
@@ -3698,6 +3718,8 @@ namespace TemuKJD.WXForms.ProductForms
attrValue = "100 g";
else if (attr.value == "cm")
attrValue = "20 cm";
else if (attr.value == "mm")
attrValue = "20 mm";
else if (attr.value.Contains("岁以上") && attr.value.Contains("个月以上"))
attrValue = "7 岁以上";
else if (attr.value == "只;个")
@@ -5434,6 +5456,11 @@ namespace TemuKJD.WXForms.ProductForms
if ((BaseClass.UserAuthority.Contains("商品采集") || BaseClass.UserAuthority.Contains("商品采集")) &&
cmbHot.Text != "爆款数据" && !BaseClass.UserAuthority.Contains("货源选择"))
data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName);
if (!BaseClass.UserAuthority.Contains("学员数据") && !BaseClass.ParentAuthority.Contains("学员数据") && cmbSourceType.Text.Contains("学员数据"))
{
cmbSourceType.Text = cmbSourceType.Text.Replace("学员数据", "");
}
// 如果指定只有自己采集的商品，则只会随机自己采集的商品
else if ((cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品") || cmbSourceType.Text.Trim().Contains("微信商品")) &&
cmbSourceType.Text.Trim().Replace("多多商品", "").Replace("1688商品", "").Replace("微信商品", "").Trim(',').IsNullOrEmpty())
@@ -5448,30 +5475,12 @@ namespace TemuKJD.WXForms.ProductForms
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采");
}
//if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
if (btnSwitchCatType.Text == "P")
data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
else
{
//var selectCate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
//var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == selectCate1?.cat_id).ToList();
//var selectCate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim());
//var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == selectCate2?.cat_id).ToList();
//var selectCate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim());
//if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && selectCate1 != null)
// data += "&wx_cat_1=" + selectCate1.cat_id;
//else if (chkSkipQualification.Checked)
//{
// // 厂商直采普通店铺不要随特殊商品
// data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c=>c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品"))
// .Select(c => c.cat_id));
//}
//if (!string.IsNullOrEmpty(cmbCateFilter2.Text) && selectCate2 != null)
// data += "&wx_cat_2=" + selectCate2.cat_id;
//if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && selectCate3 != null)
// data += "&wx_cat_3=" + selectCate3.cat_id;
var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
var selectCate2 = cates2.Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
@@ -5496,12 +5505,12 @@ namespace TemuKJD.WXForms.ProductForms
// 爆款数据商品
// 不为空搜内容
if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim()))
data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍");
data += "&special_prod_type=" + cmbHot.Text;
// 为空按照权限搜
else if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
data += "&special_prod_type=爆款数据,普通商品,书籍";
data += "&special_prod_type=爆款数据,普通商品";
else
data += "&special_prod_type=普通商品,书籍";
data += "&special_prod_type=普通商品";
// 聚水潭商品处理条件校验
data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim();
@@ -5525,8 +5534,8 @@ namespace TemuKJD.WXForms.ProductForms
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
Invoke(new Action(() =>
TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs
Generated
+175 -120
View File
@@ -71,22 +71,20 @@ namespace TemuKJD.WXForms.ProductForms
this.btnClearDgv = new DevComponents.DotNetBar.PanelEx();
this.btnSetPreSale = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.label9 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.chkSearchPromotionLink = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.cmbOnSaleStatus = new System.Windows.Forms.ComboBox();
this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
this.chkProdTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
this.cmbPreType = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
this.txtIdFilter = new System.Windows.Forms.TextBox();
this.lblIdFilter = new System.Windows.Forms.Label();
this.btnStopSearch = new DevComponents.DotNetBar.PanelEx();
this.txtPageEnd = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtProductName = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.btnClearFilter = new DevComponents.DotNetBar.PanelEx();
this.txtExtCodeFilter = new System.Windows.Forms.TextBox();
this.lblExtCodeFilter = new System.Windows.Forms.Label();
this.btnSearchProd = new DevComponents.DotNetBar.PanelEx();
this.label5 = new System.Windows.Forms.Label();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
this.label24 = new System.Windows.Forms.Label();
@@ -107,6 +105,12 @@ namespace TemuKJD.WXForms.ProductForms
this.pbLoadingShop = new System.Windows.Forms.PictureBox();
this.txtPageBegin = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.txtIdFilter = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.lblIdFilter = new System.Windows.Forms.Label();
this.txtProductName = new System.Windows.Forms.TextBox();
this.lblExtCodeFilter = new System.Windows.Forms.Label();
this.txtExtCodeFilter = new System.Windows.Forms.TextBox();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -125,8 +129,6 @@ namespace TemuKJD.WXForms.ProductForms
this.pbLoading = new System.Windows.Forms.PictureBox();
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.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -154,6 +156,8 @@ 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();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -708,22 +712,18 @@ namespace TemuKJD.WXForms.ProductForms
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx4.Controls.Add(this.label5);
this.ucGroupBoxEx4.Controls.Add(this.chkSearchPromotionLink);
this.ucGroupBoxEx4.Controls.Add(this.cmbOnSaleStatus);
this.ucGroupBoxEx4.Controls.Add(this.dtpStartTime);
this.ucGroupBoxEx4.Controls.Add(this.cmbPreType);
this.ucGroupBoxEx4.Controls.Add(this.label3);
this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter);
this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter);
this.ucGroupBoxEx4.Controls.Add(this.btnStopSearch);
this.ucGroupBoxEx4.Controls.Add(this.txtPageEnd);
this.ucGroupBoxEx4.Controls.Add(this.label2);
this.ucGroupBoxEx4.Controls.Add(this.txtProductName);
this.ucGroupBoxEx4.Controls.Add(this.label11);
this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter);
this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter);
this.ucGroupBoxEx4.Controls.Add(this.lblExtCodeFilter);
this.ucGroupBoxEx4.Controls.Add(this.btnSearchProd);
this.ucGroupBoxEx4.Controls.Add(this.label5);
this.ucGroupBoxEx4.Controls.Add(this.chkProdTime);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2);
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165);
@@ -731,10 +731,32 @@ namespace TemuKJD.WXForms.ProductForms
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "商品查询";
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(17, 144);
this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(32, 17);
this.label9.TabIndex = 988;
this.label9.Text = "结束";
this.label9.Visible = false;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(14, 61);
this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label5.Name = "label5";
this.label5.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 818;
this.label5.Text = "商品状态";
//
// chkSearchPromotionLink
//
this.chkSearchPromotionLink.AutoSize = true;
this.chkSearchPromotionLink.Location = new System.Drawing.Point(231, 61);
this.chkSearchPromotionLink.Location = new System.Drawing.Point(17, 91);
this.chkSearchPromotionLink.Name = "chkSearchPromotionLink";
this.chkSearchPromotionLink.Size = new System.Drawing.Size(147, 21);
this.chkSearchPromotionLink.TabIndex = 827;
@@ -752,7 +774,7 @@ namespace TemuKJD.WXForms.ProductForms
"审核待处理",
"草稿箱",
"回收站"});
this.cmbOnSaleStatus.Location = new System.Drawing.Point(68, 59);
this.cmbOnSaleStatus.Location = new System.Drawing.Point(71, 57);
this.cmbOnSaleStatus.Name = "cmbOnSaleStatus";
this.cmbOnSaleStatus.Size = new System.Drawing.Size(134, 25);
this.cmbOnSaleStatus.TabIndex = 817;
@@ -760,6 +782,38 @@ namespace TemuKJD.WXForms.ProductForms
this.cmbOnSaleStatus.SelectedIndexChanged += new System.EventHandler(this.cmbOnSaleStatus_SelectedIndexChanged);
this.cmbOnSaleStatus.TextChanged += new System.EventHandler(this.cmbOnSaleStatus_TextChanged);
//
// dtpEndTime
//
this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm";
this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpEndTime.Location = new System.Drawing.Point(49, 141);
this.dtpEndTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(134, 23);
this.dtpEndTime.TabIndex = 986;
this.dtpEndTime.Visible = false;
//
// chkProdTime
//
this.chkProdTime.AutoSize = true;
this.chkProdTime.Location = new System.Drawing.Point(211, 59);
this.chkProdTime.Name = "chkProdTime";
this.chkProdTime.Size = new System.Drawing.Size(60, 21);
this.chkProdTime.TabIndex = 837;
this.chkProdTime.Text = "时间>";
this.chkProdTime.UseVisualStyleBackColor = true;
this.chkProdTime.CheckedChanged += new System.EventHandler(this.chkProdTime_CheckedChanged);
//
// dtpStartTime
//
this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm";
this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpStartTime.Location = new System.Drawing.Point(262, 58);
this.dtpStartTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(134, 23);
this.dtpStartTime.TabIndex = 985;
//
// cmbPreType
//
this.cmbPreType.FormattingEnabled = true;
@@ -767,7 +821,7 @@ namespace TemuKJD.WXForms.ProductForms
"",
"预售",
"非预售"});
this.cmbPreType.Location = new System.Drawing.Point(262, 25);
this.cmbPreType.Location = new System.Drawing.Point(263, 25);
this.cmbPreType.Name = "cmbPreType";
this.cmbPreType.Size = new System.Drawing.Size(134, 25);
this.cmbPreType.TabIndex = 807;
@@ -784,27 +838,6 @@ namespace TemuKJD.WXForms.ProductForms
this.label3.TabIndex = 806;
this.label3.Text = "预售状态";
//
// txtIdFilter
//
this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtIdFilter.Location = new System.Drawing.Point(262, 93);
this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtIdFilter.Name = "txtIdFilter";
this.txtIdFilter.Size = new System.Drawing.Size(134, 25);
this.txtIdFilter.TabIndex = 652;
this.txtIdFilter.Visible = false;
//
// lblIdFilter
//
this.lblIdFilter.AutoSize = true;
this.lblIdFilter.Location = new System.Drawing.Point(242, 97);
this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.lblIdFilter.Name = "lblIdFilter";
this.lblIdFilter.Size = new System.Drawing.Size(21, 17);
this.lblIdFilter.TabIndex = 651;
this.lblIdFilter.Text = "ID";
this.lblIdFilter.Visible = false;
//
// btnStopSearch
//
this.btnStopSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -834,7 +867,7 @@ namespace TemuKJD.WXForms.ProductForms
// txtPageEnd
//
this.txtPageEnd.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtPageEnd.Location = new System.Drawing.Point(68, 25);
this.txtPageEnd.Location = new System.Drawing.Point(70, 25);
this.txtPageEnd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtPageEnd.Name = "txtPageEnd";
this.txtPageEnd.Size = new System.Drawing.Size(134, 25);
@@ -845,7 +878,7 @@ namespace TemuKJD.WXForms.ProductForms
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(13, 29);
this.label2.Location = new System.Drawing.Point(14, 30);
this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label2.Name = "label2";
this.label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -853,27 +886,6 @@ namespace TemuKJD.WXForms.ProductForms
this.label2.TabIndex = 793;
this.label2.Text = "查询页数";
//
// txtProductName
//
this.txtProductName.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtProductName.Location = new System.Drawing.Point(68, 93);
this.txtProductName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtProductName.Name = "txtProductName";
this.txtProductName.Size = new System.Drawing.Size(134, 25);
this.txtProductName.TabIndex = 784;
this.txtProductName.Visible = false;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(37, 99);
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(32, 17);
this.label11.TabIndex = 785;
this.label11.Text = "标题";
this.label11.Visible = false;
//
// btnClearFilter
//
this.btnClearFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -900,27 +912,6 @@ namespace TemuKJD.WXForms.ProductForms
this.btnClearFilter.Text = "清空条件";
this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click);
//
// txtExtCodeFilter
//
this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtExtCodeFilter.Location = new System.Drawing.Point(68, 127);
this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtExtCodeFilter.Name = "txtExtCodeFilter";
this.txtExtCodeFilter.Size = new System.Drawing.Size(134, 25);
this.txtExtCodeFilter.TabIndex = 555;
this.txtExtCodeFilter.Visible = false;
//
// lblExtCodeFilter
//
this.lblExtCodeFilter.AutoSize = true;
this.lblExtCodeFilter.Location = new System.Drawing.Point(37, 131);
this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.lblExtCodeFilter.Name = "lblExtCodeFilter";
this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17);
this.lblExtCodeFilter.TabIndex = 560;
this.lblExtCodeFilter.Text = "货号";
this.lblExtCodeFilter.Visible = false;
//
// btnSearchProd
//
this.btnSearchProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -945,17 +936,6 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSearchProd.Text = "商品查询";
this.btnSearchProd.Click += new System.EventHandler(this.btnSearchProd_Click);
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(13, 63);
this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label5.Name = "label5";
this.label5.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 818;
this.label5.Text = "商品状态";
//
// ucGroupBoxEx1
//
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -1269,9 +1249,17 @@ namespace TemuKJD.WXForms.ProductForms
//
// splitContainer2.Panel1
//
this.splitContainer2.Panel1.Controls.Add(this.label9);
this.splitContainer2.Panel1.Controls.Add(this.pbLoadingShop);
this.splitContainer2.Panel1.Controls.Add(this.txtPageBegin);
this.splitContainer2.Panel1.Controls.Add(this.label1);
this.splitContainer2.Panel1.Controls.Add(this.dtpEndTime);
this.splitContainer2.Panel1.Controls.Add(this.txtIdFilter);
this.splitContainer2.Panel1.Controls.Add(this.label11);
this.splitContainer2.Panel1.Controls.Add(this.lblIdFilter);
this.splitContainer2.Panel1.Controls.Add(this.txtProductName);
this.splitContainer2.Panel1.Controls.Add(this.lblExtCodeFilter);
this.splitContainer2.Panel1.Controls.Add(this.txtExtCodeFilter);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
//
@@ -1321,6 +1309,69 @@ namespace TemuKJD.WXForms.ProductForms
this.label1.Text = "开始页";
this.label1.Visible = false;
//
// txtIdFilter
//
this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtIdFilter.Location = new System.Drawing.Point(138, 71);
this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtIdFilter.Name = "txtIdFilter";
this.txtIdFilter.Size = new System.Drawing.Size(44, 25);
this.txtIdFilter.TabIndex = 652;
this.txtIdFilter.Visible = false;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(17, 77);
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(32, 17);
this.label11.TabIndex = 785;
this.label11.Text = "标题";
this.label11.Visible = false;
//
// lblIdFilter
//
this.lblIdFilter.AutoSize = true;
this.lblIdFilter.Location = new System.Drawing.Point(117, 75);
this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.lblIdFilter.Name = "lblIdFilter";
this.lblIdFilter.Size = new System.Drawing.Size(21, 17);
this.lblIdFilter.TabIndex = 651;
this.lblIdFilter.Text = "ID";
this.lblIdFilter.Visible = false;
//
// txtProductName
//
this.txtProductName.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtProductName.Location = new System.Drawing.Point(48, 71);
this.txtProductName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtProductName.Name = "txtProductName";
this.txtProductName.Size = new System.Drawing.Size(43, 25);
this.txtProductName.TabIndex = 784;
this.txtProductName.Visible = false;
//
// lblExtCodeFilter
//
this.lblExtCodeFilter.AutoSize = true;
this.lblExtCodeFilter.Location = new System.Drawing.Point(17, 111);
this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.lblExtCodeFilter.Name = "lblExtCodeFilter";
this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17);
this.lblExtCodeFilter.TabIndex = 560;
this.lblExtCodeFilter.Text = "货号";
this.lblExtCodeFilter.Visible = false;
//
// txtExtCodeFilter
//
this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F);
this.txtExtCodeFilter.Location = new System.Drawing.Point(48, 107);
this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtExtCodeFilter.Name = "txtExtCodeFilter";
this.txtExtCodeFilter.Size = new System.Drawing.Size(134, 25);
this.txtExtCodeFilter.TabIndex = 555;
this.txtExtCodeFilter.Visible = false;
//
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
@@ -1558,31 +1609,6 @@ 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);
this.splitContainer4.Size = new System.Drawing.Size(1346, 26);
this.splitContainer4.SplitterDistance = 1165;
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(1165, 26);
this.statusBar.TabIndex = 2;
//
// colCheck
//
this.colCheck.Frozen = true;
@@ -1806,6 +1832,31 @@ namespace TemuKJD.WXForms.ProductForms
this.colOpResult.ReadOnly = true;
this.colOpResult.Width = 240;
//
// 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);
this.splitContainer4.Size = new System.Drawing.Size(1346, 26);
this.splitContainer4.SplitterDistance = 1165;
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(1165, 26);
this.statusBar.TabIndex = 2;
//
// WXProdPreSaleForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1965,5 +2016,9 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
private UserComponent.UcCheckBox chkProdTime;
private System.Windows.Forms.DateTimePicker dtpStartTime;
private System.Windows.Forms.DateTimePicker dtpEndTime;
private System.Windows.Forms.Label label9;
}
}
TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs
+55 -58
View File
@@ -122,41 +122,7 @@ namespace TemuKJD.WXForms.ProductForms
dgvSelectProduct.Columns["colSkuFakeImg"].Visible = false;
//foreach (var selectProd in upload_draft_product_lst)
//{
// int rowIndex = 0;
// this.dgvSelectProduct.Rows.Insert(rowIndex,
// true,
// selectProd.id,
// selectProd.shop_id,
// selectProd.shop_account,
// "登录",
// "进店",
// BaseClass.SaLevel > 0 ? selectProd.spu_id : selectProd.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'),
// selectProd.skc_id,
// selectProd.main_img,
// DataGridViewExtension.defaultBitmap,
// "",
// null,
// selectProd.product_name, // 用户端显示商品原名
// selectProd.cat_name,
// BaseClass.SaLevel > 0 ? selectProd.ext_code : selectProd.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'),
// selectProd.status,
// selectProd.draft_id,
// selectProd.notes,
// (selectProd.user_notes + " 编辑").Trim(),
// "删除",
// selectProd.add_time.ToString("yy-MM-dd HH:mm:ss"),
// "");
// dgvSelectProduct.Rows[rowIndex].Height = 60;
// int maxRowCount = 10000;
// while (dgvSelectProduct.Rows.Count > maxRowCount)
// {
// dgvSelectProduct.Rows.RemoveAt(maxRowCount);
// }
//}
dtpStartTime.Value = DateTime.Now.Date.AddMonths(-1);
//#if DEBUG
if (BaseClass.SaLevel == 1)
@@ -779,11 +745,19 @@ namespace TemuKJD.WXForms.ProductForms
//this.statusBar.pgbTaskProgress.Maximum = lstTemuDBProductSelect.Count;
//this.statusBar.UpdateProgressBar(0);
}));
bool istTimeOver = false;
List<Task> tList = new List<Task>();
foreach (JObject prod in prodObjs["productList"])
{
string StatusStr = "";
int rowIndex = 0;
var pStr = JsonHelper.SerializeObject(prod);
var editTime = BaseClass.StampToDateTime(prod["editTime"].ParseToInt());
if (chkProdTime.Checked && editTime < dtpStartTime.Value)
{
istTimeOver = true;
break;
}
Invoke(new Action(() =>
{
decimal? minPrice = prod["skuList"]?.Min(sk => sk["price"].ParseToDecimal() / 100);
@@ -791,7 +765,6 @@ namespace TemuKJD.WXForms.ProductForms
var prodId = prod["productId"].ParseToString();
if (dgvSelectProduct.Rows.Cast<DataGridViewRow>().Any(r => r.Cells["colDraftId"].ParseToString() == prodId))
{
}
StatusStr = "其他";
if (prod["status"].ParseToInt() == 5)
@@ -839,8 +812,8 @@ namespace TemuKJD.WXForms.ProductForms
"", // 备注
"",
"删除",
BaseClass.StampToDateTime(prod["lastEditDraftTime"].ParseToInt()).ToString("yy-MM-dd HH:mm"),
"");
editTime.ToString("yy-MM-dd HH:mm"),
"");
dgvSelectProduct.Rows[rowIndex].Height = 60;
Color color = Color.Red;
@@ -856,37 +829,56 @@ namespace TemuKJD.WXForms.ProductForms
dgvSelectProduct.Rows[rowIndex].Cells["colPreSale"].Style.ForeColor = dgvSelectProduct.Rows[rowIndex].Cells["colPreSale"].Value.ParseToString().Contains("预售") ? Color.Green : Color.Blue;
}));
// 获取商品链接
if (StatusStr.ParseToString().StartsWith("在售") && chkSearchPromotionLink.Checked == true)
{
Task.Run(() => { });
var PromotionRst = WXPreSale.GetPromotionLink(shop, prod["productId"].ParseToString(), page);
Thread.Sleep(Randomx.GetId(50, 150));
if (PromotionRst.ParseToString().Contains("\"code\":0"))
var t = Task.Run(() =>
{
var shareUrl = BaseRegex.GetStringJson(ref PromotionRst, "shareUrl");
var shortLink = BaseRegex.GetStringJson(ref PromotionRst, "shortLink");
if (!string.IsNullOrEmpty(shareUrl))
var PromotionRst = WXPreSale.GetPromotionLink(shop, prod["productId"].ParseToString(), page);
Thread.Sleep(Randomx.GetId(50, 150));
if (PromotionRst.ParseToString().Contains("\"code\":0"))
{
Invoke(new Action(() => {
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl;
}));
var shareUrl = BaseRegex.GetStringJson(ref PromotionRst, "shareUrl");
var shortLink = BaseRegex.GetStringJson(ref PromotionRst, "shortLink");
if (!string.IsNullOrEmpty(shareUrl))
{
Invoke(new Action(() =>
{
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl;
}));
}
else
{
Invoke(new Action(() =>
{
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = "链接获取失败";
}));
}
}
else
{
Invoke(new Action(() => {
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = "链接获取失败";
var errMsg = BaseRegex.GetStringJsonByRegs(ref PromotionRst, PromotionRst, "errMsg", "errorMsg", "err_msg", "error_msg", "errormsg");
Invoke(new Action(() =>
{
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = errMsg;
}));
}
}
else
});
tList.Add(t);
while (tList.Count >= 5)
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref PromotionRst, PromotionRst, "errMsg", "errorMsg", "err_msg", "error_msg", "errormsg");
Invoke(new Action(() => {
dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = errMsg;
}));
Thread.Sleep(200);
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted);
}
}
}
while (tList.Count > 0)
{
Thread.Sleep(200);
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted);
}
if (istTimeOver)
break;
}
catch (Exception ex)
{
@@ -1799,7 +1791,7 @@ namespace TemuKJD.WXForms.ProductForms
}
});
tList.Add(t);
while(tList.Count > 20)
while(tList.Count >= 20)
{
Thread.Sleep(200);
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted);
@@ -2019,7 +2011,7 @@ namespace TemuKJD.WXForms.ProductForms
}
});
tList.Add(t);
while (tList.Count > 20)
while (tList.Count >= 20)
{
Thread.Sleep(200);
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted);
@@ -2032,6 +2024,11 @@ namespace TemuKJD.WXForms.ProductForms
}
}
}
private void chkProdTime_CheckedChanged(object sender, EventArgs e)
{
}
}
public class WXPreSale
TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs
-1
View File
@@ -560,7 +560,6 @@ namespace TemuKJD.WXForms.ProductForms
}
if (!string.IsNullOrEmpty(cmbExportToOutServer.Text) && cmbGroupFilter.Text != "我的商品") // 用户自己的商品没有聚水潭商品，不用考虑是否导出
{
////data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower();
//if (cmbExportToOutServer.Text.Trim() == "是")
// data += "&send_to_out_server=1";
//else if (cmbExportToOutServer.Text.Trim() == "否")
TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
-1
View File
@@ -441,7 +441,6 @@ namespace TemuKJD.WXForms.ProductForms
}
if (!string.IsNullOrEmpty(cmbExportToOutServer.Text))
{
//data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower();
if (cmbExportToOutServer.Text.Trim() == "是")
data += "&send_to_out_server=1";
else if (cmbExportToOutServer.Text.Trim() == "否")