diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index fa593a4..e70ef77 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -187,6 +187,7 @@ + diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index e60712b..d958ab5 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 628; + public static int VersionCount = 630; //public static int VersionCount = 613; /// diff --git a/AllBase/Model/Param/PDDCouponParam/PDDCouponGoodsListParam.cs b/AllBase/Model/Param/PDDCouponParam/PDDCouponGoodsListParam.cs new file mode 100644 index 0000000..a67ef70 --- /dev/null +++ b/AllBase/Model/Param/PDDCouponParam/PDDCouponGoodsListParam.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Model.Param.PDDCouponParam +{ + public class PDDCouponGoodsListParam + { + public List existed_coupon_list { get; set; } + public List goods_list { get; set; } + } + + public class PDDCouponGoods + { + public long? id { get; set; } // 834340794793 + public string goods_name { get; set; } // "微瑕疵洞洞鞋女新款夏外穿厚底防滑静音不臭脚凉拖" + public string goods_type { get; set; } // "1" + public List sku_group_price { get; set; } // [ 2500, 2700 ], + } +} diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs index bb50575..5d44f2a 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs @@ -39,6 +39,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectListManageForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.lblSkuRandomLetterNotes = new System.Windows.Forms.Label(); this.btnAdd = new DevComponents.DotNetBar.PanelEx(); this.label21 = new System.Windows.Forms.Label(); this.btnSetSubSa = new DevComponents.DotNetBar.PanelEx(); @@ -64,11 +65,6 @@ this.chkChangeSizeAndNumber = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnStop = new DevComponents.DotNetBar.PanelEx(); this.btnExport = new DevComponents.DotNetBar.PanelEx(); - this.lblCustomImgNum = new System.Windows.Forms.Label(); - this.btnCustomImg = new DevComponents.DotNetBar.PanelEx(); - this.label14 = new System.Windows.Forms.Label(); - this.numSeconds = new System.Windows.Forms.NumericUpDown(); - this.chkCustomPic = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); @@ -95,6 +91,7 @@ this.txtSkuHeadText = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.txtSkuEndText = new System.Windows.Forms.TextBox(); + this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -113,6 +110,11 @@ this.chkAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); + this.lblCustomImgNum = new System.Windows.Forms.Label(); + this.numSeconds = new System.Windows.Forms.NumericUpDown(); + this.label14 = new System.Windows.Forms.Label(); + this.btnCustomImg = new DevComponents.DotNetBar.PanelEx(); + this.chkCustomPic = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -158,7 +160,6 @@ ((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit(); @@ -167,6 +168,7 @@ this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit(); this.SuspendLayout(); // @@ -181,6 +183,7 @@ // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.lblSkuRandomLetterNotes); this.splitContainer1.Panel1.Controls.Add(this.btnAdd); this.splitContainer1.Panel1.Controls.Add(this.label21); this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa); @@ -206,11 +209,6 @@ this.splitContainer1.Panel1.Controls.Add(this.chkChangeSizeAndNumber); this.splitContainer1.Panel1.Controls.Add(this.btnStop); this.splitContainer1.Panel1.Controls.Add(this.btnExport); - this.splitContainer1.Panel1.Controls.Add(this.lblCustomImgNum); - this.splitContainer1.Panel1.Controls.Add(this.btnCustomImg); - this.splitContainer1.Panel1.Controls.Add(this.label14); - this.splitContainer1.Panel1.Controls.Add(this.numSeconds); - this.splitContainer1.Panel1.Controls.Add(this.chkCustomPic); this.splitContainer1.Panel1.Controls.Add(this.btnDel); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.chkAddPrice); @@ -222,6 +220,17 @@ this.splitContainer1.SplitterDistance = 100; this.splitContainer1.TabIndex = 2; // + // lblSkuRandomLetterNotes + // + this.lblSkuRandomLetterNotes.AutoSize = true; + this.lblSkuRandomLetterNotes.ForeColor = System.Drawing.SystemColors.MenuHighlight; + this.lblSkuRandomLetterNotes.Location = new System.Drawing.Point(974, 75); + this.lblSkuRandomLetterNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblSkuRandomLetterNotes.Name = "lblSkuRandomLetterNotes"; + this.lblSkuRandomLetterNotes.Size = new System.Drawing.Size(150, 17); + this.lblSkuRandomLetterNotes.TabIndex = 641; + this.lblSkuRandomLetterNotes.Text = "备注：当前特殊字符包括--"; + // // btnAdd // this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -648,83 +657,6 @@ this.btnExport.Text = "导出数据表格"; this.btnExport.Click += new System.EventHandler(this.btnExport_Click); // - // lblCustomImgNum - // - this.lblCustomImgNum.AutoSize = true; - this.lblCustomImgNum.Location = new System.Drawing.Point(1442, 75); - this.lblCustomImgNum.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.lblCustomImgNum.Name = "lblCustomImgNum"; - this.lblCustomImgNum.Size = new System.Drawing.Size(95, 17); - this.lblCustomImgNum.TabIndex = 484; - this.lblCustomImgNum.Text = "自定义图片 0 张"; - this.lblCustomImgNum.Visible = false; - // - // btnCustomImg - // - this.btnCustomImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCustomImg.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnCustomImg.DisabledBackColor = System.Drawing.Color.Empty; - this.btnCustomImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCustomImg.Location = new System.Drawing.Point(1335, 70); - this.btnCustomImg.Name = "btnCustomImg"; - this.btnCustomImg.Size = new System.Drawing.Size(106, 26); - this.btnCustomImg.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnCustomImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnCustomImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnCustomImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnCustomImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnCustomImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnCustomImg.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnCustomImg.Style.GradientAngle = 90; - this.btnCustomImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnCustomImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnCustomImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnCustomImg.TabIndex = 483; - this.btnCustomImg.Text = "设置自定义图片"; - this.btnCustomImg.Visible = false; - this.btnCustomImg.Click += new System.EventHandler(this.btnCustomImg_Click); - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(1276, 75); - this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(56, 17); - this.label14.TabIndex = 479; - this.label14.Text = "秒后还原"; - this.label14.Visible = false; - // - // numSeconds - // - this.numSeconds.Location = new System.Drawing.Point(1230, 72); - this.numSeconds.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); - this.numSeconds.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numSeconds.Name = "numSeconds"; - this.numSeconds.Size = new System.Drawing.Size(44, 23); - this.numSeconds.TabIndex = 478; - this.numSeconds.Value = new decimal(new int[] { - 35, - 0, - 0, - 0}); - this.numSeconds.Visible = false; - // - // chkCustomPic - // - this.chkCustomPic.Location = new System.Drawing.Point(1101, 73); - this.chkCustomPic.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); - this.chkCustomPic.Name = "chkCustomPic"; - this.chkCustomPic.Size = new System.Drawing.Size(135, 21); - this.chkCustomPic.TabIndex = 477; - this.chkCustomPic.Text = "使用自定义图片并在"; - this.chkCustomPic.UseVisualStyleBackColor = true; - this.chkCustomPic.Visible = false; - // // btnDel // this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -872,7 +804,7 @@ "核价成功", "核价成功（重复）", "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(917, 8); + this.cmbNotes.Location = new System.Drawing.Point(917, 5); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(65, 25); @@ -897,7 +829,7 @@ "已上传", "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(814, 8); + this.cmbStatus.Location = new System.Drawing.Point(814, 5); this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); this.cmbStatus.Name = "cmbStatus"; this.cmbStatus.Size = new System.Drawing.Size(65, 25); @@ -1043,6 +975,7 @@ this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); this.flowLayoutPanel1.Controls.Add(this.txtSkuEndText); + this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomLetter); this.flowLayoutPanel1.Controls.Add(this.chkFission); this.flowLayoutPanel1.Controls.Add(this.chkHeadWords); this.flowLayoutPanel1.Controls.Add(this.chkEndWords); @@ -1075,7 +1008,7 @@ this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3); this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSkuHeadText.Name = "txtSkuHeadText"; - this.txtSkuHeadText.Size = new System.Drawing.Size(85, 23); + this.txtSkuHeadText.Size = new System.Drawing.Size(65, 23); this.txtSkuHeadText.TabIndex = 452; this.txtSkuHeadText.TextChanged += new System.EventHandler(this.txtSkuHeadText_TextChanged); // @@ -1083,7 +1016,7 @@ // this.label10.Anchor = System.Windows.Forms.AnchorStyles.None; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(143, 6); + this.label10.Location = new System.Drawing.Point(123, 6); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(52, 17); @@ -1093,19 +1026,31 @@ // txtSkuEndText // this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSkuEndText.Location = new System.Drawing.Point(195, 3); + this.txtSkuEndText.Location = new System.Drawing.Point(175, 3); this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSkuEndText.Name = "txtSkuEndText"; - this.txtSkuEndText.Size = new System.Drawing.Size(85, 23); + this.txtSkuEndText.Size = new System.Drawing.Size(65, 23); this.txtSkuEndText.TabIndex = 454; this.txtSkuEndText.TextChanged += new System.EventHandler(this.txtSkuEndText_TextChanged); // + // chkSkuRandomLetter + // + this.chkSkuRandomLetter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkSkuRandomLetter.AutoSize = true; + this.chkSkuRandomLetter.Location = new System.Drawing.Point(246, 4); + this.chkSkuRandomLetter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkSkuRandomLetter.Name = "chkSkuRandomLetter"; + this.chkSkuRandomLetter.Size = new System.Drawing.Size(96, 21); + this.chkSkuRandomLetter.TabIndex = 476; + this.chkSkuRandomLetter.Text = "Sku随机字符"; + this.chkSkuRandomLetter.UseVisualStyleBackColor = true; + // // chkFission // this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkFission.AutoSize = true; - this.chkFission.Location = new System.Drawing.Point(286, 4); - this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkFission.Location = new System.Drawing.Point(342, 4); + this.chkFission.Margin = new System.Windows.Forms.Padding(0); this.chkFission.Name = "chkFission"; this.chkFission.Size = new System.Drawing.Size(75, 21); this.chkFission.TabIndex = 475; @@ -1116,7 +1061,7 @@ // this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkHeadWords.AutoSize = true; - this.chkHeadWords.Location = new System.Drawing.Point(361, 4); + this.chkHeadWords.Location = new System.Drawing.Point(417, 4); this.chkHeadWords.Margin = new System.Windows.Forms.Padding(0); this.chkHeadWords.Name = "chkHeadWords"; this.chkHeadWords.Size = new System.Drawing.Size(75, 21); @@ -1128,7 +1073,7 @@ // this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkEndWords.AutoSize = true; - this.chkEndWords.Location = new System.Drawing.Point(436, 4); + this.chkEndWords.Location = new System.Drawing.Point(492, 4); this.chkEndWords.Margin = new System.Windows.Forms.Padding(0); this.chkEndWords.Name = "chkEndWords"; this.chkEndWords.Size = new System.Drawing.Size(75, 21); @@ -1140,7 +1085,7 @@ // this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkReFissionAllProdName.AutoSize = true; - this.chkReFissionAllProdName.Location = new System.Drawing.Point(511, 4); + this.chkReFissionAllProdName.Location = new System.Drawing.Point(567, 4); this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(0); this.chkReFissionAllProdName.Name = "chkReFissionAllProdName"; this.chkReFissionAllProdName.Size = new System.Drawing.Size(99, 21); @@ -1153,7 +1098,7 @@ // this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkRandomSkuOrder.AutoSize = true; - this.chkRandomSkuOrder.Location = new System.Drawing.Point(610, 4); + this.chkRandomSkuOrder.Location = new System.Drawing.Point(666, 4); this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0); this.chkRandomSkuOrder.Name = "chkRandomSkuOrder"; this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21); @@ -1165,7 +1110,7 @@ // chkSkuRandomPrice // this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkSkuRandomPrice.Location = new System.Drawing.Point(707, 4); + this.chkSkuRandomPrice.Location = new System.Drawing.Point(763, 4); this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkSkuRandomPrice.Name = "chkSkuRandomPrice"; this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21); @@ -1182,7 +1127,7 @@ 0, 0, 131072}); - this.numSkuRandomPrice.Location = new System.Drawing.Point(817, 3); + this.numSkuRandomPrice.Location = new System.Drawing.Point(873, 3); this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.numSkuRandomPrice.Name = "numSkuRandomPrice"; this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23); @@ -1198,7 +1143,7 @@ // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(861, 6); + this.label11.Location = new System.Drawing.Point(917, 6); this.label11.Margin = new System.Windows.Forms.Padding(0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(20, 17); @@ -1209,7 +1154,7 @@ // this.chkOriginalPriceMarkUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkOriginalPriceMarkUp.AutoSize = true; - this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(883, 4); + this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(2, 29); this.chkOriginalPriceMarkUp.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); this.chkOriginalPriceMarkUp.Name = "chkOriginalPriceMarkUp"; this.chkOriginalPriceMarkUp.Size = new System.Drawing.Size(95, 21); @@ -1251,7 +1196,7 @@ "全部", "重上", "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8); + this.cmbUserNotes.Location = new System.Drawing.Point(1044, 5); this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbUserNotes.Name = "cmbUserNotes"; this.cmbUserNotes.Size = new System.Drawing.Size(65, 25); @@ -1330,6 +1275,11 @@ // splitContainer2.Panel1 // this.splitContainer2.Panel1.Controls.Add(this.pbLoading); + this.splitContainer2.Panel1.Controls.Add(this.lblCustomImgNum); + this.splitContainer2.Panel1.Controls.Add(this.numSeconds); + this.splitContainer2.Panel1.Controls.Add(this.label14); + this.splitContainer2.Panel1.Controls.Add(this.btnCustomImg); + this.splitContainer2.Panel1.Controls.Add(this.chkCustomPic); this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); // @@ -1352,6 +1302,83 @@ this.pbLoading.TabIndex = 7; this.pbLoading.TabStop = false; // + // lblCustomImgNum + // + this.lblCustomImgNum.AutoSize = true; + this.lblCustomImgNum.Location = new System.Drawing.Point(1447, 43); + this.lblCustomImgNum.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblCustomImgNum.Name = "lblCustomImgNum"; + this.lblCustomImgNum.Size = new System.Drawing.Size(95, 17); + this.lblCustomImgNum.TabIndex = 484; + this.lblCustomImgNum.Text = "自定义图片 0 张"; + this.lblCustomImgNum.Visible = false; + // + // numSeconds + // + this.numSeconds.Location = new System.Drawing.Point(1235, 40); + this.numSeconds.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.numSeconds.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numSeconds.Name = "numSeconds"; + this.numSeconds.Size = new System.Drawing.Size(44, 23); + this.numSeconds.TabIndex = 478; + this.numSeconds.Value = new decimal(new int[] { + 35, + 0, + 0, + 0}); + this.numSeconds.Visible = false; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(1281, 43); + this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(56, 17); + this.label14.TabIndex = 479; + this.label14.Text = "秒后还原"; + this.label14.Visible = false; + // + // btnCustomImg + // + this.btnCustomImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCustomImg.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnCustomImg.DisabledBackColor = System.Drawing.Color.Empty; + this.btnCustomImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCustomImg.Location = new System.Drawing.Point(1340, 38); + this.btnCustomImg.Name = "btnCustomImg"; + this.btnCustomImg.Size = new System.Drawing.Size(106, 26); + this.btnCustomImg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnCustomImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCustomImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnCustomImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnCustomImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnCustomImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnCustomImg.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnCustomImg.Style.GradientAngle = 90; + this.btnCustomImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnCustomImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCustomImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnCustomImg.TabIndex = 483; + this.btnCustomImg.Text = "设置自定义图片"; + this.btnCustomImg.Visible = false; + this.btnCustomImg.Click += new System.EventHandler(this.btnCustomImg_Click); + // + // chkCustomPic + // + this.chkCustomPic.Location = new System.Drawing.Point(1106, 41); + this.chkCustomPic.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); + this.chkCustomPic.Name = "chkCustomPic"; + this.chkCustomPic.Size = new System.Drawing.Size(135, 21); + this.chkCustomPic.TabIndex = 477; + this.chkCustomPic.Text = "使用自定义图片并在"; + this.chkCustomPic.UseVisualStyleBackColor = true; + this.chkCustomPic.Visible = false; + // // dgvSelectProduct // this.dgvSelectProduct.AllowUserToAddRows = false; @@ -1672,17 +1699,18 @@ ((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPrice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numAddPriceTimes)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit(); this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); this.splitContainer2.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numSeconds)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit(); this.ResumeLayout(false); @@ -1794,5 +1822,7 @@ private DevComponents.DotNetBar.PanelEx btnSetSubSa; private DevComponents.DotNetBar.PanelEx btnReFission; private DevComponents.DotNetBar.PanelEx btnSearch; + private UserComponent.UcCheckBox chkSkuRandomLetter; + private System.Windows.Forms.Label lblSkuRandomLetterNotes; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs index 1b85220..fd7db05 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs @@ -33,6 +33,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms { public CancellationTokenSource cancellationTokenSource { get; set; } = null; + List skuRandomLetterArr = new List { "~", "#", "￥", "%", "&", "*", "(", ")", "（", "）", "+", "-", "_", "=", "【", "】", "·", "|", "《", "》" }; + List lstAdminTemuDBProductSelect = new List(); List shopLst = new List(); List lstDbPrice = new List(); @@ -142,6 +144,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms //chkRandomSkuOrder.Checked = true; //chkSkuRandomPrice.Checked = true; } + + this.lblSkuRandomLetterNotes.Text = "备注：SKU特殊字符包括 " + string.Join(" ", skuRandomLetterArr) + " "; } private void DbProductSelectListManageForm_VisibleChanged(object sender, EventArgs e) @@ -1236,7 +1240,16 @@ namespace TemuKJD.KJDForms.ProductSelectForms skuEnd.Add(""); foreach (var skuInfo in skcInfo.productSkuList) { + if (cancellationTokenSource.IsCancellationRequested) + { + return "{\"success\":false,\"status\":\"未上传\"," + + "\"productDraftId\":\"" + prodParam.productDraftId.ParseToString() + "\"," + + "\"errMsg\":\"上传停止\"}"; + } + var speck = skuInfo.productSkuSpecList.FirstOrDefault(s => s.parentSpecName == "颜色"); + if (speck == null) + speck = skuInfo.productSkuSpecList.FirstOrDefault(); if (speck != null) { skuNameDic[speck.specName] = skuHead[Randomx.GetId(skuHead.Count)] + @@ -1244,6 +1257,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms } else skuNameDic[speck.specName] = speck.specName; + + if (chkSkuRandomLetter.Checked) + { + //if (Randomx.GetId(2) == 1) + skuNameDic[speck.specName] = skuNameDic[speck.specName] + skuRandomLetterArr[Randomx.GetId(skuRandomLetterArr.Count)]; + //else + skuNameDic[speck.specName] = skuRandomLetterArr[Randomx.GetId(skuRandomLetterArr.Count)] + skuNameDic[speck.specName]; + } } #endregion diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs index 07629d1..0a2db1f 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs @@ -148,6 +148,7 @@ this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.chkSkuRandomLetter = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -809,7 +810,7 @@ "全部", "重上", "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(1026, 8); + this.cmbUserNotes.Location = new System.Drawing.Point(1026, 5); this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbUserNotes.Name = "cmbUserNotes"; this.cmbUserNotes.Size = new System.Drawing.Size(62, 25); @@ -826,7 +827,7 @@ "核价成功", "核价成功（重复）", "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(901, 8); + this.cmbNotes.Location = new System.Drawing.Point(901, 5); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(63, 25); @@ -853,7 +854,7 @@ "已上传", "草稿箱", "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(800, 8); + this.cmbStatus.Location = new System.Drawing.Point(800, 5); this.cmbStatus.Margin = new System.Windows.Forms.Padding(0); this.cmbStatus.Name = "cmbStatus"; this.cmbStatus.Size = new System.Drawing.Size(63, 25); @@ -868,6 +869,7 @@ this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText); this.flowLayoutPanel1.Controls.Add(this.label10); this.flowLayoutPanel1.Controls.Add(this.txtSkuEndText); + this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomLetter); this.flowLayoutPanel1.Controls.Add(this.chkFission); this.flowLayoutPanel1.Controls.Add(this.chkHeadWords); this.flowLayoutPanel1.Controls.Add(this.chkEndWords); @@ -899,14 +901,14 @@ this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3); this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSkuHeadText.Name = "txtSkuHeadText"; - this.txtSkuHeadText.Size = new System.Drawing.Size(85, 23); + this.txtSkuHeadText.Size = new System.Drawing.Size(65, 23); this.txtSkuHeadText.TabIndex = 452; // // label10 // this.label10.Anchor = System.Windows.Forms.AnchorStyles.None; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(143, 6); + this.label10.Location = new System.Drawing.Point(123, 6); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(52, 17); @@ -916,18 +918,18 @@ // txtSkuEndText // this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtSkuEndText.Location = new System.Drawing.Point(195, 3); + this.txtSkuEndText.Location = new System.Drawing.Point(175, 3); this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSkuEndText.Name = "txtSkuEndText"; - this.txtSkuEndText.Size = new System.Drawing.Size(85, 23); + this.txtSkuEndText.Size = new System.Drawing.Size(65, 23); this.txtSkuEndText.TabIndex = 454; // // chkFission // this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkFission.AutoSize = true; - this.chkFission.Location = new System.Drawing.Point(286, 4); - this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkFission.Location = new System.Drawing.Point(342, 4); + this.chkFission.Margin = new System.Windows.Forms.Padding(0); this.chkFission.Name = "chkFission"; this.chkFission.Size = new System.Drawing.Size(75, 21); this.chkFission.TabIndex = 475; @@ -938,7 +940,7 @@ // this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkHeadWords.AutoSize = true; - this.chkHeadWords.Location = new System.Drawing.Point(361, 4); + this.chkHeadWords.Location = new System.Drawing.Point(417, 4); this.chkHeadWords.Margin = new System.Windows.Forms.Padding(0); this.chkHeadWords.Name = "chkHeadWords"; this.chkHeadWords.Size = new System.Drawing.Size(75, 21); @@ -950,7 +952,7 @@ // this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkEndWords.AutoSize = true; - this.chkEndWords.Location = new System.Drawing.Point(436, 4); + this.chkEndWords.Location = new System.Drawing.Point(492, 4); this.chkEndWords.Margin = new System.Windows.Forms.Padding(0); this.chkEndWords.Name = "chkEndWords"; this.chkEndWords.Size = new System.Drawing.Size(75, 21); @@ -964,7 +966,7 @@ this.chkDeleteLowPriceSku.AutoSize = true; this.chkDeleteLowPriceSku.Checked = true; this.chkDeleteLowPriceSku.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(511, 4); + this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(567, 4); this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(0); this.chkDeleteLowPriceSku.Name = "chkDeleteLowPriceSku"; this.chkDeleteLowPriceSku.Size = new System.Drawing.Size(95, 21); @@ -976,7 +978,7 @@ // this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.chkRandomSkuOrder.AutoSize = true; - this.chkRandomSkuOrder.Location = new System.Drawing.Point(606, 4); + this.chkRandomSkuOrder.Location = new System.Drawing.Point(662, 4); this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0); this.chkRandomSkuOrder.Name = "chkRandomSkuOrder"; this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21); @@ -987,7 +989,7 @@ // chkSkuRandomPrice // this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.chkSkuRandomPrice.Location = new System.Drawing.Point(701, 4); + this.chkSkuRandomPrice.Location = new System.Drawing.Point(757, 4); this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0); this.chkSkuRandomPrice.Name = "chkSkuRandomPrice"; this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21); @@ -1003,7 +1005,7 @@ 0, 0, 131072}); - this.numSkuRandomPrice.Location = new System.Drawing.Point(811, 3); + this.numSkuRandomPrice.Location = new System.Drawing.Point(867, 3); this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.numSkuRandomPrice.Name = "numSkuRandomPrice"; this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23); @@ -1018,7 +1020,7 @@ // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(855, 6); + this.label11.Location = new System.Drawing.Point(911, 6); this.label11.Margin = new System.Windows.Forms.Padding(0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(20, 17); @@ -1672,6 +1674,18 @@ this.statusBar.Size = new System.Drawing.Size(1534, 25); this.statusBar.TabIndex = 5; // + // chkSkuRandomLetter + // + this.chkSkuRandomLetter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.chkSkuRandomLetter.AutoSize = true; + this.chkSkuRandomLetter.Location = new System.Drawing.Point(246, 4); + this.chkSkuRandomLetter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.chkSkuRandomLetter.Name = "chkSkuRandomLetter"; + this.chkSkuRandomLetter.Size = new System.Drawing.Size(96, 21); + this.chkSkuRandomLetter.TabIndex = 477; + this.chkSkuRandomLetter.Text = "Sku随机字符"; + this.chkSkuRandomLetter.UseVisualStyleBackColor = true; + // // ProductThirdSelectListManageForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1830,5 +1844,6 @@ private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn5; private System.Windows.Forms.DataGridViewLinkColumn colToPorductPage; private System.Windows.Forms.DataGridViewLinkColumn colToDraftPage; + private UserComponent.UcCheckBox chkSkuRandomLetter; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs index dd3c258..3e78159 100644 --- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs +++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs @@ -37,6 +37,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms { public CancellationTokenSource cancellationTokenSource { get; set; } = null; + List skuRandomLetterArr = new List { "~", "#", "￥", "%", "&", "*", "(", ")", "（", "）", "+", "-", "_", "=", "【", "】", "·", "|", "《", "》" }; + List lstAdminTemuDBProductSelect = new List(); List shopLst = new List(); @@ -1206,8 +1208,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms "\"errMsg\":\"上传停止\"}"; } - //var speck = skuInfo.productSkuSpecList.FirstOrDefault(s => s.parentSpecName == "颜色"); - var speck = skuInfo.productSkuSpecList.FirstOrDefault(); + var speck = skuInfo.productSkuSpecList.FirstOrDefault(s => s.parentSpecName == "颜色"); + if (speck == null) + speck = skuInfo.productSkuSpecList.FirstOrDefault(); if (speck != null) { skuNameDic[speck.specName] = skuHead[Randomx.GetId(skuHead.Count)] + @@ -1215,6 +1218,14 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms } else skuNameDic[speck.specName] = speck.specName; + + if (chkSkuRandomLetter.Checked) + { + //if (Randomx.GetId(2) == 1) + skuNameDic[speck.specName] = skuNameDic[speck.specName] + skuRandomLetterArr[Randomx.GetId(skuRandomLetterArr.Count)]; + //else + skuNameDic[speck.specName] = skuRandomLetterArr[Randomx.GetId(skuRandomLetterArr.Count)] + skuNameDic[speck.specName]; + } } #endregion diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs index d1e72c3..6baba76 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.Designer.cs @@ -29,11 +29,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdImgListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.chkUpdateTag = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); this.cmbTypeFilter = new System.Windows.Forms.ComboBox(); @@ -82,6 +84,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.chkUpdateTag); this.splitContainer1.Panel1.Controls.Add(this.btnSearch); this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); this.splitContainer1.Panel1.Controls.Add(this.cmbTypeFilter); @@ -92,10 +95,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1378, 544); + this.splitContainer1.Size = new System.Drawing.Size(1003, 544); this.splitContainer1.SplitterDistance = 53; this.splitContainer1.TabIndex = 3; // + // chkUpdateTag + // + this.chkUpdateTag.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkUpdateTag.AutoSize = true; + this.chkUpdateTag.Checked = true; + this.chkUpdateTag.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkUpdateTag.Location = new System.Drawing.Point(870, 17); + this.chkUpdateTag.Name = "chkUpdateTag"; + this.chkUpdateTag.Size = new System.Drawing.Size(111, 21); + this.chkUpdateTag.TabIndex = 671; + this.chkUpdateTag.Text = "上传到临时图片"; + this.chkUpdateTag.UseVisualStyleBackColor = true; + // // btnSearch // this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -201,7 +217,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1378, 487); + this.splitContainer2.Size = new System.Drawing.Size(1003, 487); this.splitContainer2.SplitterDistance = 458; this.splitContainer2.TabIndex = 0; // @@ -209,7 +225,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(664, 204); + this.pbLoading.Location = new System.Drawing.Point(476, 204); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -223,7 +239,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms | System.Windows.Forms.AnchorStyles.Right))); this.panel2.Location = new System.Drawing.Point(44, 55); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1296, 364); + this.panel2.Size = new System.Drawing.Size(921, 364); this.panel2.TabIndex = 8; // // dgvDbProduct @@ -263,7 +279,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvDbProduct.Name = "dgvDbProduct"; this.dgvDbProduct.ReadOnly = true; this.dgvDbProduct.RowTemplate.Height = 23; - this.dgvDbProduct.Size = new System.Drawing.Size(1370, 458); + this.dgvDbProduct.Size = new System.Drawing.Size(995, 458); this.dgvDbProduct.TabIndex = 6; this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); // @@ -347,7 +363,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // colEdit // this.colEdit.FillWeight = 60F; - this.colEdit.HeaderText = "替换图片"; + this.colEdit.HeaderText = "更新图片"; this.colEdit.Name = "colEdit"; this.colEdit.ReadOnly = true; this.colEdit.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -375,7 +391,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(1016, 0); + this.ucSplitPage1.Location = new System.Drawing.Point(641, 0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); @@ -392,13 +408,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(1378, 25); + this.statusBar.Size = new System.Drawing.Size(1003, 25); this.statusBar.TabIndex = 5; // // PDDDBProdImgListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1380, 578); + this.ClientSize = new System.Drawing.Size(1005, 578); 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"))); @@ -437,6 +453,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private UserComponent.DataGridViewEx dgvDbProduct; private UserControls.UcSplitPage ucSplitPage1; private UserControls.StatusBarUserControl statusBar; + private System.Windows.Forms.Panel panel2; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colDbId; private System.Windows.Forms.DataGridViewTextBoxColumn colImgMd5; @@ -450,6 +467,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colSelectImg; private System.Windows.Forms.DataGridViewLinkColumn col_delete; - private System.Windows.Forms.Panel panel2; + private UserComponent.UcCheckBox chkUpdateTag; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.cs index b29e580..6f3b861 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdImgListForm.cs @@ -43,11 +43,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms { this.dgvDbProduct.Columns["colSelectImg"].Visible = false; this.dgvDbProduct.Columns["colEdit"].Visible = true; + chkUpdateTag.Visible = true; } else { this.dgvDbProduct.Columns["colSelectImg"].Visible = true; this.dgvDbProduct.Columns["colEdit"].Visible = false; + chkUpdateTag.Visible = false; } } @@ -107,13 +109,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms skuImg.notes, skuImg.add_time.ToString("yy-MM-dd HH:mm"), skuImg.mdy_time.ToString("yy-MM-dd HH:mm"), - "替换图片", + "更新图片", "选择", "删除", "认领"); - //dgvDbProduct.Rows[rowIndex].Height = dgvDbProduct.Columns["colImg"].Width; - dgvDbProduct.Rows[rowIndex].Height = 80; + dgvDbProduct.Rows[rowIndex].Height = Math.Min(80, dgvDbProduct.Columns["colImg"].Width); })); } @@ -215,7 +216,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms //dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words; //dgvDbProduct.Rows[e.RowIndex].Cells["col_product_name"].Value = dbProduct.product_name; break; - case "替换图片": + case "更新图片": UploadImg(dbProductImg); break; case "选择图片": @@ -266,8 +267,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms PDDShopLoginForm loginForm = null; Invoke(new Action(() => { - //this.panel2.SendToBack(); - this.panel2.BringToFront(); + this.panel2.SendToBack(); + //this.panel2.BringToFront(); loginForm = new PDDShopLoginForm(shop); loginForm.TopLevel = false; loginForm.openType = EnumOpenType.manage; @@ -298,8 +299,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms } string img_md5 = BaseClass.GetMd5(imgBase64); string img_url = ""; - var img = UploadProdSkuImg(shop, imgBase64); - if (!img.Contains("\"url\":\"https:")) + var img = UploadProdSkuImg(shop, imgBase64, chkUpdateTag.Checked? "mms-material-img" : "mms-goods-image"); + if (!img.Contains("\"url\":\"https:") && !img.Contains("\"success\":true")) { var error = BaseRegex.GetStringJson(ref img, "error_msg"); if (string.IsNullOrEmpty(error)) @@ -373,19 +374,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms /// /// /// - public string UploadProdSkuImg(ShopLoginInfo shop, string img_base64) + public string UploadProdSkuImg(ShopLoginInfo shop, string img_base64, string signTag = "mms-goods-image") { string img_signature = ""; - var img_signature_rst = get_uploag_sku_img_signature(shop); + var img_signature_rst = get_upload_sku_img_signature(shop, signTag); if (!img_signature_rst.Contains("\"success\":true")) { Thread.Sleep(Randomx.GetId(500, 1000)); - img_signature_rst = get_uploag_sku_img_signature(shop); + img_signature_rst = get_upload_sku_img_signature(shop, signTag); } if (!img_signature_rst.Contains("\"success\":true")) { Thread.Sleep(Randomx.GetId(500, 1000)); - img_signature_rst = get_uploag_sku_img_signature(shop); + img_signature_rst = get_upload_sku_img_signature(shop, signTag); } if (!img_signature_rst.Contains("\"success\":true")) { @@ -432,17 +433,39 @@ Content-Disposition: form-data; name=""pic_operations"" "; Thread.Sleep(Randomx.GetId(5, 20)); var uploadImgRst = uploag_sku_img(shop, body, boundary); + if (!uploadImgRst.Contains("\"url\":\"https:")) + { + //var error = BaseRegex.GetStringJson(ref uploadImgRst, "error_msg"); + //if (string.IsNullOrEmpty(error)) + // error = uploadImgRst; + //return error; + return uploadImgRst; + } + if (signTag == "mms-goods-image") + { + var imgTmpUrl = BaseRegex.GetStringJson(ref uploadImgRst, "url"); + Thread.Sleep(Randomx.GetId(5, 20)); + var creatRst = create_goods_img(shop, imgTmpUrl, "图片1.jpg"); + if (!creatRst.Contains("\"success\":true")) + { + return creatRst; + } + + var imgId = BaseRegex.GetStringJson(ref creatRst, "result"); + Thread.Sleep(Randomx.GetId(5, 20)); + uploadImgRst = query_goods_img(shop, imgTmpUrl, imgId); + } return uploadImgRst; } - private string get_uploag_sku_img_signature(ShopLoginInfo shop) + private string get_upload_sku_img_signature(ShopLoginInfo shop, string signTag = "mms-goods-image") { var anti = shop.AntiContents.LastOrDefault().ParseToString(); if (shop.AntiContents.Count > 0) anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)]; string url = "https://mms.pinduoduo.com/galerie/business/get_signature"; - string body = @"{""bucket_tag"":""mms-material-img""}"; - //{"bucket_tag":"mms-goods-image"} + //string body = @"{""bucket_tag"":""mms-material-img""}"; + string body = @"{""bucket_tag"":""" + signTag + @"""}"; string refere = "https://mms.pinduoduo.com/material/upload"; var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti); @@ -487,14 +510,14 @@ Content-Disposition: form-data; name=""pic_operations"" return result; } - private string create_goods_img(ShopLoginInfo shop, string tmpUrl) + private string create_goods_img(ShopLoginInfo shop, string tmpUrl, string imgName = "图片1.jpg") { //tmpUrl = "https://pfs.pinduoduo.com/L90k1BB5397AoHjAgRgc55akrOYHOdmytPdc0f0H8H4Eaed975Uv8nEKi2lysNMyywzvv8oQLuX9RYcN9Zj6rEbprt2VQ0IsY8oE41sUq0zWRvL9HtN9zT5vm4ZZMa-mVVb--mIxF44lpjEySokqlPC8s4ETCzFff5cVnToZjpIBx4mUnuBhBxUPqid4M3wsWWYCz4CmU-BVwGXUH3B5PU3me0_dfentrA.jpeg"; var anti = shop.AntiContents.LastOrDefault().ParseToString(); if (shop.AntiContents.Count > 0) anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)]; string url = "https://mms.pinduoduo.com/garner/mms/file/create"; - string body = @"{""url"":""" + tmpUrl + @""",""name"":""图片1.jpg"",""extension"":""jpeg"",""create_time"":" + string body = @"{""url"":""" + tmpUrl + @""",""name"":""" + imgName + @""",""extension"":""jpeg"",""create_time"":" + BaseClass.DateTimeToTimestampMilliseconds( DateTime.Now) + "}"; string refere = "https://mms.pinduoduo.com/material/upload"; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index 0dc779b..f0fd24e 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -30,6 +30,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms { public partial class PDDDBProdUserSelectForm : BaseForm { + /// + /// 拖鞋 + /// + public static string[] slippersCatName { get; set; } = new string[] { "洞洞鞋", "其他凉鞋", "包头拖", "人字拖", "一字拖", "居家鞋", "棉拖鞋", "网面鞋", "居家凉拖", + "沙滩凉鞋", "休闲凉鞋", "凉鞋", "运动拖鞋", "时装凉鞋", "男凉拖", "擦地拖鞋", "亚麻拖鞋", "休闲皮鞋", "T恤", "高帮棉鞋", "罗马凉鞋" }; + /// + /// 运动鞋/休闲鞋 + /// + public static string[] sneakersCatName { get; set; } = new string[] { "运动休闲鞋", "布鞋", "帆布鞋", "单鞋", "板鞋/休闲鞋", "广场舞鞋", "板鞋", "乐福鞋", "健步鞋", + "跑步鞋", "棉鞋", "高帮休闲鞋", "网面鞋", "勃肯鞋/软木鞋", "包头拖", "足部磨砂", "老爹鞋", "工装鞋", "豆豆鞋", "汉服鞋" }; + public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsLoadComplate { get; set; } = false; @@ -1921,17 +1932,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms //"https://img.pddpic.com/mms-goods-image/2025-09-23/7ea07200-05da-45b9-9e9a-fba4d46cfec9.jpeg.a.jpeg", }; - //cat_name - string[] catName = new string[] { "洞洞鞋", "其他凉鞋", "包头拖", "人字拖", "一字拖", "居家鞋", "棉拖鞋", "网面鞋", "居家凉拖", - "沙滩凉鞋", "休闲凉鞋", "凉鞋", "运动拖鞋", "时装凉鞋", "男凉拖", "擦地拖鞋", "亚麻拖鞋", "休闲皮鞋", "T恤", "高帮棉鞋", "罗马凉鞋" }; - string[] catName2 = new string[] { "运动休闲鞋", "布鞋", "帆布鞋", "单鞋", "板鞋/休闲鞋", "广场舞鞋", "板鞋", "乐福鞋", "健步鞋", - "跑步鞋", "棉鞋", "高帮休闲鞋", "网面鞋", "勃肯鞋/软木鞋", "包头拖", "足部磨砂", "老爹鞋", "工装鞋", "豆豆鞋", "汉服鞋" }; string img_type = "鞋（不含拖鞋）"; - if (catName.Contains(dbProd.cat_name) || dbProd.cat_name.Contains("凉鞋") || dbProd.cat_name.Contains("拖鞋")) + if (slippersCatName.Contains(dbProd.cat_name) || dbProd.cat_name.Contains("凉鞋") || dbProd.cat_name.Contains("拖鞋")) { img_type = "拖鞋"; } - else if (catName2.Contains(dbProd.cat_name) || catName2.Contains("鞋")) + else if (sneakersCatName.Contains(dbProd.cat_name) || sneakersCatName.Contains("鞋")) { img_type = "鞋（不含拖鞋）"; } @@ -2905,16 +2911,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms public string UploadProdSkuImg(ShopLoginInfo shop, string img_base64, string goods_id, string goods_commit_id, string chanceTab) { string img_signature = ""; - var img_signature_rst = get_uploag_sku_img_signature(shop, goods_id, goods_commit_id, chanceTab); + var img_signature_rst = get_upload_sku_img_signature(shop, goods_id, goods_commit_id, chanceTab); if (!img_signature_rst.Contains("\"success\":true")) { Thread.Sleep(Randomx.GetId(500, 1000)); - img_signature_rst = get_uploag_sku_img_signature(shop, goods_id.ParseToString(), goods_commit_id, chanceTab); + img_signature_rst = get_upload_sku_img_signature(shop, goods_id.ParseToString(), goods_commit_id, chanceTab); } if (!img_signature_rst.Contains("\"success\":true")) { Thread.Sleep(Randomx.GetId(500, 1000)); - img_signature_rst = get_uploag_sku_img_signature(shop, goods_id.ParseToString(), goods_commit_id, chanceTab); + img_signature_rst = get_upload_sku_img_signature(shop, goods_id.ParseToString(), goods_commit_id, chanceTab); } if (!img_signature_rst.Contains("\"success\":true")) { @@ -3410,7 +3416,7 @@ Content-Disposition: form-data; name=""pic_operations"" return result; } - private string get_uploag_sku_img_signature(ShopLoginInfo shop, string goodsId, string commitId, string chanceTab) + private string get_upload_sku_img_signature(ShopLoginInfo shop, string goodsId, string commitId, string chanceTab) { var anti = shop.AntiContents.LastOrDefault().ParseToString(); if (shop.AntiContents.Count > 0)