From 09769d8d481079655eb7c99cc3efafb5f70153f1 Mon Sep 17 00:00:00 2001 From: chfei Date: Wed, 4 Nov 2026 17:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E9=93=BA=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9=E6=9C=80=E4=BD=8E=E6=8A=BD=E4=BD=A3=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=82=20=E7=89=B9=E6=AE=8A=E8=B4=A6=E5=8F=B7=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E7=BC=96=E8=BE=9110=E5=85=83=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/Model/Result/ShopLoginInfo.cs | 5 +- .../AdminForms/WXAdminAccountForm.Designer.cs | 139 +++-- .../WXForms/AdminForms/WXAdminAccountForm.cs | 11 +- .../ShopForms/WXOemAccountForm.Designer.cs | 510 +++++++++--------- TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs | 17 +- 5 files changed, 373 insertions(+), 309 deletions(-) diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs index 7cb8279..21f3a91 100644 --- a/AllBase/Model/Result/ShopLoginInfo.cs +++ b/AllBase/Model/Result/ShopLoginInfo.cs @@ -336,7 +336,10 @@ namespace AllBase.Model.Result public string forbidden_page { get; set; } public string oem_id { get; set; } public string oem_name { get; set; } - } + + + public decimal shop_renewal_platform_floor_fee { get; set; } = 15m; + } public class UserSubAccountInfo : UserAccountInfo { diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index add5817..b7b8942 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -147,8 +147,6 @@ namespace TemuKJD.WXForms.AdminForms this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx(); this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -180,6 +178,10 @@ namespace TemuKJD.WXForms.AdminForms this.colAddShop = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); + this.num_shop_renewal_platform_floor_fee = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -211,6 +213,7 @@ namespace TemuKJD.WXForms.AdminForms this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvUser)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.num_shop_renewal_platform_floor_fee)).BeginInit(); this.SuspendLayout(); // // splitContainer5 @@ -841,7 +844,7 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // - // pnlSyncLogisticsPerOrderr + // pnlSyncLogisticsPerOrder // this.pnlSyncLogisticsPerOrder.AccessibleDescription = ""; this.pnlSyncLogisticsPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -850,7 +853,7 @@ namespace TemuKJD.WXForms.AdminForms this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserInfo); this.pnlSyncLogisticsPerOrder.Controls.Add(this.panel8); this.pnlSyncLogisticsPerOrder.Location = new System.Drawing.Point(40, 389); - this.pnlSyncLogisticsPerOrder.Name = "pnlSyncLogisticsPerOrderr"; + this.pnlSyncLogisticsPerOrder.Name = "pnlSyncLogisticsPerOrder"; this.pnlSyncLogisticsPerOrder.Size = new System.Drawing.Size(360, 146); this.pnlSyncLogisticsPerOrder.TabIndex = 458; this.pnlSyncLogisticsPerOrder.Visible = false; @@ -1500,13 +1503,15 @@ namespace TemuKJD.WXForms.AdminForms // this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.panel3.Controls.Add(this.num_shop_renewal_platform_floor_fee); + this.panel3.Controls.Add(this.label17); this.panel3.Controls.Add(this.numShopPointsPerMonth); this.panel3.Controls.Add(this.label11); this.panel3.Controls.Add(this.btnShopPointsPerMonthCancel); this.panel3.Controls.Add(this.btnShopPointsPerMonth); - this.panel3.Location = new System.Drawing.Point(23, 52); + this.panel3.Location = new System.Drawing.Point(23, 39); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(310, 57); + this.panel3.Size = new System.Drawing.Size(310, 95); this.panel3.TabIndex = 454; // // numShopPointsPerMonth @@ -1518,7 +1523,7 @@ namespace TemuKJD.WXForms.AdminForms 0, 0}); this.numShopPointsPerMonth.Minimum = new decimal(new int[] { - 30, + 10, 0, 0, 0}); @@ -1545,7 +1550,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnShopPointsPerMonthCancel.CanvasColor = System.Drawing.SystemColors.Control; this.btnShopPointsPerMonthCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnShopPointsPerMonthCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnShopPointsPerMonthCancel.Location = new System.Drawing.Point(244, 16); + this.btnShopPointsPerMonthCancel.Location = new System.Drawing.Point(246, 32); this.btnShopPointsPerMonthCancel.Name = "btnShopPointsPerMonthCancel"; this.btnShopPointsPerMonthCancel.Size = new System.Drawing.Size(56, 23); this.btnShopPointsPerMonthCancel.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1570,7 +1575,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnShopPointsPerMonth.Cursor = System.Windows.Forms.Cursors.Hand; this.btnShopPointsPerMonth.DisabledBackColor = System.Drawing.Color.Empty; this.btnShopPointsPerMonth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnShopPointsPerMonth.Location = new System.Drawing.Point(185, 16); + this.btnShopPointsPerMonth.Location = new System.Drawing.Point(187, 32); this.btnShopPointsPerMonth.Name = "btnShopPointsPerMonth"; this.btnShopPointsPerMonth.Size = new System.Drawing.Size(56, 23); this.btnShopPointsPerMonth.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1791,47 +1796,6 @@ namespace TemuKJD.WXForms.AdminForms this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.IsShowTotalCount = false; - this.ucSplitPage1.Location = new System.Drawing.Point(783, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.MaxPageSizeValue = 5000; - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(389, 27); - this.ucSplitPage1.TabIndex = 443; - this.ucSplitPage1.TotalCount = ((long)(0)); - this.ucSplitPage1.TotalPage = 1; - // - // btnExportShopErp - // - this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); - this.btnExportShopErp.Name = "btnExportShopErp"; - this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); - this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnExportShopErp.Style.GradientAngle = 90; - this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.TabIndex = 439; - this.btnExportShopErp.Text = "导出用户到后台系统"; - this.btnExportShopErp.Visible = false; - this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); - // // colCheck // this.colCheck.FillWeight = 30F; @@ -2054,6 +2018,78 @@ namespace TemuKJD.WXForms.AdminForms this.deleteColumn.Name = "deleteColumn"; this.deleteColumn.ReadOnly = true; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.IsShowTotalCount = false; + this.ucSplitPage1.Location = new System.Drawing.Point(783, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.MaxPageSizeValue = 5000; + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(389, 27); + this.ucSplitPage1.TabIndex = 443; + this.ucSplitPage1.TotalCount = ((long)(0)); + this.ucSplitPage1.TotalPage = 1; + // + // btnExportShopErp + // + this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); + this.btnExportShopErp.Name = "btnExportShopErp"; + this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); + this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnExportShopErp.Style.GradientAngle = 90; + this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.TabIndex = 439; + this.btnExportShopErp.Text = "导出用户到后台系统"; + this.btnExportShopErp.Visible = false; + this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); + // + // num_shop_renewal_platform_floor_fee + // + this.num_shop_renewal_platform_floor_fee.Location = new System.Drawing.Point(125, 50); + this.num_shop_renewal_platform_floor_fee.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.num_shop_renewal_platform_floor_fee.Minimum = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.num_shop_renewal_platform_floor_fee.Name = "num_shop_renewal_platform_floor_fee"; + this.num_shop_renewal_platform_floor_fee.Size = new System.Drawing.Size(56, 23); + this.num_shop_renewal_platform_floor_fee.TabIndex = 465; + this.num_shop_renewal_platform_floor_fee.Value = new decimal(new int[] { + 15, + 0, + 0, + 0}); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(7, 53); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(116, 17); + this.label17.TabIndex = 466; + this.label17.Text = "平台抽佣最低金额："; + // // WXAdminAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2112,6 +2148,7 @@ namespace TemuKJD.WXForms.AdminForms this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvUser)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.num_shop_renewal_platform_floor_fee)).EndInit(); this.ResumeLayout(false); } @@ -2265,5 +2302,7 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewLinkColumn colAddShop; private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; + private System.Windows.Forms.NumericUpDown num_shop_renewal_platform_floor_fee; + private System.Windows.Forms.Label label17; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index 32321b3..fe0be26 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -189,6 +189,7 @@ namespace TemuKJD.WXForms.AdminForms user.sync_logistics_per_order = BaseRegex.GetDecimalJson(ref oStr, "sync_logistics_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); + user.shop_renewal_platform_floor_fee = BaseRegex.GetDecimalJson(ref oStr, "shop_renewal_platform_floor_fee"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); AllUsers.Add(user); @@ -378,6 +379,9 @@ namespace TemuKJD.WXForms.AdminForms this.pnlShopPointsPerMonth.Visible = true; this.pnlShopPointsPerMonth.BringToFront(); this.lblShopPointsPerMonthUserId.Text = uid; + + + this.num_shop_renewal_platform_floor_fee.Value = AllUsers.FirstOrDefault(a => a.user_name == mobile)?.shop_renewal_platform_floor_fee ?? 0; } if (columName == "colChangePostagePerOrder") { @@ -583,7 +587,7 @@ namespace TemuKJD.WXForms.AdminForms string data = UserLogin.GetSignaturex(); data += "&id=" + userDbId; data += "&shop_points_per_month=" + numShopPointsPerMonth.Value; - + data += "&shop_renewal_platform_floor_fee=" + num_shop_renewal_platform_floor_fee.Value; string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); if (!html.Contains("\"code\":200")) { @@ -599,6 +603,11 @@ namespace TemuKJD.WXForms.AdminForms { Invoke(new Action(() => { row.Cells["colShopPointsPerMonth"].Value = numShopPointsPerMonth.Value; })); } + var item = AllUsers.FirstOrDefault(a => a.id.ToString() == userDbId); + if (item != null) + { + item.shop_renewal_platform_floor_fee = num_shop_renewal_platform_floor_fee.Value; + } return true; } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs index e2382c4..6976aa2 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs @@ -29,14 +29,14 @@ namespace TemuKJD.WXForms.ShopForms /// private void InitializeComponent() { - 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 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(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); @@ -66,6 +66,14 @@ namespace TemuKJD.WXForms.ShopForms this.label4 = new System.Windows.Forms.Label(); this.txtSearch = new System.Windows.Forms.TextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.pnlSyncLogisticsPerOrder = new System.Windows.Forms.Panel(); + this.lblSyncLogisticsPerOrderUserId = new System.Windows.Forms.Label(); + this.lblSyncLogisticsPerOrderUserInfo = new System.Windows.Forms.Label(); + this.panel8 = new System.Windows.Forms.Panel(); + this.numSyncLogisticsPerOrder = new System.Windows.Forms.NumericUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.btnSyncLogisticsPerOrderCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnSyncLogisticsPerOrder = new DevComponents.DotNetBar.PanelEx(); this.pnlGiftOemAmountPerOrder = new System.Windows.Forms.Panel(); this.lblGiftOemAmountPerOrderUserId = new System.Windows.Forms.Label(); this.lblGiftOemAmountPerOrderUserInfo = new System.Windows.Forms.Label(); @@ -146,14 +154,6 @@ namespace TemuKJD.WXForms.ShopForms this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); - this.pnlSyncLogisticsPerOrder = new System.Windows.Forms.Panel(); - this.lblSyncLogisticsPerOrderUserId = new System.Windows.Forms.Label(); - this.lblSyncLogisticsPerOrderUserInfo = new System.Windows.Forms.Label(); - this.panel8 = new System.Windows.Forms.Panel(); - this.numSyncLogisticsPerOrder = new System.Windows.Forms.NumericUpDown(); - this.label20 = new System.Windows.Forms.Label(); - this.btnSyncLogisticsPerOrderCancel = new DevComponents.DotNetBar.PanelEx(); - this.btnSyncLogisticsPerOrder = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -163,6 +163,9 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.pnlSyncLogisticsPerOrder.SuspendLayout(); + this.panel8.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).BeginInit(); this.pnlGiftOemAmountPerOrder.SuspendLayout(); this.panel7.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).BeginInit(); @@ -182,9 +185,6 @@ namespace TemuKJD.WXForms.ShopForms this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvUser)).BeginInit(); - this.pnlSyncLogisticsPerOrder.SuspendLayout(); - this.panel8.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).BeginInit(); this.SuspendLayout(); // // splitContainer5 @@ -215,9 +215,9 @@ namespace TemuKJD.WXForms.ShopForms // // pnlSuperManage // - this.pnlSuperManage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.pnlSuperManage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.pnlSuperManage.Controls.Add(this.label10); this.pnlSuperManage.Controls.Add(this.txtOemId); this.pnlSuperManage.Controls.Add(this.label40); @@ -541,6 +541,122 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // + // pnlSyncLogisticsPerOrder + // + this.pnlSyncLogisticsPerOrder.AccessibleDescription = ""; + this.pnlSyncLogisticsPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pnlSyncLogisticsPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserId); + this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserInfo); + this.pnlSyncLogisticsPerOrder.Controls.Add(this.panel8); + this.pnlSyncLogisticsPerOrder.Location = new System.Drawing.Point(23, 389); + this.pnlSyncLogisticsPerOrder.Name = "pnlSyncLogisticsPerOrder"; + this.pnlSyncLogisticsPerOrder.Size = new System.Drawing.Size(360, 146); + this.pnlSyncLogisticsPerOrder.TabIndex = 459; + this.pnlSyncLogisticsPerOrder.Visible = false; + // + // lblSyncLogisticsPerOrderUserId + // + this.lblSyncLogisticsPerOrderUserId.AutoSize = true; + this.lblSyncLogisticsPerOrderUserId.Location = new System.Drawing.Point(256, 19); + this.lblSyncLogisticsPerOrderUserId.Name = "lblSyncLogisticsPerOrderUserId"; + this.lblSyncLogisticsPerOrderUserId.Size = new System.Drawing.Size(47, 17); + this.lblSyncLogisticsPerOrderUserId.TabIndex = 457; + this.lblSyncLogisticsPerOrderUserId.Text = "UserId"; + this.lblSyncLogisticsPerOrderUserId.Visible = false; + // + // lblSyncLogisticsPerOrderUserInfo + // + this.lblSyncLogisticsPerOrderUserInfo.AutoSize = true; + this.lblSyncLogisticsPerOrderUserInfo.Location = new System.Drawing.Point(20, 19); + this.lblSyncLogisticsPerOrderUserInfo.Name = "lblSyncLogisticsPerOrderUserInfo"; + this.lblSyncLogisticsPerOrderUserInfo.Size = new System.Drawing.Size(58, 17); + this.lblSyncLogisticsPerOrderUserInfo.TabIndex = 455; + this.lblSyncLogisticsPerOrderUserInfo.Text = "UserInfo"; + // + // panel8 + // + this.panel8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel8.Controls.Add(this.numSyncLogisticsPerOrder); + this.panel8.Controls.Add(this.label20); + this.panel8.Controls.Add(this.btnSyncLogisticsPerOrderCancel); + this.panel8.Controls.Add(this.btnSyncLogisticsPerOrder); + this.panel8.Location = new System.Drawing.Point(23, 52); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(310, 57); + this.panel8.TabIndex = 454; + // + // numSyncLogisticsPerOrder + // + this.numSyncLogisticsPerOrder.DecimalPlaces = 2; + this.numSyncLogisticsPerOrder.Location = new System.Drawing.Point(125, 16); + this.numSyncLogisticsPerOrder.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numSyncLogisticsPerOrder.Name = "numSyncLogisticsPerOrder"; + this.numSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23); + this.numSyncLogisticsPerOrder.TabIndex = 1; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(7, 19); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(116, 17); + this.label20.TabIndex = 456; + this.label20.Text = "同步物流额外收取："; + // + // btnSyncLogisticsPerOrderCancel + // + this.btnSyncLogisticsPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnSyncLogisticsPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSyncLogisticsPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSyncLogisticsPerOrderCancel.Location = new System.Drawing.Point(244, 16); + this.btnSyncLogisticsPerOrderCancel.Name = "btnSyncLogisticsPerOrderCancel"; + this.btnSyncLogisticsPerOrderCancel.Size = new System.Drawing.Size(56, 23); + this.btnSyncLogisticsPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSyncLogisticsPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnSyncLogisticsPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnSyncLogisticsPerOrderCancel.Style.GradientAngle = 90; + this.btnSyncLogisticsPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnSyncLogisticsPerOrderCancel.TabIndex = 458; + this.btnSyncLogisticsPerOrderCancel.Text = "取消"; + this.btnSyncLogisticsPerOrderCancel.Click += new System.EventHandler(this.btnSyncLogisticsPerOrderCancel_Click); + // + // btnSyncLogisticsPerOrder + // + this.btnSyncLogisticsPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSyncLogisticsPerOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSyncLogisticsPerOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSyncLogisticsPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSyncLogisticsPerOrder.Location = new System.Drawing.Point(185, 16); + this.btnSyncLogisticsPerOrder.Name = "btnSyncLogisticsPerOrder"; + this.btnSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23); + this.btnSyncLogisticsPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSyncLogisticsPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSyncLogisticsPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSyncLogisticsPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSyncLogisticsPerOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSyncLogisticsPerOrder.Style.GradientAngle = 90; + this.btnSyncLogisticsPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSyncLogisticsPerOrder.TabIndex = 453; + this.btnSyncLogisticsPerOrder.Text = "确定"; + this.btnSyncLogisticsPerOrder.Click += new System.EventHandler(this.btnSyncLogisticsPerOrder_Click); + // // pnlGiftOemAmountPerOrder // this.pnlGiftOemAmountPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -575,8 +691,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel7 // - this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel7.Controls.Add(this.numGiftOemAmountPerOrder); this.panel7.Controls.Add(this.label7); this.panel7.Controls.Add(this.btnGiftOemAmountPerOrderCancel); @@ -591,10 +707,10 @@ namespace TemuKJD.WXForms.ShopForms this.numGiftOemAmountPerOrder.DecimalPlaces = 2; this.numGiftOemAmountPerOrder.Location = new System.Drawing.Point(125, 16); this.numGiftOemAmountPerOrder.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numGiftOemAmountPerOrder.Name = "numGiftOemAmountPerOrder"; this.numGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23); this.numGiftOemAmountPerOrder.TabIndex = 1; @@ -690,8 +806,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel6 // - this.panel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel6.Controls.Add(this.numRefundPostagePerOrder); this.panel6.Controls.Add(this.label18); this.panel6.Controls.Add(this.btnRefundPostagePerOrderCancel); @@ -706,23 +822,23 @@ namespace TemuKJD.WXForms.ShopForms this.numRefundPostagePerOrder.DecimalPlaces = 2; this.numRefundPostagePerOrder.Location = new System.Drawing.Point(119, 16); this.numRefundPostagePerOrder.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numRefundPostagePerOrder.Minimum = new decimal(new int[] { - 25, - 0, - 0, - 65536}); + 25, + 0, + 0, + 65536}); this.numRefundPostagePerOrder.Name = "numRefundPostagePerOrder"; this.numRefundPostagePerOrder.Size = new System.Drawing.Size(56, 23); this.numRefundPostagePerOrder.TabIndex = 1; this.numRefundPostagePerOrder.Value = new decimal(new int[] { - 25, - 0, - 0, - 65536}); + 25, + 0, + 0, + 65536}); // // label18 // @@ -815,8 +931,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel5 // - this.panel5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel5.Controls.Add(this.numPostagePerOrder); this.panel5.Controls.Add(this.label16); this.panel5.Controls.Add(this.btnPostagePerOrderCancel); @@ -831,23 +947,23 @@ namespace TemuKJD.WXForms.ShopForms this.numPostagePerOrder.DecimalPlaces = 2; this.numPostagePerOrder.Location = new System.Drawing.Point(119, 16); this.numPostagePerOrder.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numPostagePerOrder.Minimum = new decimal(new int[] { - 22, - 0, - 0, - 65536}); + 22, + 0, + 0, + 65536}); this.numPostagePerOrder.Name = "numPostagePerOrder"; this.numPostagePerOrder.Size = new System.Drawing.Size(56, 23); this.numPostagePerOrder.TabIndex = 1; this.numPostagePerOrder.Value = new decimal(new int[] { - 22, - 0, - 0, - 65536}); + 22, + 0, + 0, + 65536}); // // label16 // @@ -940,8 +1056,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel4 // - this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel4.Controls.Add(this.numAddBalance); this.panel4.Controls.Add(this.label12); this.panel4.Controls.Add(this.btnChangeBalanceCancel); @@ -956,10 +1072,10 @@ namespace TemuKJD.WXForms.ShopForms this.numAddBalance.DecimalPlaces = 2; this.numAddBalance.Location = new System.Drawing.Point(119, 16); this.numAddBalance.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numAddBalance.Name = "numAddBalance"; this.numAddBalance.Size = new System.Drawing.Size(56, 23); this.numAddBalance.TabIndex = 1; @@ -1055,8 +1171,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel3 // - this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel3.Controls.Add(this.numShopPointsPerMonth); this.panel3.Controls.Add(this.label11); this.panel3.Controls.Add(this.btnShopPointsPerMonthCancel); @@ -1070,23 +1186,23 @@ namespace TemuKJD.WXForms.ShopForms // this.numShopPointsPerMonth.Location = new System.Drawing.Point(125, 16); this.numShopPointsPerMonth.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numShopPointsPerMonth.Minimum = new decimal(new int[] { - 30, - 0, - 0, - 0}); + 30, + 0, + 0, + 0}); this.numShopPointsPerMonth.Name = "numShopPointsPerMonth"; this.numShopPointsPerMonth.Size = new System.Drawing.Size(56, 23); this.numShopPointsPerMonth.TabIndex = 1; this.numShopPointsPerMonth.Value = new decimal(new int[] { - 30, - 0, - 0, - 0}); + 30, + 0, + 0, + 0}); // // label11 // @@ -1179,8 +1295,8 @@ namespace TemuKJD.WXForms.ShopForms // // panel2 // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.panel2.Controls.Add(this.numAddTopUp); this.panel2.Controls.Add(this.label8); this.panel2.Controls.Add(this.btnTopUpCancel); @@ -1194,10 +1310,10 @@ namespace TemuKJD.WXForms.ShopForms // this.numAddTopUp.Location = new System.Drawing.Point(120, 16); this.numAddTopUp.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); + 100000, + 0, + 0, + 0}); this.numAddTopUp.Name = "numAddTopUp"; this.numAddTopUp.Size = new System.Drawing.Size(56, 23); this.numAddTopUp.TabIndex = 1; @@ -1263,52 +1379,52 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colCheck, - this.UserIdColumn, - this.UserNickNameColumn, - this.mobileColumn, - this.colParentUserName, - this.groupIdColumn, - this.groupNameColumn, - this.colCompany, - this.shopCountColumn, - this.colSaLevel, - this.colSaLevelName, - this.colAuthority, - this.colOemId, - this.colOemName, - this.colPoints, - this.colPlus, - this.colShopPointsPerMonth, - this.colChangePointsPerMonth, - this.colBalance, - this.colBalancePlus, - this.colPostagePerOrder, - this.colChangePostagePerOrder, - this.colRefundPostagePerOrder, - this.colChangeRefundPostagePerOrder, - this.colGiftOemAmountPerOrder, - this.colChangeGiftOemAmountPerOrder, - this.colSyncLogisticsPerOrder, - this.colChangeSyncLogisticsPerOrder, - this.editColumn, - this.deleteColumn}); + this.colCheck, + this.UserIdColumn, + this.UserNickNameColumn, + this.mobileColumn, + this.colParentUserName, + this.groupIdColumn, + this.groupNameColumn, + this.colCompany, + this.shopCountColumn, + this.colSaLevel, + this.colSaLevelName, + this.colAuthority, + this.colOemId, + this.colOemName, + this.colPoints, + this.colPlus, + this.colShopPointsPerMonth, + this.colChangePointsPerMonth, + this.colBalance, + this.colBalancePlus, + this.colPostagePerOrder, + this.colChangePostagePerOrder, + this.colRefundPostagePerOrder, + this.colChangeRefundPostagePerOrder, + this.colGiftOemAmountPerOrder, + this.colChangeGiftOemAmountPerOrder, + this.colSyncLogisticsPerOrder, + this.colChangeSyncLogisticsPerOrder, + this.editColumn, + this.deleteColumn}); this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvUser.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); this.dgvUser.Location = new System.Drawing.Point(0, 0); @@ -1433,8 +1549,8 @@ namespace TemuKJD.WXForms.ShopForms // // colPlus // - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle11; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; @@ -1450,8 +1566,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePointsPerMonth // - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle12; this.colChangePointsPerMonth.FillWeight = 25F; this.colChangePointsPerMonth.HeaderText = "改"; this.colChangePointsPerMonth.Name = "colChangePointsPerMonth"; @@ -1467,8 +1583,8 @@ namespace TemuKJD.WXForms.ShopForms // // colBalancePlus // - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle13; this.colBalancePlus.FillWeight = 22F; this.colBalancePlus.HeaderText = "+"; this.colBalancePlus.Name = "colBalancePlus"; @@ -1484,8 +1600,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePostagePerOrder // - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle14; this.colChangePostagePerOrder.FillWeight = 25F; this.colChangePostagePerOrder.HeaderText = "改"; this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; @@ -1500,8 +1616,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeRefundPostagePerOrder // - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle15; this.colChangeRefundPostagePerOrder.FillWeight = 25F; this.colChangeRefundPostagePerOrder.HeaderText = "改"; this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; @@ -1518,8 +1634,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeGiftOemAmountPerOrder // - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle16; this.colChangeGiftOemAmountPerOrder.FillWeight = 25F; this.colChangeGiftOemAmountPerOrder.HeaderText = "改"; this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder"; @@ -1584,122 +1700,6 @@ namespace TemuKJD.WXForms.ShopForms this.btnExportShopErp.Visible = false; this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); // - // pnlSyncLogisticsPerOrder - // - this.pnlSyncLogisticsPerOrder.AccessibleDescription = ""; - this.pnlSyncLogisticsPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pnlSyncLogisticsPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserId); - this.pnlSyncLogisticsPerOrder.Controls.Add(this.lblSyncLogisticsPerOrderUserInfo); - this.pnlSyncLogisticsPerOrder.Controls.Add(this.panel8); - this.pnlSyncLogisticsPerOrder.Location = new System.Drawing.Point(23, 389); - this.pnlSyncLogisticsPerOrder.Name = "pnlSyncLogisticsPerOrder"; - this.pnlSyncLogisticsPerOrder.Size = new System.Drawing.Size(360, 146); - this.pnlSyncLogisticsPerOrder.TabIndex = 459; - this.pnlSyncLogisticsPerOrder.Visible = false; - // - // lblSyncLogisticsPerOrderUserId - // - this.lblSyncLogisticsPerOrderUserId.AutoSize = true; - this.lblSyncLogisticsPerOrderUserId.Location = new System.Drawing.Point(256, 19); - this.lblSyncLogisticsPerOrderUserId.Name = "lblSyncLogisticsPerOrderUserId"; - this.lblSyncLogisticsPerOrderUserId.Size = new System.Drawing.Size(47, 17); - this.lblSyncLogisticsPerOrderUserId.TabIndex = 457; - this.lblSyncLogisticsPerOrderUserId.Text = "UserId"; - this.lblSyncLogisticsPerOrderUserId.Visible = false; - // - // lblSyncLogisticsPerOrderUserInfo - // - this.lblSyncLogisticsPerOrderUserInfo.AutoSize = true; - this.lblSyncLogisticsPerOrderUserInfo.Location = new System.Drawing.Point(20, 19); - this.lblSyncLogisticsPerOrderUserInfo.Name = "lblSyncLogisticsPerOrderUserInfo"; - this.lblSyncLogisticsPerOrderUserInfo.Size = new System.Drawing.Size(58, 17); - this.lblSyncLogisticsPerOrderUserInfo.TabIndex = 455; - this.lblSyncLogisticsPerOrderUserInfo.Text = "UserInfo"; - // - // panel8 - // - this.panel8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel8.Controls.Add(this.numSyncLogisticsPerOrder); - this.panel8.Controls.Add(this.label20); - this.panel8.Controls.Add(this.btnSyncLogisticsPerOrderCancel); - this.panel8.Controls.Add(this.btnSyncLogisticsPerOrder); - this.panel8.Location = new System.Drawing.Point(23, 52); - this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(310, 57); - this.panel8.TabIndex = 454; - // - // numSyncLogisticsPerOrder - // - this.numSyncLogisticsPerOrder.DecimalPlaces = 2; - this.numSyncLogisticsPerOrder.Location = new System.Drawing.Point(125, 16); - this.numSyncLogisticsPerOrder.Maximum = new decimal(new int[] { - 100000, - 0, - 0, - 0}); - this.numSyncLogisticsPerOrder.Name = "numSyncLogisticsPerOrder"; - this.numSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23); - this.numSyncLogisticsPerOrder.TabIndex = 1; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(7, 19); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(116, 17); - this.label20.TabIndex = 456; - this.label20.Text = "同步物流额外收取："; - // - // btnSyncLogisticsPerOrderCancel - // - this.btnSyncLogisticsPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; - this.btnSyncLogisticsPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSyncLogisticsPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSyncLogisticsPerOrderCancel.Location = new System.Drawing.Point(244, 16); - this.btnSyncLogisticsPerOrderCancel.Name = "btnSyncLogisticsPerOrderCancel"; - this.btnSyncLogisticsPerOrderCancel.Size = new System.Drawing.Size(56, 23); - this.btnSyncLogisticsPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSyncLogisticsPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnSyncLogisticsPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnSyncLogisticsPerOrderCancel.Style.GradientAngle = 90; - this.btnSyncLogisticsPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnSyncLogisticsPerOrderCancel.TabIndex = 458; - this.btnSyncLogisticsPerOrderCancel.Text = "取消"; - this.btnSyncLogisticsPerOrderCancel.Click += new System.EventHandler(this.btnSyncLogisticsPerOrderCancel_Click); - // - // btnSyncLogisticsPerOrder - // - this.btnSyncLogisticsPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSyncLogisticsPerOrder.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSyncLogisticsPerOrder.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSyncLogisticsPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSyncLogisticsPerOrder.Location = new System.Drawing.Point(185, 16); - this.btnSyncLogisticsPerOrder.Name = "btnSyncLogisticsPerOrder"; - this.btnSyncLogisticsPerOrder.Size = new System.Drawing.Size(56, 23); - this.btnSyncLogisticsPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSyncLogisticsPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnSyncLogisticsPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnSyncLogisticsPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnSyncLogisticsPerOrder.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnSyncLogisticsPerOrder.Style.GradientAngle = 90; - this.btnSyncLogisticsPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSyncLogisticsPerOrder.TabIndex = 453; - this.btnSyncLogisticsPerOrder.Text = "确定"; - this.btnSyncLogisticsPerOrder.Click += new System.EventHandler(this.btnSyncLogisticsPerOrder_Click); - // // WXOemAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1722,6 +1722,11 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.pnlSyncLogisticsPerOrder.ResumeLayout(false); + this.pnlSyncLogisticsPerOrder.PerformLayout(); + this.panel8.ResumeLayout(false); + this.panel8.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).EndInit(); this.pnlGiftOemAmountPerOrder.ResumeLayout(false); this.pnlGiftOemAmountPerOrder.PerformLayout(); this.panel7.ResumeLayout(false); @@ -1753,11 +1758,6 @@ namespace TemuKJD.WXForms.ShopForms this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvUser)).EndInit(); - this.pnlSyncLogisticsPerOrder.ResumeLayout(false); - this.pnlSyncLogisticsPerOrder.PerformLayout(); - this.panel8.ResumeLayout(false); - this.panel8.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numSyncLogisticsPerOrder)).EndInit(); this.ResumeLayout(false); } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs index d533784..05a3f2c 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs @@ -127,7 +127,7 @@ namespace TemuKJD.WXForms.ShopForms user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month"); user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); - user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); + user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order"); user.sync_logistics_per_order = BaseRegex.GetDecimalJson(ref oStr, "sync_logistics_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); @@ -208,7 +208,7 @@ namespace TemuKJD.WXForms.ShopForms int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt(); decimal postagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colPostagePerOrder"].Value.ParseToDecimal(); decimal refundPostagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colRefundPostagePerOrder"].Value.ParseToDecimal(); - decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal(); + decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal(); decimal syncLogisticsPerOrder = dgvUser.Rows[e.RowIndex].Cells["colSyncLogisticsPerOrder"].Value.ParseToDecimal(); var row = dgvUser.Rows[e.RowIndex]; if (columText == "编辑") @@ -252,12 +252,25 @@ namespace TemuKJD.WXForms.ShopForms { if (columName == "colChangePointsPerMonth") { + /* + 注意注意注意特殊账号 只允许这些账号店铺月续费最少10元，其他默认30 + */ + List userNames = ["18058809384", "18990991234"]; + if (userNames.Contains(mobile)) + { + numShopPointsPerMonth.Minimum = 10; + } + + this.lblShopPointsPerMonthUserInfo.Text = mobile + " - " + nickName; this.numShopPointsPerMonth.Value = shopPointsPerMonth; this.pnlShopPointsPerMonth.Tag = row; this.pnlShopPointsPerMonth.Visible = true; this.pnlShopPointsPerMonth.BringToFront(); this.lblShopPointsPerMonthUserId.Text = uid; + + + } if (columName == "colChangePostagePerOrder") {