1688上传类目转换等优化 充值用户服务充值和用户续费店铺功能

This commit is contained in:
wule committed 2026-05-27 22:01:04 +08:00
1 parent ecb291e3d7
commit aab73b978f
56 files changed
+4532 -1748

No files matched your search

+183 -100
View File
@@ -32,35 +32,37 @@ namespace TemuKJD.WXForms.OrderForms
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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
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();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.chkSkipHasNotesOrder = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.lblOrderCount = new System.Windows.Forms.Label();
this.btnBatchNotes = new DevComponents.DotNetBar.PanelEx();
this.txtFilterPriceNotContainWords = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
@@ -91,6 +93,10 @@ namespace TemuKJD.WXForms.OrderForms
this.chkFilterBeginTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkFilterEndTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.label22 = new System.Windows.Forms.Label();
this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
this.chkTimeDuration = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkHasSend = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkWaitSend = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.label1 = new System.Windows.Forms.Label();
@@ -273,6 +279,8 @@ namespace TemuKJD.WXForms.OrderForms
this.ucGroupBoxEx3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx3.Controls.Add(this.chkSkipHasNotesOrder);
this.ucGroupBoxEx3.Controls.Add(this.lblOrderCount);
this.ucGroupBoxEx3.Controls.Add(this.btnBatchNotes);
this.ucGroupBoxEx3.Controls.Add(this.txtFilterPriceNotContainWords);
this.ucGroupBoxEx3.Controls.Add(this.label21);
@@ -309,13 +317,35 @@ namespace TemuKJD.WXForms.OrderForms
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "订单操作";
//
// chkSkipHasNotesOrder
//
this.chkSkipHasNotesOrder.AutoSize = true;
this.chkSkipHasNotesOrder.Checked = true;
this.chkSkipHasNotesOrder.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSkipHasNotesOrder.Location = new System.Drawing.Point(287, 129);
this.chkSkipHasNotesOrder.Name = "chkSkipHasNotesOrder";
this.chkSkipHasNotesOrder.Size = new System.Drawing.Size(111, 21);
this.chkSkipHasNotesOrder.TabIndex = 1172;
this.chkSkipHasNotesOrder.Text = "跳过已备注订单";
this.chkSkipHasNotesOrder.UseVisualStyleBackColor = true;
//
// lblOrderCount
//
this.lblOrderCount.AutoSize = true;
this.lblOrderCount.Location = new System.Drawing.Point(31, 130);
this.lblOrderCount.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.lblOrderCount.Name = "lblOrderCount";
this.lblOrderCount.Size = new System.Drawing.Size(115, 17);
this.lblOrderCount.TabIndex = 1146;
this.lblOrderCount.Text = "当前展示订单:0 条";
//
// btnBatchNotes
//
this.btnBatchNotes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnBatchNotes.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnBatchNotes.DisabledBackColor = System.Drawing.Color.Empty;
this.btnBatchNotes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchNotes.Location = new System.Drawing.Point(420, 129);
this.btnBatchNotes.Location = new System.Drawing.Point(195, 127);
this.btnBatchNotes.Name = "btnBatchNotes";
this.btnBatchNotes.Size = new System.Drawing.Size(84, 23);
this.btnBatchNotes.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -357,7 +387,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnStopBatchOnlieWaybill.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStopBatchOnlieWaybill.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStopBatchOnlieWaybill.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStopBatchOnlieWaybill.Location = new System.Drawing.Point(213, 129);
this.btnStopBatchOnlieWaybill.Location = new System.Drawing.Point(621, 127);
this.btnStopBatchOnlieWaybill.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStopBatchOnlieWaybill.Name = "btnStopBatchOnlieWaybill";
this.btnStopBatchOnlieWaybill.Size = new System.Drawing.Size(85, 23);
@@ -384,7 +414,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnBatchOnlieWaybill.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnBatchOnlieWaybill.DisabledBackColor = System.Drawing.Color.Empty;
this.btnBatchOnlieWaybill.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchOnlieWaybill.Location = new System.Drawing.Point(124, 129);
this.btnBatchOnlieWaybill.Location = new System.Drawing.Point(532, 127);
this.btnBatchOnlieWaybill.Name = "btnBatchOnlieWaybill";
this.btnBatchOnlieWaybill.Size = new System.Drawing.Size(84, 23);
this.btnBatchOnlieWaybill.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -409,7 +439,7 @@ namespace TemuKJD.WXForms.OrderForms
this.btnRefreshPrintId.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshPrintId.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshPrintId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshPrintId.Location = new System.Drawing.Point(34, 129);
this.btnRefreshPrintId.Location = new System.Drawing.Point(442, 127);
this.btnRefreshPrintId.Name = "btnRefreshPrintId";
this.btnRefreshPrintId.Size = new System.Drawing.Size(84, 23);
this.btnRefreshPrintId.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -725,6 +755,10 @@ namespace TemuKJD.WXForms.OrderForms
| 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.label22);
this.ucGroupBoxEx4.Controls.Add(this.dtpEndTime);
this.ucGroupBoxEx4.Controls.Add(this.dtpStartTime);
this.ucGroupBoxEx4.Controls.Add(this.chkTimeDuration);
this.ucGroupBoxEx4.Controls.Add(this.chkHasSend);
this.ucGroupBoxEx4.Controls.Add(this.chkWaitSend);
this.ucGroupBoxEx4.Controls.Add(this.label1);
@@ -738,6 +772,46 @@ namespace TemuKJD.WXForms.OrderForms
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "商品流量查询";
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(30, 95);
this.label22.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(56, 17);
this.label22.TabIndex = 985;
this.label22.Text = "结束时间";
//
// dtpEndTime
//
this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm";
this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpEndTime.Location = new System.Drawing.Point(86, 92);
this.dtpEndTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(178, 23);
this.dtpEndTime.TabIndex = 984;
//
// dtpStartTime
//
this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm";
this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpStartTime.Location = new System.Drawing.Point(86, 63);
this.dtpStartTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(178, 23);
this.dtpStartTime.TabIndex = 982;
//
// chkTimeDuration
//
this.chkTimeDuration.AutoSize = true;
this.chkTimeDuration.Location = new System.Drawing.Point(16, 64);
this.chkTimeDuration.Name = "chkTimeDuration";
this.chkTimeDuration.Size = new System.Drawing.Size(75, 21);
this.chkTimeDuration.TabIndex = 983;
this.chkTimeDuration.Text = "开始时间";
this.chkTimeDuration.UseVisualStyleBackColor = true;
//
// chkHasSend
//
this.chkHasSend.AutoSize = true;
@@ -1194,19 +1268,19 @@ namespace TemuKJD.WXForms.OrderForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle28.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle28;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1838,19 +1912,19 @@ namespace TemuKJD.WXForms.OrderForms
//
this.dgvOrder.AllowUserToAddRows = false;
this.dgvOrder.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle30.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle30;
this.dgvOrder.AutoRowNumber = true;
this.dgvOrder.BackgroundColor = System.Drawing.Color.White;
this.dgvOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
this.dgvOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1906,6 +1980,9 @@ namespace TemuKJD.WXForms.OrderForms
this.dgvOrder.Size = new System.Drawing.Size(1326, 442);
this.dgvOrder.TabIndex = 187;
this.dgvOrder.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
this.dgvOrder.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvOrder_CellDoubleClick);
this.dgvOrder.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvOrder_RowsAdded);
this.dgvOrder.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.dgvOrder_RowsRemoved);
//
// colCheck
//
@@ -1927,8 +2004,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colSupplierName
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle32;
this.colSupplierName.Frozen = true;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
@@ -1989,8 +2066,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOrderTime
//
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOrderTime.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOrderTime.DefaultCellStyle = dataGridViewCellStyle33;
this.colOrderTime.HeaderText = "时间";
this.colOrderTime.Name = "colOrderTime";
this.colOrderTime.ReadOnly = true;
@@ -2013,8 +2090,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colProdInfo
//
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle34;
this.colProdInfo.HeaderText = "商品信息";
this.colProdInfo.Name = "colProdInfo";
this.colProdInfo.ReadOnly = true;
@@ -2032,8 +2109,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colProductName
//
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle35;
this.colProductName.HeaderText = "商品名称";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -2057,8 +2134,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colSkuSpec
//
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuSpec.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuSpec.DefaultCellStyle = dataGridViewCellStyle36;
this.colSkuSpec.HeaderText = "Sku规格";
this.colSkuSpec.Name = "colSkuSpec";
this.colSkuSpec.ReadOnly = true;
@@ -2066,8 +2143,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colSkuCode
//
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuCode.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuCode.DefaultCellStyle = dataGridViewCellStyle37;
this.colSkuCode.HeaderText = "Sku货号";
this.colSkuCode.Name = "colSkuCode";
this.colSkuCode.ReadOnly = true;
@@ -2076,8 +2153,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colCode
//
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCode.DefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCode.DefaultCellStyle = dataGridViewCellStyle38;
this.colCode.HeaderText = "货号信息";
this.colCode.Name = "colCode";
this.colCode.ReadOnly = true;
@@ -2100,9 +2177,9 @@ namespace TemuKJD.WXForms.OrderForms
//
// colPriceCnt
//
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colPriceCnt.DefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colPriceCnt.DefaultCellStyle = dataGridViewCellStyle39;
this.colPriceCnt.HeaderText = "价/量";
this.colPriceCnt.Name = "colPriceCnt";
this.colPriceCnt.ReadOnly = true;
@@ -2110,9 +2187,9 @@ namespace TemuKJD.WXForms.OrderForms
//
// colTotalPrice
//
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colTotalPrice.DefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colTotalPrice.DefaultCellStyle = dataGridViewCellStyle40;
this.colTotalPrice.HeaderText = "合计";
this.colTotalPrice.Name = "colTotalPrice";
this.colTotalPrice.ReadOnly = true;
@@ -2120,8 +2197,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colDiscount
//
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colDiscount.DefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colDiscount.DefaultCellStyle = dataGridViewCellStyle41;
this.colDiscount.HeaderText = "优惠";
this.colDiscount.Name = "colDiscount";
this.colDiscount.ReadOnly = true;
@@ -2130,9 +2207,9 @@ namespace TemuKJD.WXForms.OrderForms
//
// colCurrentPrice
//
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCurrentPrice.DefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCurrentPrice.DefaultCellStyle = dataGridViewCellStyle42;
this.colCurrentPrice.HeaderText = "当前价";
this.colCurrentPrice.Name = "colCurrentPrice";
this.colCurrentPrice.ReadOnly = true;
@@ -2140,8 +2217,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colCurrentStock
//
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colCurrentStock.DefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colCurrentStock.DefaultCellStyle = dataGridViewCellStyle43;
this.colCurrentStock.HeaderText = "现库存";
this.colCurrentStock.Name = "colCurrentStock";
this.colCurrentStock.ReadOnly = true;
@@ -2149,8 +2226,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colSendGift
//
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colSendGift.DefaultCellStyle = dataGridViewCellStyle17;
dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colSendGift.DefaultCellStyle = dataGridViewCellStyle44;
this.colSendGift.HeaderText = "礼";
this.colSendGift.Name = "colSendGift";
this.colSendGift.ReadOnly = true;
@@ -2173,8 +2250,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOrderStatus
//
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOrderStatus.DefaultCellStyle = dataGridViewCellStyle18;
dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOrderStatus.DefaultCellStyle = dataGridViewCellStyle45;
this.colOrderStatus.HeaderText = "状态";
this.colOrderStatus.Name = "colOrderStatus";
this.colOrderStatus.ReadOnly = true;
@@ -2182,8 +2259,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colUpdateStatus
//
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colUpdateStatus.DefaultCellStyle = dataGridViewCellStyle19;
dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colUpdateStatus.DefaultCellStyle = dataGridViewCellStyle46;
this.colUpdateStatus.HeaderText = "刷新";
this.colUpdateStatus.Name = "colUpdateStatus";
this.colUpdateStatus.ReadOnly = true;
@@ -2193,8 +2270,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colBuyUrl
//
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle20;
dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle47;
this.colBuyUrl.HeaderText = "采购地址";
this.colBuyUrl.Name = "colBuyUrl";
this.colBuyUrl.ReadOnly = true;
@@ -2210,8 +2287,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colReceiveInfo
//
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle21;
dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle48;
this.colReceiveInfo.HeaderText = "收货信息";
this.colReceiveInfo.Name = "colReceiveInfo";
this.colReceiveInfo.ReadOnly = true;
@@ -2219,8 +2296,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colDecrypt
//
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle22;
dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle49;
this.colDecrypt.HeaderText = "👁";
this.colDecrypt.Name = "colDecrypt";
this.colDecrypt.ReadOnly = true;
@@ -2230,8 +2307,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colAddReceiveInfo
//
dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle23;
dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle50;
this.colAddReceiveInfo.HeaderText = "填";
this.colAddReceiveInfo.Name = "colAddReceiveInfo";
this.colAddReceiveInfo.ReadOnly = true;
@@ -2252,8 +2329,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOnlineWaybill
//
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle24;
dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle51;
this.colOnlineWaybill.HeaderText = "打印";
this.colOnlineWaybill.Name = "colOnlineWaybill";
this.colOnlineWaybill.ReadOnly = true;
@@ -2263,8 +2340,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colNotes
//
dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colNotes.DefaultCellStyle = dataGridViewCellStyle25;
dataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colNotes.DefaultCellStyle = dataGridViewCellStyle52;
this.colNotes.HeaderText = "备注";
this.colNotes.Name = "colNotes";
this.colNotes.ReadOnly = true;
@@ -2279,8 +2356,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colEditNotes
//
dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle26;
dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle53;
this.colEditNotes.HeaderText = "修改";
this.colEditNotes.Name = "colEditNotes";
this.colEditNotes.ReadOnly = true;
@@ -2288,8 +2365,8 @@ namespace TemuKJD.WXForms.OrderForms
//
// colOpResult
//
dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOpResult.DefaultCellStyle = dataGridViewCellStyle27;
dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colOpResult.DefaultCellStyle = dataGridViewCellStyle54;
this.colOpResult.HeaderText = "操作结果";
this.colOpResult.Name = "colOpResult";
this.colOpResult.ReadOnly = true;
@@ -2582,5 +2659,11 @@ namespace TemuKJD.WXForms.OrderForms
private System.Windows.Forms.DataGridViewLinkColumn colEditNotes;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
private DevComponents.DotNetBar.PanelEx btnBatchNotes;
private System.Windows.Forms.Label lblOrderCount;
private UserComponent.UcCheckBox chkSkipHasNotesOrder;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.DateTimePicker dtpEndTime;
private System.Windows.Forms.DateTimePicker dtpStartTime;
private UserComponent.UcCheckBox chkTimeDuration;
}
}
+282 -89
View File
@@ -36,6 +36,7 @@ using TemuKJD.Helper;
using NaiBa.CefHelper.Handler;
using CefSharp;
using TemuKJD.WXForms.ProductForms;
using CefSharp.WinForms;
namespace TemuKJD.WXForms.OrderForms
{
@@ -61,6 +62,8 @@ namespace TemuKJD.WXForms.OrderForms
private void UserSelectDbProductForm_Load(object sender, EventArgs e)
{
btnClearFilter_Click(null, null);
dgvOrder.AddMergeColumn(new List<string>() { "colOrderStatus" , "colUpdateStatus" });
dgvOrder.AddMergeColumnHeader(new List<string>() { "colOrderStatus" , "colUpdateStatus" }, "订单状态");
@@ -203,7 +206,7 @@ namespace TemuKJD.WXForms.OrderForms
{
if (shopEntity == null)
return;
if (shopEntity.is_shop_expire)
if (shopEntity.is_point_shop_expire)
return;
if (selectShopId == null)
selectShopId = new List<string>();
@@ -347,6 +350,38 @@ namespace TemuKJD.WXForms.OrderForms
}
}
private void dgvOrder_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string headerText = dgvOrder.Columns[e.ColumnIndex].HeaderText;
var shopId = dgvOrder.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
var spuId = dgvOrder.Rows[e.RowIndex].Cells["colSpuId"].Value.ParseToString();
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
var row = dgvOrder.Rows[e.RowIndex];
var cell = row.Cells[e.ColumnIndex];
var orderId = row.Cells["colOrderId"].Value.ParseToString();
switch (headerText)
{
case "采购地址":
string buyUrl = row.Cells["colBuyUrl"].Value.ParseToString();
if (!string.IsNullOrEmpty(buyUrl))
{
Clipboard.SetText(buyUrl);
statusBar.lblTaskStatus.Text = "店铺 " + shop.ShopAccount + " 订单 " + orderId + " 采购地址复制成功";
}
break;
case "收货信息":
string receiveInfo = row.Cells["colReceiveInfo"].Value.ParseToString();
if (!string.IsNullOrEmpty(receiveInfo))
{
Clipboard.SetText(row.Cells["colReceiveInfo"].Value.ParseToString());
statusBar.lblTaskStatus.Text = "店铺 " + shop.ShopAccount + " 订单 " + orderId + " 收货信息复制成功";
}
break;
}
}
private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
@@ -602,55 +637,7 @@ namespace TemuKJD.WXForms.OrderForms
return;
}
var deRst = "测试地址写入{\"code\"0}";
deRst = WXOrderList.decryptOrder(shop, orderId);
if (deRst.Contains("\"code\":0"))
{
var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + shop.ShopId;
data += "&order_id=" + orderId;
data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
var html = GetHtml.PostUtf8(url, data);
if (!html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOpResult"].Value = errMsg;
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
}
BaseMsgForm.ShowError("查看地址成功但保存到服务端失败:" + errMsg);
}));
}
else
{
Invoke(new Action(() =>
{
foreach(var rw in rows)
{
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
rw.Cells["colOpResult"].Value = "查看地址成功";
}
}));
}
}
else
{
var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
Invoke(new Action(() =>
{
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
BaseMsgForm.ShowError("查看地址失败:" + error);
}));
}
//Invoke(new Action(() => { cell.Value = "👁"; }));
ShowOrderAddress(shop, orderId, row);
Invoke(new Action(() => { pbLoading.Visible = false; }));
});
}
@@ -686,6 +673,18 @@ namespace TemuKJD.WXForms.OrderForms
Task.Run(() =>
{
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
if (!row.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
{
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOpResult"].Value = "已获取地址,请勿重复打印";
}
}));
return;
}
var currentStatus = UpdateOrderStatus(shop, orderId);
Invoke(new Action(() =>
{
@@ -699,7 +698,26 @@ namespace TemuKJD.WXForms.OrderForms
BaseMsgForm.ShowError("订单状态已变化,请勿拍单");
return;
}
if (row.Cells["colDecrypt"].Value.ParseToString() != "❌")
{
ShowOrderAddress(shop, orderId, row, false);
}
if (!row.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
{
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOpResult"].Value = "已获取地址,请勿重复打印";
}
}));
return;
}
GetOnlineWayBill(shop, row);
});
}
break;
@@ -735,14 +753,90 @@ namespace TemuKJD.WXForms.OrderForms
}
}
void ShowOrderAddress(ShopLoginInfo shop, string orderId, DataGridViewRow row, bool ShowErrorDialog = true)
{
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
var deRst = "测试地址写入{\"code\"0}";
deRst = WXOrderList.decryptOrder(shop, orderId);
if (deRst.Contains("\"code\":0"))
{
var url = BaseClass.BuildObjString("shop/wx_add_mdy_order_address");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + shop.ShopId;
data += "&order_id=" + orderId;
data += "&order_address=" + GetHtml.UrlEncodeUtf8(deRst);
var html = GetHtml.PostUtf8(url, data);
if (!html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colOpResult"].Value = errMsg;
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
}
if (ShowErrorDialog)
BaseMsgForm.ShowError("查看地址成功但保存到服务端失败:" + errMsg);
}));
}
else
{
Invoke(new Action(() =>
{
foreach (var rw in rows)
{
rw.Cells["colReceiveInfo"].Value = GetDecryptOrder(deRst);
rw.Cells["colReceiveInfo"].Style.ForeColor = DefaultForeColor;
rw.Cells["colOpResult"].Value = "查看地址成功";
}
}));
}
}
else
{
var error = BaseRegex.GetStringJsonByRegs(ref deRst, deRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg");
if (error.Contains("\"code\":17899002") || error.Contains("\"code\":10020123"))
{
if (error.Contains("\"code\":17899002"))
error = "基于用户隐私保护,无法查看收货信息";
if (error.Contains("\"code\":10020123"))
error = "今日查看次数已用完";
Invoke(new Action(() =>
{
foreach (var rw in dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId).ToList())
{
rw.Cells["colDecrypt"].Value = "❌";
if (rw.Cells["colReceiveInfo"].Value.ParseToString().Contains("未查看地址"))
rw.Cells["colOpResult"].Value = "查看地址失败:" + error;
}
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
if (ShowErrorDialog)
BaseMsgForm.ShowError("查看地址失败:" + error);
}));
}
else
{
Invoke(new Action(() =>
{
row.Cells["colOpResult"].Value = "查看地址失败:" + error;
if (ShowErrorDialog)
BaseMsgForm.ShowError("查看地址失败:" + error);
}));
}
}
//Invoke(new Action(() => { cell.Value = "👁"; }));
}
void GetOnlineWayBill(ShopLoginInfo shop, DataGridViewRow row)
{
var orderId = row.Cells["colOrderId"].Value.ParseToString();
//Task.Run(() =>
//{
while (isOnlineWayBill)
Thread.Sleep(150);
for (int i = 0; i < 50 && isOnlineWayBill; i++)
Thread.Sleep(200);
Invoke(new Action(() => { pbLoading.Visible = true; }));
isOnlineWayBill = true;
@@ -900,36 +994,44 @@ namespace TemuKJD.WXForms.OrderForms
}
}
WXShopLoginForm form = null;
Invoke(new Action(() =>
{
if (shop.Chat == null)
{
shop.Chat = CEFBrowser.CreateChromiumWebBrowser("https://store.weixin.qq.com/shop/waybill/allToAll", false);
CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
shop.Chat.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
shop.Chat.LifeSpanHandler = lifeSapnHandler;
shop.Chat.KeyboardHandler = new KeyboardHandler();
shop.Chat.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
shop.Chat.AddressChanged += CefWebBrowser_AddressChanged;
shop.Chat.LoadError += CefWebBrowser_LoadError;
shop.Chat.Dock = DockStyle.Fill;
MainForm.instance.cefPanel.Controls.Add(shop.Chat);
}
//if (shop.Chat == null)
//{
// shop.Chat = CEFBrowser.CreateChromiumWebBrowser("https://store.weixin.qq.com/shop/waybill/allToAll", false);
// CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
// resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
// resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
// shop.Chat.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
// var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
// shop.Chat.LifeSpanHandler = lifeSapnHandler;
// shop.Chat.KeyboardHandler = new KeyboardHandler();
// shop.Chat.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
// shop.Chat.AddressChanged += CefWebBrowser_AddressChanged;
// shop.Chat.LoadError += CefWebBrowser_LoadError;
// shop.Chat.Dock = DockStyle.Fill;
// MainForm.instance.cefPanel.Controls.Add(shop.Chat);
//}
//shop.Chat.SendToBack();
form = new WXShopLoginForm(shop);
form.openType = EnumOpenType.manage;
form.InitUrl = "https://store.weixin.qq.com/shop/waybill/allToAll";
form.TopLevel = false;
MainForm.instance.cefPanel.Controls.Add(form);
form.Show();
shop.Chat.SendToBack();
//MainForm.instance.cefPanel.BringToFront();
MainForm.instance.cefPanel.SendToBack();
MainForm.instance.cefPanel.Visible = true;
}));
while (!shop.Chat.IsBrowserInitialized)
while (form.cefWebBrowser == null || !form.cefWebBrowser.IsBrowserInitialized)
Thread.Sleep(100);
CEFBrowser.DeleteCookie(shop.Chat.GetCookieManager(null));
CEFBrowser.DeleteCookie(form.cefWebBrowser.GetCookieManager(null));
var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(shop.Cookies);
var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), shop.Chat.GetCookieManager(null));
shop.Chat.Load("https://store.weixin.qq.com/shop/waybill/allToAll");
var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), form.cefWebBrowser.GetCookieManager(null));
form.cefWebBrowser.Load("https://store.weixin.qq.com/shop/waybill/allToAll");
var jsStr = @"(function() {
const element = document.getElementsByName('waybill')[0];
@@ -951,7 +1053,7 @@ namespace TemuKJD.WXForms.OrderForms
for (int i = 0; i < 10; i++)
{
Thread.Sleep(250);
var client = shop.Chat.GetDevToolsClient();
var client = form.cefWebBrowser.GetDevToolsClient();
if (client != null)
{
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
@@ -985,7 +1087,7 @@ namespace TemuKJD.WXForms.OrderForms
for (int i = 0; i < 10; i++)
{
Thread.Sleep(250);
var client = shop.Chat.GetDevToolsClient();
var client = form.cefWebBrowser.GetDevToolsClient();
if (client != null)
{
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
@@ -1020,7 +1122,7 @@ namespace TemuKJD.WXForms.OrderForms
for (int i = 0; i < 5; i++)
{
Thread.Sleep(500);
var client = shop.Chat.GetDevToolsClient();
var client = form.cefWebBrowser.GetDevToolsClient();
if (client != null)
{
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
@@ -1057,7 +1159,7 @@ namespace TemuKJD.WXForms.OrderForms
for (int i = 0; i < 5; i++)
{
Thread.Sleep(500);
var client = shop.Chat.GetDevToolsClient();
var client = form.cefWebBrowser.GetDevToolsClient();
if (client != null)
{
var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
@@ -1075,9 +1177,11 @@ namespace TemuKJD.WXForms.OrderForms
isOnlineWayBill = false;
//#endif
Invoke(new Action(() => { pbLoading.Visible = false; }));
//});
Invoke(new Action(() =>
{
form.Close();
pbLoading.Visible = false;
}));
}
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
@@ -1204,7 +1308,15 @@ namespace TemuKJD.WXForms.OrderForms
// 查找订单
pageSize = 30;
var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize);
long? startTime = null;
long? endTime = null;
if (chkTimeDuration.Checked)
Invoke(new Action(() =>
{
startTime = BaseClass.DateTimeToTimestampMilliseconds(dtpStartTime.Value);
endTime = BaseClass.DateTimeToTimestampMilliseconds(dtpEndTime.Value);
}));
var result = WXOrderList.orderListSearch(shop, orderStatus, page, pageSize, startTime, endTime);
if (!result.Contains("\"code\":0"))
{
ShowShopError(shop, result);
@@ -1389,7 +1501,7 @@ namespace TemuKJD.WXForms.OrderForms
"", // 在线寄件打印单号
order.expressData?.type == 3 && order.expressData?.status != 1 ? order.expressData?.jumpPath?.Substring((order.expressData?.jumpPath).ParseToString().IndexOf("ewaybillOrderId=")).Replace("ewaybillOrderId=", "") : "",
order.expressData?.type == 3 && order.expressData?.status != 1 ? "再次\r\n打印" : "打印",
order.expressData?.type == 3 && order.expressData?.status != 1 ? "再次\r\n打印" : "打印",
order.flagInfo.flagNotes, // 卖家备注
order.flagInfo.flagColor, // 卖家备注颜色
@@ -1468,6 +1580,9 @@ namespace TemuKJD.WXForms.OrderForms
{
chkHasSend.Checked = true;
chkWaitSend.Checked = true;
chkTimeDuration.Checked = false;
dtpStartTime.Value = DateTime.Now.Date;
dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
}
private void btnFilterShop_Click(object sender, EventArgs e)
@@ -1688,20 +1803,49 @@ namespace TemuKJD.WXForms.OrderForms
private void btnNotesOK_Click(object sender, EventArgs e)
{
var orderIds = lblOrderId.Text.Split(';');
var orderIdStr = lblOrderId.Text;
if (cancellationTokenSource != null)
cancellationTokenSource.Cancel();
cancellationTokenSource = new CancellationTokenSource();
Task.Run(() =>
{
int index = 0;
foreach (var orderId in orderIds)
{
index++;
if (orderIdStr.Contains(";"))
Invoke(new Action(() =>
{
this.statusBar.lblTaskStatus.Text = "正在修改备注 " + index + "/" + orderIds.Length;
}));
if (cancellationTokenSource.IsCancellationRequested)
break;
var notes = txtNotes.Text.Trim();
var tagColor = lblColorTag.Text.ParseToInt();
var rows = dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colOrderId"].Value.ParseToString() == orderId).ToList();
if (rows.Count == 0)
continue;
// 批量备注跳过已备注内容
if (chkSkipHasNotesOrder.Checked && orderIdStr.Contains(";") && !rows[0].Cells["colNotes"].Value.ParseToString().IsNullOrEmpty())
{
continue;
}
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == rows[0].Cells["colSupplierId"].Value.ParseToString());
if (shop != null)
{
var notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
{
if (notesRst.Contains("请求超过频率限制"))
{
Thread.Sleep(8000);
notesRst = WXOrderList.addNotes(shop, orderId, notes, tagColor);
}
}
Thread.Sleep(Randomx.GetId(300, 500));
if (notesRst.Contains("\"code\":0"))
{
Invoke(new Action(() =>
@@ -1727,15 +1871,21 @@ namespace TemuKJD.WXForms.OrderForms
}
else
{
ShowShopError(shop, notesRst, true);
foreach (var row in rows)
{
var err = BaseRegex.GetStringJsonByRegs(ref notesRst, notesRst, "msg", "errMsg", "err_msg", "errorMsg", "error_msg");
row.Cells["colOpResult"].Value = "修改备注失败 " + err;
}
}
}
}
Invoke(new Action(() =>
{
pnlUpdateNotes.Visible = false;
if (orderIdStr.Contains(";"))
this.statusBar.lblTaskStatus.Text = "备注已修改" + index + "/" + orderIds.Length;
}));
});
}, cancellationTokenSource.Token);
}
private void btnEditReceiveInfoCancel_Click(object sender, EventArgs e)
@@ -1955,6 +2105,7 @@ namespace TemuKJD.WXForms.OrderForms
row.Visible = true;
}
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
}
private void btnRestore_Click(object sender, EventArgs e)
@@ -1981,6 +2132,7 @@ namespace TemuKJD.WXForms.OrderForms
{
ShowRefreshPrintId(row);
}
BaseMsgForm.ShowInfo("已刷新");
}
void GetRefreshPrintId()
@@ -2056,6 +2208,7 @@ namespace TemuKJD.WXForms.OrderForms
continue;
}
Thread.Sleep(6000);
GetOnlineWayBill(shop, row);
}
}
@@ -2108,6 +2261,25 @@ namespace TemuKJD.WXForms.OrderForms
ShowShopError(shop, rst);
return "获取\r\n失败";
}
try
{
// 更新备注信息
var jArr = JsonHelper.JObjectParse(rst)["orderList"];
var orderLst = JsonHelper.DeserializeJsonToList<WxOrderInfoLite>(JsonHelper.SerializeObject(jArr));
var row = dgvOrder.Rows.Cast<DataGridViewRow>().ToList().FirstOrDefault(r => r.Cells["colOrderId"].Value.ParseToString() == orderId);
if (row != null)
{
row.Cells["colNotes"].Value = BaseRegex.GetStringJson(ref rst, "flagNotes").ParseToString();
row.Cells["colNotesColor"].Value = BaseRegex.GetStringJson(ref rst, "flagColor").ParseToInt();
ShowDgvRow(row, orderLst.FirstOrDefault());
}
}
catch (Exception ex)
{
ShowShopError(shop, ex.Message);
}
var statusStr = BaseRegex.GetStringJson(ref rst, "statusStr");
if (string.IsNullOrEmpty(statusStr))
statusStr = "不存在";
@@ -2145,6 +2317,16 @@ namespace TemuKJD.WXForms.OrderForms
ucCheckBox4.Checked = lblColorTag.Text == "3";
ucCheckBox5.Checked = lblColorTag.Text == "4";
}
private void dgvOrder_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
{
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
}
private void dgvOrder_RowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e)
{
this.lblOrderCount.Text = "当前展示订单:" + this.dgvOrder.Rows.Cast<DataGridViewRow>().Where(r => r.Visible == true).Count().ToString() + " 条";
}
}
public class WXOrderList
@@ -2155,16 +2337,27 @@ namespace TemuKJD.WXForms.OrderForms
/// <param name="shop"></param>
/// <param name="orderStatus">订单状态 20待发货 30已发货</param>
/// <returns></returns>
public static string orderListSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30)
public static string orderListSearch(ShopLoginInfo shop, int orderStatus = 20, int pageNum = 1, int pageSize = 30, long? timeStart = null, long? timeEnd = null)
{
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";
string body = @"{""isSearch"":false,""pageSize"":" + pageSize +
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":" + 1 +
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1" +
@",""onAftersaleOrderExist"":0,""orderStatus"":" + orderStatus + @"}";
if (pageNum > 1)
body = @"{""isSearch"":false,""pageSize"":" + pageSize +
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":" + 1 +
@",""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1" +
@",""onAftersaleOrderExist"":0,""orderStatus"":" + orderStatus + @",""page"":" + pageNum + @"}";
//@"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[1777564800000,1779379200000]},""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",""merchantNotes"":"""",""merchantNotesTagColor"":0,""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":1,""overTime"":0,""pengingShipOneDay"":0,""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,""orderStatus"":30,""startCreateTime"":1777564800000,""endCreateTime"":1779379200000}";
if (timeStart != null && timeEnd != null)
body = @"{""isSearch"":true,""pageSize"":30,""orderId"":"""",""orderTime"":{""type"":0,""time"":[" + timeStart + @"," + timeEnd + @"]},
""telNumber"":"""",""title"":"""",""receiverName"":"""",""finderNickName"":"""",""merchantNotes"":"""",""merchantNotesTagColor"":0,
""waybillId"":"""",""productCode"":"""",""inspectStatus"":"""",""finderWay"":0,""searchOrderType"":0,""payMethod"":0,""orderChannel"":0,
""bulkbuyActivityId"":"""",""deliveryNegotiationFlag"":0,""transactionId"":"""",""page"":" + pageNum + @",""overTime"":0,""pengingShipOneDay"":0,
""pengingShipSixHour"":0,""expediteDelivery"":0,""stockoutPunishAlert"":0,""waybillStatus"":0,""pageNum"":1,""onAftersaleOrderExist"":0,
""orderStatus"":" + orderStatus + @",""startCreateTime"":" + timeStart + @",""endCreateTime"":" + timeEnd + @"}";
string refere = "https://store.weixin.qq.com/shop/order/list";
var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere);
return result;