diff --git a/AllBase/AllBase.csproj.user b/AllBase/AllBase.csproj.user index 301324e..fdd5500 100644 --- a/AllBase/AllBase.csproj.user +++ b/AllBase/AllBase.csproj.user @@ -1,4 +1,4 @@ - + false diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 32b131d..f748e04 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1279; + public static int VersionCount = 1281; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; @@ -114,6 +114,7 @@ namespace AllBase public static int ShopPointsPerMonth { get; set; } = 30; public static decimal Balance { get; set; } = 0; public static decimal PostagePerOrder { get; set; } = 2.2m; + public static decimal RefundPostagePerOrder { get; set; } = 2.5m; /// /// 采集最低销量 /// diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs index 77129d1..ad7d46b 100644 --- a/AllBase/Model/Result/ShopLoginInfo.cs +++ b/AllBase/Model/Result/ShopLoginInfo.cs @@ -314,6 +314,14 @@ namespace AllBase.Model.Result /// public decimal postage_per_order { get; set; } = 2.2m; /// + /// 每一单中转退货快递费用 + /// + public decimal refund_postage_per_order { get; set; } = 2.2m; + /// + /// 每一单退货费用 + /// + //public decimal refund_postage_per_order { get; set; } = 2.5m; + /// /// 子账号禁止访问的页面 /// public string forbidden_page { get; set; } diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs index bdd6e1c..15fba7a 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs @@ -986,6 +986,46 @@ namespace KJD_Web.BLL.WXXD return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + public string WXUpdateErpColorFlag(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + string order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'"); + string colour_flag = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "colour_flag"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(order_id)) + return "{\"code\":500,\"msg\":\"订单ID不能为空\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = ""; + var count = -1; + + sql = " update erp.oms_wei_order set "; + if (colour_flag != null) + { + sql += " colour_flag=" + colour_flag + ","; + sql += " colour_flag_update_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; + } + sql = sql.TrimEnd(','); + sql += " where order_id = '" + order_id + "';"; + + count = mySql.ExecuteAffectedRows(sql); + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + public string WXUpdateErpOutAfterSaleStatus(string inputData) { if (!string.IsNullOrEmpty(inputData)) diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs index 31ebc3c..70c3a38 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs @@ -97,7 +97,8 @@ namespace KJD_Web.BLL.WXXD string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order " + + string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order" + + ",uu.refund_postage_per_order as main_refund_postage_per_order " + "FROM wxxd.user u LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name where u.user_name='" + mobile + "' and u.password='" + password + "'"; @@ -134,10 +135,12 @@ namespace KJD_Web.BLL.WXXD balance = row.Table.Columns.Contains("balance") ? row["balance"].ParseToDecimal() : 0, recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0, postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null, + refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null, }; var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : ""; var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : ""; var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m; + var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m; // 填写子账号的父账号权限 if (user.group_id != "3") @@ -161,6 +164,7 @@ namespace KJD_Web.BLL.WXXD // 子账号每单扣费金额跟随主账号 user.postage_per_order = Math.Max(2.2m, main_postage_per_order); + user.refund_postage_per_order = Math.Max(2.2m, main_refund_postage_per_order); } if (string.IsNullOrEmpty(user.company_name)) { @@ -485,7 +489,9 @@ namespace KJD_Web.BLL.WXXD } } - sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order,o.oem_name " + + sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id," + + " uu.postage_per_order as main_postage_per_order," + + " uu.refund_postage_per_order as main_refund_postage_per_order,o.oem_name " + " FROM wxxd.user u " + " LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name " + " LEFT JOIN wxxd.oem o ON uu.oem_id=o.oem_id or u.oem_id=o.oem_id " + @@ -529,11 +535,13 @@ namespace KJD_Web.BLL.WXXD shop_points_per_month = row.Table.Columns.Contains("shop_points_per_month") ? row["shop_points_per_month"].ParseToInt() : 30, balance = row.Table.Columns.Contains("balance") ? row["balance"].ParseToDecimal() : 0, recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0, - postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null + postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null, + refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null, }; var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : ""; var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : ""; var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m; + var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m; if (user.group_id != "3") { @@ -554,6 +562,7 @@ namespace KJD_Web.BLL.WXXD // 子账号每单扣费金额跟随主账号 user.postage_per_order = Math.Max(2.2m, main_postage_per_order); + user.refund_postage_per_order = Math.Max(2.5m, main_refund_postage_per_order); } if (string.IsNullOrEmpty(user.mobile)) { @@ -594,6 +603,9 @@ namespace KJD_Web.BLL.WXXD var postage_per_order = RegexUtils.GetStringQuery(ref inputData, "postage_per_order")?.Replace("'", "\\'"); if (postage_per_order.ParseToDecimal() <= 2.2m) // 每单费用 postage_per_order = "2.2"; + var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'"); + if (refund_postage_per_order.ParseToDecimal() <= 2.5m) // 每单费用 + refund_postage_per_order = "2.5"; string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); @@ -607,10 +619,10 @@ namespace KJD_Web.BLL.WXXD } sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,sa_level,authority," + - "forbidden_page,shop_points_per_month,postage_per_order,oem_id,add_time,mdy_time) " + + "forbidden_page,shop_points_per_month,postage_per_order,refund_postage_per_order,oem_id,add_time,mdy_time) " + "values ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" + group_id + "','" + company_name + "','" + notes + "'," + sa_level + ",'" + authority + "','" + forbidden_page + "'," + - shop_points_per_month + ",'" + postage_per_order + "',@oem_id,'" + + shop_points_per_month + ",'" + postage_per_order + "','" + refund_postage_per_order + "',@oem_id,'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; @@ -648,6 +660,7 @@ namespace KJD_Web.BLL.WXXD var forbidden_page = RegexUtils.GetStringQuery(ref inputData, "forbidden_page")?.Replace("'", "\\'"); var shop_points_per_month = RegexUtils.GetStringQuery(ref inputData, "shop_points_per_month")?.Replace("'", "\\'"); var postage_per_order = RegexUtils.GetStringQuery(ref inputData, "postage_per_order")?.Replace("'", "\\'"); + var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'"); var oem_id = RegexUtils.GetStringQuery(ref inputData, "oem_id")?.Replace("'", "\\'"); string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; @@ -682,6 +695,8 @@ namespace KJD_Web.BLL.WXXD sql += " shop_points_per_month=" + shop_points_per_month + ","; if (postage_per_order != null) sql += " postage_per_order=" + postage_per_order + ","; + if (refund_postage_per_order != null) + sql += " refund_postage_per_order=" + refund_postage_per_order + ","; if (oem_id != null) sql += " oem_id='" + oem_id + "',"; sql = sql.TrimEnd(','); diff --git a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs index 2465462..52b56d2 100644 --- a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs +++ b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs @@ -97,5 +97,9 @@ namespace KJD_Web.Model /// 每单运费金额 /// public decimal? postage_per_order { get; set; } + /// + /// 每单退货运费金额 + /// + public decimal? refund_postage_per_order { get; set; } } } \ No newline at end of file diff --git a/KJDService/KJD_WebService/WXOrderService.asmx.cs b/KJDService/KJD_WebService/WXOrderService.asmx.cs index 47612d3..382e56f 100644 --- a/KJDService/KJD_WebService/WXOrderService.asmx.cs +++ b/KJDService/KJD_WebService/WXOrderService.asmx.cs @@ -197,6 +197,18 @@ namespace KJD_Web Context.Response.End(); } + [WebMethod] + public void wx_update_erp_color_flag() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXUpdateErpColorFlag(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] public void wx_update_erp_out_after_sale_status() diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index 0bc0d9c..a6ed46f 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -401,7 +401,7 @@ namespace TemuKJD void ReadWxCateBound60323() { - string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60323"); + string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60810"); if (!File.Exists(filePath)) return; try diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs index e03aabb..1699673 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs @@ -239,6 +239,7 @@ namespace TemuKJD.WXForms.AdminForms user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance"); 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.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -268,6 +269,8 @@ namespace TemuKJD.WXForms.AdminForms "+", Math.Max(2.2m, user.postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index fa06030..eca22d2 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -30,11 +30,13 @@ namespace TemuKJD.WXForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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 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(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); + this.chkActivityStock = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkSpBrand = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label10 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.txtOemId = new System.Windows.Forms.TextBox(); @@ -84,6 +86,14 @@ namespace TemuKJD.WXForms.AdminForms this.label4 = new System.Windows.Forms.Label(); this.txtSearch = new System.Windows.Forms.TextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.pnlRefundPostagePerOrder = new System.Windows.Forms.Panel(); + this.lblRefundPostagePerOrderUserId = new System.Windows.Forms.Label(); + this.lblRefundPostagePerOrderUserInfo = new System.Windows.Forms.Label(); + this.panel6 = new System.Windows.Forms.Panel(); + this.numRefundPostagePerOrder = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.btnRefundPostagePerOrderCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnRefundPostagePerOrder = new DevComponents.DotNetBar.PanelEx(); this.pnlPostagePerOrder = new System.Windows.Forms.Panel(); this.lblPostagePerOrderUserId = new System.Windows.Forms.Label(); this.lblPostagePerOrderUserInfo = new System.Windows.Forms.Label(); @@ -121,6 +131,7 @@ namespace TemuKJD.WXForms.AdminForms this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx(); this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); + 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(); @@ -143,11 +154,11 @@ namespace TemuKJD.WXForms.AdminForms this.colBalancePlus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colRefundPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAddShop = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); - this.chkSpBrand = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -157,6 +168,9 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.pnlRefundPostagePerOrder.SuspendLayout(); + this.panel6.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).BeginInit(); this.pnlPostagePerOrder.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numPostagePerOrder)).BeginInit(); @@ -203,6 +217,7 @@ namespace TemuKJD.WXForms.AdminForms 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.chkActivityStock); this.pnlSuperManage.Controls.Add(this.chkSpBrand); this.pnlSuperManage.Controls.Add(this.label10); this.pnlSuperManage.Controls.Add(this.label5); @@ -253,11 +268,29 @@ namespace TemuKJD.WXForms.AdminForms this.pnlSuperManage.Size = new System.Drawing.Size(333, 623); this.pnlSuperManage.TabIndex = 851; // + // chkActivityStock + // + this.chkActivityStock.Location = new System.Drawing.Point(175, 474); + this.chkActivityStock.Name = "chkActivityStock"; + this.chkActivityStock.Size = new System.Drawing.Size(68, 21); + this.chkActivityStock.TabIndex = 852; + this.chkActivityStock.Text = "活动库存"; + this.chkActivityStock.UseVisualStyleBackColor = true; + // + // chkSpBrand + // + this.chkSpBrand.Location = new System.Drawing.Point(95, 474); + this.chkSpBrand.Name = "chkSpBrand"; + this.chkSpBrand.Size = new System.Drawing.Size(68, 21); + this.chkSpBrand.TabIndex = 848; + this.chkSpBrand.Text = "定向品牌"; + this.chkSpBrand.UseVisualStyleBackColor = true; + // // label10 // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(10, 306); + this.label10.Location = new System.Drawing.Point(10, 294); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(79, 20); this.label10.TabIndex = 844; @@ -275,7 +308,7 @@ namespace TemuKJD.WXForms.AdminForms // // txtOemId // - this.txtOemId.Location = new System.Drawing.Point(95, 305); + this.txtOemId.Location = new System.Drawing.Point(95, 293); this.txtOemId.Name = "txtOemId"; this.txtOemId.Size = new System.Drawing.Size(148, 23); this.txtOemId.TabIndex = 843; @@ -309,7 +342,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label39.AutoSize = true; this.label39.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label39.Location = new System.Drawing.Point(24, 144); + this.label39.Location = new System.Drawing.Point(24, 142); this.label39.Name = "label39"; this.label39.Size = new System.Drawing.Size(65, 20); this.label39.TabIndex = 20; @@ -317,14 +350,14 @@ namespace TemuKJD.WXForms.AdminForms // // txtMobile // - this.txtMobile.Location = new System.Drawing.Point(95, 143); + this.txtMobile.Location = new System.Drawing.Point(95, 141); this.txtMobile.Name = "txtMobile"; this.txtMobile.Size = new System.Drawing.Size(148, 23); this.txtMobile.TabIndex = 21; // // chkTraineeData // - this.chkTraineeData.Location = new System.Drawing.Point(175, 456); + this.chkTraineeData.Location = new System.Drawing.Point(175, 445); this.chkTraineeData.Name = "chkTraineeData"; this.chkTraineeData.Size = new System.Drawing.Size(68, 21); this.chkTraineeData.TabIndex = 829; @@ -335,7 +368,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label38.AutoSize = true; this.label38.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(38, 176); + this.label38.Location = new System.Drawing.Point(38, 172); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(51, 20); this.label38.TabIndex = 22; @@ -351,7 +384,7 @@ namespace TemuKJD.WXForms.AdminForms // // txtPassword // - this.txtPassword.Location = new System.Drawing.Point(95, 175); + this.txtPassword.Location = new System.Drawing.Point(95, 171); this.txtPassword.Name = "txtPassword"; this.txtPassword.PasswordChar = '*'; this.txtPassword.Size = new System.Drawing.Size(148, 23); @@ -385,7 +418,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label37.AutoSize = true; this.label37.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label37.Location = new System.Drawing.Point(38, 241); + this.label37.Location = new System.Drawing.Point(38, 233); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(51, 20); this.label37.TabIndex = 25; @@ -400,7 +433,7 @@ namespace TemuKJD.WXForms.AdminForms "上货", "数据", "登录"}); - this.cmbGroup.Location = new System.Drawing.Point(95, 239); + this.cmbGroup.Location = new System.Drawing.Point(95, 231); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(148, 25); this.cmbGroup.TabIndex = 26; @@ -420,7 +453,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label35.AutoSize = true; this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label35.Location = new System.Drawing.Point(249, 146); + this.label35.Location = new System.Drawing.Point(249, 144); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(13, 17); this.label35.TabIndex = 28; @@ -437,7 +470,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label34.AutoSize = true; this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label34.Location = new System.Drawing.Point(249, 178); + this.label34.Location = new System.Drawing.Point(249, 174); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(13, 17); this.label34.TabIndex = 29; @@ -457,7 +490,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label33.AutoSize = true; this.label33.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label33.Location = new System.Drawing.Point(249, 243); + this.label33.Location = new System.Drawing.Point(249, 235); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(13, 17); this.label33.TabIndex = 30; @@ -465,7 +498,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkProdFission // - this.chkProdFission.Location = new System.Drawing.Point(95, 456); + this.chkProdFission.Location = new System.Drawing.Point(95, 445); this.chkProdFission.Name = "chkProdFission"; this.chkProdFission.Size = new System.Drawing.Size(68, 21); this.chkProdFission.TabIndex = 817; @@ -476,7 +509,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label32.AutoSize = true; this.label32.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(10, 208); + this.label32.Location = new System.Drawing.Point(10, 202); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(79, 20); this.label32.TabIndex = 31; @@ -484,7 +517,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkCommissionUpdate // - this.chkCommissionUpdate.Location = new System.Drawing.Point(175, 412); + this.chkCommissionUpdate.Location = new System.Drawing.Point(175, 401); this.chkCommissionUpdate.Name = "chkCommissionUpdate"; this.chkCommissionUpdate.Size = new System.Drawing.Size(68, 21); this.chkCommissionUpdate.TabIndex = 816; @@ -493,7 +526,7 @@ namespace TemuKJD.WXForms.AdminForms // // txtRePass // - this.txtRePass.Location = new System.Drawing.Point(95, 207); + this.txtRePass.Location = new System.Drawing.Point(95, 201); this.txtRePass.Name = "txtRePass"; this.txtRePass.PasswordChar = '*'; this.txtRePass.Size = new System.Drawing.Size(148, 23); @@ -501,7 +534,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkEcWaybill // - this.chkEcWaybill.Location = new System.Drawing.Point(95, 412); + this.chkEcWaybill.Location = new System.Drawing.Point(95, 401); this.chkEcWaybill.Name = "chkEcWaybill"; this.chkEcWaybill.Size = new System.Drawing.Size(68, 21); this.chkEcWaybill.TabIndex = 815; @@ -512,7 +545,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label31.AutoSize = true; this.label31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label31.Location = new System.Drawing.Point(249, 210); + this.label31.Location = new System.Drawing.Point(249, 204); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(13, 17); this.label31.TabIndex = 32; @@ -520,7 +553,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkHot // - this.chkHot.Location = new System.Drawing.Point(175, 391); + this.chkHot.Location = new System.Drawing.Point(175, 380); this.chkHot.Name = "chkHot"; this.chkHot.Size = new System.Drawing.Size(68, 21); this.chkHot.TabIndex = 814; @@ -531,7 +564,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label30.AutoSize = true; this.label30.ForeColor = System.Drawing.SystemColors.ButtonShadow; - this.label30.Location = new System.Drawing.Point(265, 146); + this.label30.Location = new System.Drawing.Point(265, 144); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(56, 17); this.label30.TabIndex = 33; @@ -539,7 +572,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkShopOptimize // - this.chkShopOptimize.Location = new System.Drawing.Point(95, 391); + this.chkShopOptimize.Location = new System.Drawing.Point(95, 380); this.chkShopOptimize.Name = "chkShopOptimize"; this.chkShopOptimize.Size = new System.Drawing.Size(68, 21); this.chkShopOptimize.TabIndex = 813; @@ -564,7 +597,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkChanceProdCollect // - this.chkChanceProdCollect.Location = new System.Drawing.Point(175, 433); + this.chkChanceProdCollect.Location = new System.Drawing.Point(175, 422); this.chkChanceProdCollect.Name = "chkChanceProdCollect"; this.chkChanceProdCollect.Size = new System.Drawing.Size(68, 21); this.chkChanceProdCollect.TabIndex = 812; @@ -590,7 +623,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkShopPoints // - this.chkShopPoints.Location = new System.Drawing.Point(95, 434); + this.chkShopPoints.Location = new System.Drawing.Point(95, 423); this.chkShopPoints.Name = "chkShopPoints"; this.chkShopPoints.Size = new System.Drawing.Size(68, 21); this.chkShopPoints.TabIndex = 811; @@ -609,7 +642,7 @@ namespace TemuKJD.WXForms.AdminForms // // chkWXShowProdGetFromType // - this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(175, 370); + this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(175, 359); this.chkWXShowProdGetFromType.Name = "chkWXShowProdGetFromType"; this.chkWXShowProdGetFromType.Size = new System.Drawing.Size(68, 21); this.chkWXShowProdGetFromType.TabIndex = 810; @@ -631,7 +664,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(38, 370); + this.label7.Location = new System.Drawing.Point(38, 359); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(51, 20); this.label7.TabIndex = 809; @@ -639,14 +672,14 @@ namespace TemuKJD.WXForms.AdminForms // // txtCompany // - this.txtCompany.Location = new System.Drawing.Point(95, 273); + this.txtCompany.Location = new System.Drawing.Point(95, 263); this.txtCompany.Name = "txtCompany"; this.txtCompany.Size = new System.Drawing.Size(148, 23); this.txtCompany.TabIndex = 39; // // chkWXComplateProd // - this.chkWXComplateProd.Location = new System.Drawing.Point(95, 370); + this.chkWXComplateProd.Location = new System.Drawing.Point(95, 359); this.chkWXComplateProd.Name = "chkWXComplateProd"; this.chkWXComplateProd.Size = new System.Drawing.Size(68, 21); this.chkWXComplateProd.TabIndex = 808; @@ -657,7 +690,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(38, 274); + this.label3.Location = new System.Drawing.Point(38, 264); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(51, 20); this.label3.TabIndex = 40; @@ -670,7 +703,7 @@ namespace TemuKJD.WXForms.AdminForms "普通用户", "一级超管", "二级超管"}); - this.cmbSaLevel.Location = new System.Drawing.Point(95, 337); + this.cmbSaLevel.Location = new System.Drawing.Point(95, 323); this.cmbSaLevel.Name = "cmbSaLevel"; this.cmbSaLevel.Size = new System.Drawing.Size(148, 25); this.cmbSaLevel.TabIndex = 48; @@ -695,7 +728,7 @@ namespace TemuKJD.WXForms.AdminForms // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(10, 339); + this.label6.Location = new System.Drawing.Point(10, 325); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(79, 20); this.label6.TabIndex = 47; @@ -764,6 +797,7 @@ namespace TemuKJD.WXForms.AdminForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlBalance); this.splitContainer1.Panel1.Controls.Add(this.pnlShopPointsPerMonth); @@ -777,6 +811,131 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // + // pnlRefundPostagePerOrder + // + this.pnlRefundPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pnlRefundPostagePerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserId); + this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserInfo); + this.pnlRefundPostagePerOrder.Controls.Add(this.panel6); + this.pnlRefundPostagePerOrder.Location = new System.Drawing.Point(23, 85); + this.pnlRefundPostagePerOrder.Name = "pnlRefundPostagePerOrder"; + this.pnlRefundPostagePerOrder.Size = new System.Drawing.Size(360, 146); + this.pnlRefundPostagePerOrder.TabIndex = 12; + this.pnlRefundPostagePerOrder.Visible = false; + // + // lblRefundPostagePerOrderUserId + // + this.lblRefundPostagePerOrderUserId.AutoSize = true; + this.lblRefundPostagePerOrderUserId.Location = new System.Drawing.Point(256, 19); + this.lblRefundPostagePerOrderUserId.Name = "lblRefundPostagePerOrderUserId"; + this.lblRefundPostagePerOrderUserId.Size = new System.Drawing.Size(47, 17); + this.lblRefundPostagePerOrderUserId.TabIndex = 457; + this.lblRefundPostagePerOrderUserId.Text = "UserId"; + this.lblRefundPostagePerOrderUserId.Visible = false; + // + // lblRefundPostagePerOrderUserInfo + // + this.lblRefundPostagePerOrderUserInfo.AutoSize = true; + this.lblRefundPostagePerOrderUserInfo.Location = new System.Drawing.Point(20, 19); + this.lblRefundPostagePerOrderUserInfo.Name = "lblRefundPostagePerOrderUserInfo"; + this.lblRefundPostagePerOrderUserInfo.Size = new System.Drawing.Size(58, 17); + this.lblRefundPostagePerOrderUserInfo.TabIndex = 455; + this.lblRefundPostagePerOrderUserInfo.Text = "UserInfo"; + // + // 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.Controls.Add(this.numRefundPostagePerOrder); + this.panel6.Controls.Add(this.label18); + this.panel6.Controls.Add(this.btnRefundPostagePerOrderCancel); + this.panel6.Controls.Add(this.btnRefundPostagePerOrder); + this.panel6.Location = new System.Drawing.Point(23, 52); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(310, 57); + this.panel6.TabIndex = 454; + // + // numRefundPostagePerOrder + // + this.numRefundPostagePerOrder.DecimalPlaces = 2; + this.numRefundPostagePerOrder.Location = new System.Drawing.Point(119, 16); + this.numRefundPostagePerOrder.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numRefundPostagePerOrder.Minimum = new decimal(new int[] { + 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}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(13, 19); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(116, 17); + this.label18.TabIndex = 456; + this.label18.Text = "退货每单运费金额："; + // + // btnRefundPostagePerOrderCancel + // + this.btnRefundPostagePerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRefundPostagePerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefundPostagePerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefundPostagePerOrderCancel.Location = new System.Drawing.Point(238, 16); + this.btnRefundPostagePerOrderCancel.Name = "btnRefundPostagePerOrderCancel"; + this.btnRefundPostagePerOrderCancel.Size = new System.Drawing.Size(56, 23); + this.btnRefundPostagePerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRefundPostagePerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRefundPostagePerOrderCancel.Style.GradientAngle = 90; + this.btnRefundPostagePerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRefundPostagePerOrderCancel.TabIndex = 458; + this.btnRefundPostagePerOrderCancel.Text = "取消"; + this.btnRefundPostagePerOrderCancel.Click += new System.EventHandler(this.btnRefundPostagePerOrderCancel_Click); + // + // btnRefundPostagePerOrder + // + this.btnRefundPostagePerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefundPostagePerOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefundPostagePerOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefundPostagePerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefundPostagePerOrder.Location = new System.Drawing.Point(179, 16); + this.btnRefundPostagePerOrder.Name = "btnRefundPostagePerOrder"; + this.btnRefundPostagePerOrder.Size = new System.Drawing.Size(56, 23); + this.btnRefundPostagePerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefundPostagePerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefundPostagePerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefundPostagePerOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefundPostagePerOrder.Style.GradientAngle = 90; + this.btnRefundPostagePerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.TabIndex = 453; + this.btnRefundPostagePerOrder.Text = "确定"; + this.btnRefundPostagePerOrder.Click += new System.EventHandler(this.btnRefundPostagePerOrder_Click); + // // pnlPostagePerOrder // this.pnlPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1313,20 +1472,20 @@ namespace TemuKJD.WXForms.AdminForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; 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))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + 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.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1351,6 +1510,8 @@ namespace TemuKJD.WXForms.AdminForms this.colBalancePlus, this.colPostagePerOrder, this.colChangePostagePerOrder, + this.colRefundPostagePerOrder, + this.colChangeRefundPostagePerOrder, this.colAddShop, this.editColumn, this.deleteColumn}); @@ -1365,6 +1526,31 @@ namespace TemuKJD.WXForms.AdminForms this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // + // 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; @@ -1471,8 +1657,8 @@ namespace TemuKJD.WXForms.AdminForms // // colPlus // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; @@ -1520,6 +1706,20 @@ namespace TemuKJD.WXForms.AdminForms this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; this.colChangePostagePerOrder.ReadOnly = true; // + // colRefundPostagePerOrder + // + this.colRefundPostagePerOrder.FillWeight = 60F; + this.colRefundPostagePerOrder.HeaderText = "每单退货快递费"; + this.colRefundPostagePerOrder.Name = "colRefundPostagePerOrder"; + this.colRefundPostagePerOrder.ReadOnly = true; + // + // colChangeRefundPostagePerOrder + // + this.colChangeRefundPostagePerOrder.FillWeight = 25F; + this.colChangeRefundPostagePerOrder.HeaderText = "改"; + this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; + this.colChangeRefundPostagePerOrder.ReadOnly = true; + // // colAddShop // this.colAddShop.FillWeight = 70F; @@ -1545,40 +1745,6 @@ namespace TemuKJD.WXForms.AdminForms this.deleteColumn.Name = "deleteColumn"; this.deleteColumn.ReadOnly = true; // - // 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); - // - // chkSpBrand - // - this.chkSpBrand.Location = new System.Drawing.Point(95, 478); - this.chkSpBrand.Name = "chkSpBrand"; - this.chkSpBrand.Size = new System.Drawing.Size(68, 21); - this.chkSpBrand.TabIndex = 848; - this.chkSpBrand.Text = "定向品牌"; - this.chkSpBrand.UseVisualStyleBackColor = true; - // // WXAdminAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1601,6 +1767,11 @@ namespace TemuKJD.WXForms.AdminForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.pnlRefundPostagePerOrder.ResumeLayout(false); + this.pnlRefundPostagePerOrder.PerformLayout(); + this.panel6.ResumeLayout(false); + this.panel6.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).EndInit(); this.pnlPostagePerOrder.ResumeLayout(false); this.pnlPostagePerOrder.PerformLayout(); this.panel5.ResumeLayout(false); @@ -1712,6 +1883,21 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.Label lblPostagePerOrderUserId; private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox txtOemId; + public System.Windows.Forms.Panel pnlSuperManage; + private System.Windows.Forms.Label lblBalanceUserId; + private System.Windows.Forms.Label lblBalanceNickName; + private System.Windows.Forms.Label lblTopUpNickName; + private System.Windows.Forms.Label lblTopUpUserId; + private UserComponent.UcCheckBox chkSpBrand; + private UserComponent.UcCheckBox chkActivityStock; + private System.Windows.Forms.Panel pnlRefundPostagePerOrder; + private System.Windows.Forms.Label lblRefundPostagePerOrderUserId; + private System.Windows.Forms.Label lblRefundPostagePerOrderUserInfo; + private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.NumericUpDown numRefundPostagePerOrder; + private System.Windows.Forms.Label label18; + private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrderCancel; + private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrder; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; @@ -1734,14 +1920,10 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn colAddShop; private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; - public System.Windows.Forms.Panel pnlSuperManage; - private System.Windows.Forms.Label lblBalanceUserId; - private System.Windows.Forms.Label lblBalanceNickName; - private System.Windows.Forms.Label lblTopUpNickName; - private System.Windows.Forms.Label lblTopUpUserId; - private UserComponent.UcCheckBox chkSpBrand; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index f03fd45..4154652 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -101,6 +101,8 @@ namespace TemuKJD.WXForms.AdminForms authority += chkTraineeData.Text + ","; // 学员数据 if (chkSpBrand.Checked) authority += chkSpBrand.Text + ","; // 定向品牌 + if (chkActivityStock.Checked) + authority += chkActivityStock.Text + ","; // 活动库存 data.Append("&authority=" + authority.Trim(',')); string url = BaseClass.BuildObjString("user/add_user"); @@ -169,7 +171,8 @@ namespace TemuKJD.WXForms.AdminForms user.points = BaseRegex.GetIntJson(ref oStr, "points"); user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance"); 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.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); + user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -198,6 +201,8 @@ namespace TemuKJD.WXForms.AdminForms "+", Math.Max(2.2m, user.postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); @@ -228,6 +233,7 @@ namespace TemuKJD.WXForms.AdminForms chkChanceProdCollect.Checked = false; chkTraineeData.Checked = false; chkSpBrand.Checked = false; + chkActivityStock.Checked = false; chkShopOptimize.Checked = false; chkEcWaybill.Checked = false; chkCommissionUpdate.Checked = false; @@ -256,6 +262,7 @@ namespace TemuKJD.WXForms.AdminForms string authority = dgvUser.Rows[e.RowIndex].Cells["colAuthority"].Value.ParseToString(); 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(); string oemId = dgvUser.Rows[e.RowIndex].Cells["colOemId"].Value.ParseToString(); var row = dgvUser.Rows[e.RowIndex]; if (columText == "编辑") @@ -278,6 +285,7 @@ namespace TemuKJD.WXForms.AdminForms chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text); chkTraineeData.Checked = authority.Contains(chkTraineeData.Text); chkSpBrand.Checked = authority.Contains(chkSpBrand.Text); + chkActivityStock.Checked = authority.Contains(chkActivityStock.Text); chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text); chkEcWaybill.Checked = authority.Contains(chkEcWaybill.Text); chkCommissionUpdate.Checked = authority.Contains(chkCommissionUpdate.Text); @@ -342,6 +350,15 @@ namespace TemuKJD.WXForms.AdminForms this.pnlPostagePerOrder.BringToFront(); this.lblPostagePerOrderUserId.Text = uid; } + if (columName == "colChangeRefundPostagePerOrder") + { + this.lblRefundPostagePerOrderUserInfo.Text = mobile + " - " + nickName; + this.numRefundPostagePerOrder.Value = refundPostagePerOrder; + this.pnlRefundPostagePerOrder.Tag = row; + this.pnlRefundPostagePerOrder.Visible = true; + this.pnlRefundPostagePerOrder.BringToFront(); + this.lblRefundPostagePerOrderUserId.Text = uid; + } } } @@ -384,6 +401,7 @@ namespace TemuKJD.WXForms.AdminForms pnlShopPointsPerMonth.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); + pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); this.cmbGroup.Items.Clear(); this.cmbGroup.Items.Add("主账户"); @@ -405,6 +423,8 @@ namespace TemuKJD.WXForms.AdminForms this.dgvUser.AddMergeColumnHeader(new List { "colBalance", "colBalancePlus" }, "快递余额"); this.dgvUser.AddMergeColumn(new List { "colPostagePerOrder", "colChangePostagePerOrder" }); this.dgvUser.AddMergeColumnHeader(new List { "colPostagePerOrder", "colChangePostagePerOrder" }, "每单快递费"); + this.dgvUser.AddMergeColumn(new List { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" }); + this.dgvUser.AddMergeColumnHeader(new List { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" }, "每单退货快递费"); } private void TxtSearch_LostFocus(object sender, EventArgs e) @@ -597,5 +617,44 @@ namespace TemuKJD.WXForms.AdminForms { pnlPostagePerOrder.Visible = false; } + + private void btnRefundPostagePerOrder_Click(object sender, EventArgs e) + { + if (updateRefundPostagePerOrder(lblRefundPostagePerOrderUserId.Text)) + { + pnlRefundPostagePerOrder.Visible = false; + BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功"); + } + } + + public bool updateRefundPostagePerOrder(string userDbId, bool showFailBox = true) + { + string url = BaseClass.BuildObjString("user/update_user"); + string data = UserLogin.GetSignaturex(); + data += "&id=" + userDbId; + data += "&refund_postage_per_order=" + numRefundPostagePerOrder.Value; + + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg"); + if (showFailBox) + { + Invoke(new Action(() => { BaseMsgForm.ShowError(msg); })); + } + return false; + } + var row = dgvUser.Rows.Cast().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId); + if (row != null) + { + Invoke(new Action(() => { row.Cells["colRefundPostagePerOrder"].Value = numRefundPostagePerOrder.Value; })); + } + return true; + } + + private void btnRefundPostagePerOrderCancel_Click(object sender, EventArgs e) + { + pnlRefundPostagePerOrder.Visible = false; + } } } diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx index dfe744d..93bb106 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx @@ -183,6 +183,12 @@ True + + True + + + True + True diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs index 28bb0f8..cf5abb3 100644 --- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs +++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs @@ -2518,7 +2518,16 @@ namespace TemuKJD.WXForms.OrderForms var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere); return result; } - public static string batchUpdateStock(ShopLoginInfo shop, string spuId, string skuId, string num) + public static string batchUpdateStockAdd(ShopLoginInfo shop, string spuId, string skuId, string num) + { + string url = "https://store.weixin.qq.com/shop-faas/mmecnodeproductlist/cgi/goods/batchUpdateStock?token=&lang=zh_CN"; + string body = @"{""skuList"":[{""spuId"":""" + spuId + @""",""skuId"":""" + skuId + @""",""diffType"":1,""num"":" + num + "}]}"; + + string refere = "https://store.weixin.qq.com/shop/goods/list"; + var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, refere); + return result; + } + public static string batchUpdateStockReduce(ShopLoginInfo shop, string spuId, string skuId, string num) { string url = "https://store.weixin.qq.com/shop-faas/mmecnodeproductlist/cgi/goods/batchUpdateStock?token=&lang=zh_CN"; string body = @"{""skuList"":[{""spuId"":""" + spuId + @""",""skuId"":""" + skuId + @""",""diffType"":2,""num"":" + num + "}]}"; diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs index f2fcee2..b044fce 100644 --- a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs +++ b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs @@ -204,7 +204,7 @@ namespace TemuKJD.WXForms.OrderForms string spuId = lblSpuId.Text.Trim(); string skuId = lblSkuId.Text.Trim(); string num = txtCurrentStock.Text.Trim(); - var rst = WXOrderList.batchUpdateStock(shop, spuId, skuId, num); + var rst = WXOrderList.batchUpdateStockReduce(shop, spuId, skuId, num); if (!rst.Contains("\"code\":0")) { var error = BaseRegex.GetStringJsonByRegs(ref rst, rst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg"); diff --git a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.Designer.cs b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.Designer.cs index ea0b297..269f7da 100644 --- a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.Designer.cs @@ -32,15 +32,27 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.pnlStock = new System.Windows.Forms.Panel(); + this.label10 = new System.Windows.Forms.Label(); + this.txtIntervalMin = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.chkSetStockLoop = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label8 = new System.Windows.Forms.Label(); + this.txtStockLow = new System.Windows.Forms.TextBox(); + this.btnStopSearch2 = new DevComponents.DotNetBar.PanelEx(); + this.label7 = new System.Windows.Forms.Label(); + this.btnSetStock = new DevComponents.DotNetBar.PanelEx(); + this.label6 = new System.Windows.Forms.Label(); this.btnCancelActivity = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); this.txtSkipPriceEnd = new System.Windows.Forms.TextBox(); @@ -56,6 +68,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopOp = new DevComponents.DotNetBar.PanelEx(); this.btnSetActivity = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetInActivityProd = new DevComponents.DotNetBar.PanelEx(); this.chkProdInActivity = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.txtPage = new System.Windows.Forms.TextBox(); @@ -111,17 +124,18 @@ namespace TemuKJD.WXForms.ProductForms this.colPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colValidPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStock = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colIsGetActivityInProd = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.label6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.ucGroupBoxEx3.SuspendLayout(); + this.pnlStock.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.ucGroupBoxEx4.SuspendLayout(); this.ucGroupBoxEx1.SuspendLayout(); @@ -172,6 +186,7 @@ namespace TemuKJD.WXForms.ProductForms 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.pnlStock); this.ucGroupBoxEx3.Controls.Add(this.label6); this.ucGroupBoxEx3.Controls.Add(this.btnCancelActivity); this.ucGroupBoxEx3.Controls.Add(this.label2); @@ -184,11 +199,169 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx3.Controls.Add(this.btnSetActivity); this.ucGroupBoxEx3.Location = new System.Drawing.Point(450, 2); this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; - this.ucGroupBoxEx3.Size = new System.Drawing.Size(1039, 165); + this.ucGroupBoxEx3.Size = new System.Drawing.Size(1038, 165); this.ucGroupBoxEx3.TabIndex = 668; this.ucGroupBoxEx3.TabStop = false; this.ucGroupBoxEx3.Text = "活动设置"; // + // pnlStock + // + this.pnlStock.Controls.Add(this.label10); + this.pnlStock.Controls.Add(this.txtIntervalMin); + this.pnlStock.Controls.Add(this.label9); + this.pnlStock.Controls.Add(this.textBox2); + this.pnlStock.Controls.Add(this.chkSetStockLoop); + this.pnlStock.Controls.Add(this.label8); + this.pnlStock.Controls.Add(this.txtStockLow); + this.pnlStock.Controls.Add(this.btnStopSearch2); + this.pnlStock.Controls.Add(this.label7); + this.pnlStock.Controls.Add(this.btnSetStock); + this.pnlStock.Location = new System.Drawing.Point(555, 19); + this.pnlStock.Name = "pnlStock"; + this.pnlStock.Size = new System.Drawing.Size(301, 134); + this.pnlStock.TabIndex = 885; + this.pnlStock.Visible = false; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(250, 55); + this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(32, 17); + this.label10.TabIndex = 858; + this.label10.Text = "分钟"; + // + // txtIntervalMin + // + this.txtIntervalMin.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtIntervalMin.Location = new System.Drawing.Point(211, 51); + this.txtIntervalMin.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtIntervalMin.Name = "txtIntervalMin"; + this.txtIntervalMin.Size = new System.Drawing.Size(36, 25); + this.txtIntervalMin.TabIndex = 857; + this.txtIntervalMin.Text = "60"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(178, 55); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(32, 17); + this.label9.TabIndex = 856; + this.label9.Text = "间隔"; + // + // textBox2 + // + this.textBox2.Font = new System.Drawing.Font("微软雅黑", 10F); + this.textBox2.Location = new System.Drawing.Point(120, 51); + this.textBox2.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(57, 25); + this.textBox2.TabIndex = 855; + this.textBox2.Text = "1"; + // + // chkSetStockLoop + // + this.chkSetStockLoop.AutoSize = true; + this.chkSetStockLoop.Location = new System.Drawing.Point(14, 53); + this.chkSetStockLoop.Name = "chkSetStockLoop"; + this.chkSetStockLoop.Size = new System.Drawing.Size(111, 21); + this.chkSetStockLoop.TabIndex = 854; + this.chkSetStockLoop.Text = "循环设置库存为"; + this.chkSetStockLoop.UseVisualStyleBackColor = true; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(42, 59); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(0, 17); + this.label8.TabIndex = 820; + // + // txtStockLow + // + this.txtStockLow.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtStockLow.Location = new System.Drawing.Point(120, 12); + this.txtStockLow.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtStockLow.Name = "txtStockLow"; + this.txtStockLow.Size = new System.Drawing.Size(57, 25); + this.txtStockLow.TabIndex = 812; + this.txtStockLow.Text = "0"; + // + // btnStopSearch2 + // + this.btnStopSearch2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStopSearch2.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopSearch2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopSearch2.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopSearch2.Location = new System.Drawing.Point(231, 98); + this.btnStopSearch2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); + this.btnStopSearch2.Name = "btnStopSearch2"; + this.btnStopSearch2.Size = new System.Drawing.Size(58, 25); + this.btnStopSearch2.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopSearch2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopSearch2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopSearch2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopSearch2.Style.GradientAngle = 90; + this.btnStopSearch2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopSearch2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopSearch2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopSearch2.TabIndex = 805; + this.btnStopSearch2.Text = "停止操作"; + this.btnStopSearch2.Click += new System.EventHandler(this.btnStopSearch2_Click); + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(63, 16); + this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 813; + this.label7.Text = "库存数量"; + // + // btnSetStock + // + this.btnSetStock.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSetStock.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetStock.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSetStock.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetStock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSetStock.Location = new System.Drawing.Point(137, 98); + this.btnSetStock.Name = "btnSetStock"; + this.btnSetStock.Size = new System.Drawing.Size(91, 25); + this.btnSetStock.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetStock.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetStock.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetStock.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSetStock.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSetStock.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSetStock.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSetStock.Style.GradientAngle = 90; + this.btnSetStock.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetStock.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetStock.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetStock.TabIndex = 431; + this.btnSetStock.Text = "批量设置库存"; + this.btnSetStock.Click += new System.EventHandler(this.btnSetStock_Click); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(14, 31); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(161, 17); + this.label6.TabIndex = 875; + this.label6.Text = "“清凉季”+“开学季”活动"; + // // btnCancelActivity // this.btnCancelActivity.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -196,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnCancelActivity.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCancelActivity.DisabledBackColor = System.Drawing.Color.Empty; this.btnCancelActivity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnCancelActivity.Location = new System.Drawing.Point(933, 69); + this.btnCancelActivity.Location = new System.Drawing.Point(932, 69); this.btnCancelActivity.Name = "btnCancelActivity"; this.btnCancelActivity.Size = new System.Drawing.Size(84, 23); this.btnCancelActivity.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -345,7 +518,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnStopOp.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopOp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopOp.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopOp.Location = new System.Drawing.Point(933, 121); + this.btnStopOp.Location = new System.Drawing.Point(932, 121); this.btnStopOp.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnStopOp.Name = "btnStopOp"; this.btnStopOp.Size = new System.Drawing.Size(84, 23); @@ -372,7 +545,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSetActivity.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetActivity.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetActivity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetActivity.Location = new System.Drawing.Point(933, 31); + this.btnSetActivity.Location = new System.Drawing.Point(932, 31); this.btnSetActivity.Name = "btnSetActivity"; this.btnSetActivity.Size = new System.Drawing.Size(84, 23); this.btnSetActivity.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -396,6 +569,7 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.btnGetInActivityProd); this.ucGroupBoxEx4.Controls.Add(this.chkProdInActivity); this.ucGroupBoxEx4.Controls.Add(this.btnEmpty); this.ucGroupBoxEx4.Controls.Add(this.txtPage); @@ -409,15 +583,41 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "活动商品查询"; // + // btnGetInActivityProd + // + this.btnGetInActivityProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnGetInActivityProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetInActivityProd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetInActivityProd.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetInActivityProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetInActivityProd.Location = new System.Drawing.Point(17, 120); + this.btnGetInActivityProd.Name = "btnGetInActivityProd"; + this.btnGetInActivityProd.Size = new System.Drawing.Size(101, 25); + this.btnGetInActivityProd.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetInActivityProd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetInActivityProd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetInActivityProd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetInActivityProd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetInActivityProd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetInActivityProd.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetInActivityProd.Style.GradientAngle = 90; + this.btnGetInActivityProd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetInActivityProd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetInActivityProd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetInActivityProd.TabIndex = 867; + this.btnGetInActivityProd.Text = "查询已报名商品"; + this.btnGetInActivityProd.Click += new System.EventHandler(this.panelEx2_Click); + // // chkProdInActivity // this.chkProdInActivity.AutoSize = true; - this.chkProdInActivity.Location = new System.Drawing.Point(17, 75); + this.chkProdInActivity.Location = new System.Drawing.Point(17, 71); this.chkProdInActivity.Name = "chkProdInActivity"; - this.chkProdInActivity.Size = new System.Drawing.Size(171, 21); + this.chkProdInActivity.Size = new System.Drawing.Size(111, 21); this.chkProdInActivity.TabIndex = 854; - this.chkProdInActivity.Text = "查询所有商品（含已报名）"; + this.chkProdInActivity.Text = "查询已报名商品"; this.chkProdInActivity.UseVisualStyleBackColor = true; + this.chkProdInActivity.Visible = false; // // btnEmpty // @@ -501,9 +701,9 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearchOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchOrder.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchOrder.Location = new System.Drawing.Point(108, 120); + this.btnSearchOrder.Location = new System.Drawing.Point(124, 120); this.btnSearchOrder.Name = "btnSearchOrder"; - this.btnSearchOrder.Size = new System.Drawing.Size(82, 25); + this.btnSearchOrder.Size = new System.Drawing.Size(66, 25); this.btnSearchOrder.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearchOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSearchOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -861,19 +1061,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; 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))))); - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1035,19 +1235,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1064,6 +1264,7 @@ namespace TemuKJD.WXForms.ProductForms this.colPrice, this.colValidPrice, this.colStock, + this.colIsGetActivityInProd, this.colOpResult}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(0, 0); @@ -1095,8 +1296,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle19; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.ReadOnly = true; @@ -1153,8 +1354,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle20; this.colProductName.HeaderText = "商品名称"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1181,13 +1382,20 @@ namespace TemuKJD.WXForms.ProductForms // // colStock // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colStock.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colStock.DefaultCellStyle = dataGridViewCellStyle21; this.colStock.HeaderText = "库存"; this.colStock.Name = "colStock"; this.colStock.ReadOnly = true; this.colStock.Width = 60; // + // colIsGetActivityInProd + // + this.colIsGetActivityInProd.HeaderText = "是否是已报活动查询"; + this.colIsGetActivityInProd.Name = "colIsGetActivityInProd"; + this.colIsGetActivityInProd.ReadOnly = true; + this.colIsGetActivityInProd.Visible = false; + // // colOpResult // this.colOpResult.HeaderText = "操作结果"; @@ -1275,16 +1483,6 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(14, 31); - this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(161, 17); - this.label6.TabIndex = 875; - this.label6.Text = "“清凉季”+“开学季”活动"; - // // WXActivity618Form // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1303,6 +1501,8 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.ResumeLayout(false); this.ucGroupBoxEx3.ResumeLayout(false); this.ucGroupBoxEx3.PerformLayout(); + this.pnlStock.ResumeLayout(false); + this.pnlStock.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); this.ucGroupBoxEx4.ResumeLayout(false); @@ -1388,6 +1588,12 @@ namespace TemuKJD.WXForms.ProductForms private DevComponents.DotNetBar.PanelEx btnEmpty; private System.Windows.Forms.TextBox txtPage; private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtSkipPriceEnd; + private UserComponent.UcCheckBox chkSkipPriceEnd; + private System.Windows.Forms.Label label2; + private DevComponents.DotNetBar.PanelEx btnCancelActivity; + private UserComponent.UcCheckBox chkProdInActivity; + private System.Windows.Forms.Label label6; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName; @@ -1402,12 +1608,19 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewTextBoxColumn colPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colValidPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colStock; + private System.Windows.Forms.DataGridViewTextBoxColumn colIsGetActivityInProd; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; - private System.Windows.Forms.TextBox txtSkipPriceEnd; - private UserComponent.UcCheckBox chkSkipPriceEnd; - private System.Windows.Forms.Label label2; - private DevComponents.DotNetBar.PanelEx btnCancelActivity; - private UserComponent.UcCheckBox chkProdInActivity; - private System.Windows.Forms.Label label6; + private DevComponents.DotNetBar.PanelEx btnGetInActivityProd; + private System.Windows.Forms.TextBox txtStockLow; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.PanelEx btnStopSearch2; + private DevComponents.DotNetBar.PanelEx btnSetStock; + private System.Windows.Forms.Panel pnlStock; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.TextBox txtIntervalMin; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox textBox2; + private UserComponent.UcCheckBox chkSetStockLoop; + private System.Windows.Forms.Label label8; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs index 8e76b8b..bc3270d 100644 --- a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs +++ b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.cs @@ -43,6 +43,8 @@ namespace TemuKJD.WXForms.ProductForms public CancellationTokenSource cancellationTokenSource { get; set; } = null; public bool IsLoadComplate { get; set; } = false; + public ConcurrentList lstActivityInProd = new ConcurrentList(); + bool isInit = false; CheckBox chkSelectAll = null; public WxActivityData wxActivityData = new WxActivityData(); @@ -56,7 +58,16 @@ namespace TemuKJD.WXForms.ProductForms { PageEnd = txtPage.Text.ParseToInt(); - dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); + if (BaseClass.UserAuthority.Contains("活动库存")) + { + this.pnlStock.Visible = true; + } + else + { + this.pnlStock.Visible = false; + } + + dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_checked_shop_dic"); if (dicCheckedShopId == null) dicCheckedShopId = new Dictionary(); @@ -384,6 +395,7 @@ namespace TemuKJD.WXForms.ProductForms private void btnSearchProd_Click(object sender, EventArgs e) { + chkProdInActivity.Checked = false; var shopIdLst = dgvShop.Rows.Cast().Where(row => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); if (shopIdLst.Count <= 0) @@ -421,7 +433,9 @@ namespace TemuKJD.WXForms.ProductForms void GetActivityProductLst(List shopIdLst) { List shopLst = GlobalConfig.ShopLoginList.Where(s => shopIdLst.Contains(s.ShopId)).ToList(); + dgvSelectProduct.Rows.Clear(); this.wxActivityData = new WxActivityData(); + this.lstActivityInProd.Clear(); Invoke(new Action(() => { @@ -483,85 +497,167 @@ namespace TemuKJD.WXForms.ProductForms var getActivityProdRst = ""; if (chkProdInActivity.Checked) { - //getActivityProdRst = WXActivity.getProdInActivityList(shop, page, pageSize); - getActivityProdRst = WXActivity.getActivityProdList(shop, page, pageSize); - - Thread.Sleep(Randomx.GetId(150, 300)); - if (!getActivityProdRst.Contains("\"code\":0")) + if (1==1) { - ShowShopError(shop, getActivityProdRst); - break; - } - var totalNum = BaseRegex.GetIntJson(ref getActivityProdRst, "totalNum"); - totalPage = Math.Ceiling(totalNum * 1.0m / pageSize).ParseToInt(); - try - { - Invoke(new Action(() => - { - this.pbLoading.Visible = true; - this.statusBar.lblTaskStatus.Text = "正在查询店铺：" + shop.ShopAccount + " " + page + "/" + Math.Min(PageEnd, totalPage); - })); - var prodObjs = JsonHelper.JObjectParse(getActivityProdRst)["data"]; - WxActivityData dataTmp = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prodObjs)); - foreach (var prodRequest in dataTmp.requestProductInfoList.resultList) - { - if (this.wxActivityData.requestProductInfoList.resultList.Any(r => r.product.productId == prodRequest.product.productId && r.product.skuId == prodRequest.product.skuId)) - continue; + getActivityProdRst = WXActivity.getProdInActivityList(shop, page, pageSize); - prodRequest.shopId = shop.ShopId; - wxActivityData.requestProductInfoList.resultList.Add(prodRequest); + Thread.Sleep(Randomx.GetId(150, 300)); + if (!getActivityProdRst.Contains("\"code\":0")) + { + ShowShopError(shop, getActivityProdRst); + break; } - foreach (var prod in dataTmp.productList) + var totalNum = BaseRegex.GetIntJson(ref getActivityProdRst, "totalNum"); + totalPage = Math.Ceiling(totalNum * 1.0m / pageSize).ParseToInt(); + + try { - if (this.wxActivityData.productList.Any(p => p.productKey.productId == prod.productKey.productId)) - continue; - wxActivityData.productList.Add(prod); - var signCnt = wxActivityData.requestProductInfoList.resultList - .Where(r => r.product.productId == prod.productKey.productId && r.isAdded == true).ToList().Count; - var signCntStr = signCnt > 0 ? "，" + signCnt + "个已报名" : ""; Invoke(new Action(() => { - var rowIndex = this.dgvSelectProduct.Rows.Add( - false, - shop.ShopId, - shop.ShopAccount, - "登录", - "进店", - prod.productKey.productId, - "", - prod.info.headImg.FirstOrDefault(), - DataGridViewExtension.defaultBitmap, - prod.info.title, - "sku数量：" + prod.productSkus.Count + "个" + signCntStr, - prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, - prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, - prod.info.totalStockNum, - "" - ); - - if (prod.productKey.productId == "10000852942152") - { - var x = JsonHelper.SerializeObject(prod); - } - - dgvSelectProduct.Rows[rowIndex].Height = 60; - //Color color = Color.Red; - //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "在售") - // color = Color.Blue; - //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "下架") - // color = Color.Purple; - //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "草稿箱") - // color = Color.DarkOrange; - //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "回收站") - // color = Color.Gray; - //dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Style.ForeColor = color; + this.pbLoading.Visible = true; + this.statusBar.lblTaskStatus.Text = "正在查询店铺：" + shop.ShopAccount + " " + page + "/" + Math.Min(PageEnd, totalPage); })); + var prodObjs = JsonHelper.JObjectParse(getActivityProdRst)["productList"]; + var dataTmpList = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(prodObjs)); + //lstActivityInProd.AddRange(dataTmpList); + + foreach (var prod in dataTmpList) + { + if (lstActivityInProd.Any(p => p.productId == prod.productId && p.skuId == prod.skuId)) + continue; + lstActivityInProd.Add(prod); + //var signCnt = wxActivityData.requestProductInfoList.resultList + // .Where(r => r.product.productId == prod.productId && r.isAdded == true).ToList().Count; + //var signCntStr = signCnt > 0 ? "，" + signCnt + "个已报名" : ""; + Invoke(new Action(() => + { + var rowIndex = this.dgvSelectProduct.Rows.Add( + false, + shop.ShopId, + shop.ShopAccount, + "登录", + "进店", + prod.productId, + prod.skuId, + prod.productImgUrl, + DataGridViewExtension.defaultBitmap, + prod.productName, + prod.skuName + "(" + prod.skuId + ")", //"sku数量：" + prod.productSkus.Count + "个" + signCntStr, + prod.beforePlatformDiscountCommPrice, //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, + prod.afterPlatformDiscountCommPrice, //prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, + prod.totalStockNum, + "已报名", + "" + ); + + if (prod.productId == "10000852942152") + { + var x = JsonHelper.SerializeObject(prod); + } + + dgvSelectProduct.Rows[rowIndex].Height = 60; + //Color color = Color.Red; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "在售") + // color = Color.Blue; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "下架") + // color = Color.Purple; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "草稿箱") + // color = Color.DarkOrange; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "回收站") + // color = Color.Gray; + //dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Style.ForeColor = color; + })); + } + } + catch (Exception ex) + { + } } - catch (Exception ex) + + if (1 == 2) { + getActivityProdRst = WXActivity.getActivityProdList(shop, page, pageSize); + + Thread.Sleep(Randomx.GetId(150, 300)); + if (!getActivityProdRst.Contains("\"code\":0")) + { + ShowShopError(shop, getActivityProdRst); + break; + } + var totalNum = BaseRegex.GetIntJson(ref getActivityProdRst, "totalNum"); + totalPage = Math.Ceiling(totalNum * 1.0m / pageSize).ParseToInt(); + + try + { + Invoke(new Action(() => + { + this.pbLoading.Visible = true; + this.statusBar.lblTaskStatus.Text = "正在查询店铺：" + shop.ShopAccount + " " + page + "/" + Math.Min(PageEnd, totalPage); + })); + var prodObjs = JsonHelper.JObjectParse(getActivityProdRst)["data"]; + WxActivityData dataTmp = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(prodObjs)); + foreach (var prodRequest in dataTmp.requestProductInfoList.resultList) + { + if (this.wxActivityData.requestProductInfoList.resultList.Any(r => r.product.productId == prodRequest.product.productId && r.product.skuId == prodRequest.product.skuId)) + continue; + + prodRequest.shopId = shop.ShopId; + wxActivityData.requestProductInfoList.resultList.Add(prodRequest); + } + foreach (var prod in dataTmp.productList) + { + if (this.wxActivityData.productList.Any(p => p.productKey.productId == prod.productKey.productId)) + continue; + wxActivityData.productList.Add(prod); + var signCnt = wxActivityData.requestProductInfoList.resultList + .Where(r => r.product.productId == prod.productKey.productId && r.isAdded == true).ToList().Count; + var signCntStr = signCnt > 0 ? "，" + signCnt + "个已报名" : ""; + Invoke(new Action(() => + { + var rowIndex = this.dgvSelectProduct.Rows.Add( + false, + shop.ShopId, + shop.ShopAccount, + "登录", + "进店", + prod.productKey.productId, + "", + prod.info.headImg.FirstOrDefault(), + DataGridViewExtension.defaultBitmap, + prod.info.title, + "sku数量：" + prod.productSkus.Count + "个" + signCntStr, + prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, + prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, + prod.info.totalStockNum, + "" + ); + + if (prod.productKey.productId == "10000852942152") + { + var x = JsonHelper.SerializeObject(prod); + } + + dgvSelectProduct.Rows[rowIndex].Height = 60; + //Color color = Color.Red; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "在售") + // color = Color.Blue; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "下架") + // color = Color.Purple; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "草稿箱") + // color = Color.DarkOrange; + //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "回收站") + // color = Color.Gray; + //dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Style.ForeColor = color; + })); + } + } + catch (Exception ex) + { + + } } } else @@ -619,6 +715,7 @@ namespace TemuKJD.WXForms.ProductForms prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, prod.productSkus.Min(s => s.productSkuInfo.salePrice) * 0.01m + " - " + prod.productSkus.Max(s => s.productSkuInfo.salePrice) * 0.01m, prod.info.totalStockNum, + "", "" ); @@ -932,6 +1029,11 @@ namespace TemuKJD.WXForms.ProductForms } skus = skus.Where(s => s.isAdded != true).ToList(); + + // 活动价低价sku，平台半小时后就会更新，不再设置 + //var lowPrice = skus.Min(s => s.salePrice); + //var lowPriceSku = skus.FirstOrDefault(s => s.salePrice == lowPrice); + foreach (var sku in skus) { JObject prodObj = new JObject(); @@ -944,6 +1046,11 @@ namespace TemuKJD.WXForms.ProductForms prodObj["activityPrice"] = Math.Floor(sku.salePrice.ParseToInt() * (100 - discountPercent) * 0.01m).ParseToInt(); else prodObj["activityPrice"] = sku.salePrice.ParseToInt() - discountPrice; + + //if (chkLowAcitvityPrice.Checked && skus.Count > 1 && sku == lowPriceSku) + //{ + // prodObj["activityPrice"] = (txtLowAcitvityPrice.Text.ParseToDecimal() * 100).ParseToInt(); + //} })); prodObj["stockMode"] = sku.defaultStockMode; jArr.Add(prodObj); @@ -1085,9 +1192,17 @@ namespace TemuKJD.WXForms.ProductForms bool hasProdForCancelActivity = false; foreach (var row in rowLstTmp) { + Thread.Sleep(Randomx.GetId(10, 20)); var prodId = row.Cells["colDraftId"].Value.ParseToString(); + + if (jArr.ParseToString().Contains(prodId)) + { + continue; + } + var skus = this.wxActivityData.requestProductInfoList.resultList.Where(p => p.product.productId == prodId).ToList(); + var skuIds = rowLstTmp.Where(r => r.Cells["colDraftId"].Value.ParseToString() == prodId).Select(r => r.Cells["colSkuId"].Value.ParseToString()).ToList(); //if (chkSkipPriceEnd.Checked && txtSkipPriceEnd.Text.Trim().Length > 0 && skus.Any(s => (s.salePrice.ParseToInt() * 0.01m).ParseToString().EndsWith(txtSkipPriceEnd.Text.Trim()))) //{ @@ -1095,7 +1210,7 @@ namespace TemuKJD.WXForms.ProductForms // continue; //} - if (skus.All(s => s.isAdded != true)) + if (skus.All(s => s.isAdded != true) && skuIds.Count == 0) { Invoke(new Action(() => { row.Cells["colOpResult"].Value = "已取消报名"; })); } @@ -1105,22 +1220,35 @@ namespace TemuKJD.WXForms.ProductForms Invoke(new Action(() => { row.Cells["colOpResult"].Value = "正在取消报名"; })); } - skus = skus.Where(s => s.isAdded == true).ToList(); - foreach (var sku in skus) + if (skus.Count > 0) { - JObject prodObj = new JObject(); - prodObj["productId"] = prodId; - prodObj["skuId"] = sku.product.skuId; - //prodObj["activityStockNum"] = 0; - //Invoke(new Action(() => - //{ - // if (cmbType.Text == "价格比例") - // prodObj["activityPrice"] = (sku.salePrice.ParseToInt() * (100 - discountPercent) * 0.01m).ParseToInt(); - // else - // prodObj["activityPrice"] = sku.salePrice.ParseToInt() - discountPrice; - //})); - //prodObj["stockMode"] = sku.defaultStockMode; - jArr.Add(prodObj); + skus = skus.Where(s => s.isAdded == true).ToList(); + foreach (var sku in skus) + { + JObject prodObj = new JObject(); + prodObj["productId"] = prodId; + prodObj["skuId"] = sku.product.skuId; + //prodObj["activityStockNum"] = 0; + //Invoke(new Action(() => + //{ + // if (cmbType.Text == "价格比例") + // prodObj["activityPrice"] = (sku.salePrice.ParseToInt() * (100 - discountPercent) * 0.01m).ParseToInt(); + // else + // prodObj["activityPrice"] = sku.salePrice.ParseToInt() - discountPrice; + //})); + //prodObj["stockMode"] = sku.defaultStockMode; + jArr.Add(prodObj); + } + } + else if (skuIds.Count > 0) + { + foreach (var skuId in skuIds) + { + JObject prodObj = new JObject(); + prodObj["productId"] = prodId; + prodObj["skuId"] = skuId; + jArr.Add(prodObj); + } } } signActivityObj["productList"] = jArr; @@ -1316,6 +1444,291 @@ namespace TemuKJD.WXForms.ProductForms })); }, cancellationTokenSource.Token); } + + private void panelEx2_Click(object sender, EventArgs e) + { + chkProdInActivity.Checked = true; + var shopIdLst = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + if (shopIdLst.Count <= 0) + { + BaseMsgForm.ShowError("未勾选查询店铺！"); + return; + } + btnSearchOrder.Enabled = false; + pbLoading.Visible = true; + if (cancellationTokenSource != null) + cancellationTokenSource.Cancel(); + cancellationTokenSource = new CancellationTokenSource(); + dgvSelectProduct.Rows.Clear(); + Task.Run(() => + { + GetActivityProductLst(shopIdLst); + Invoke(new Action(() => + { + if (cancellationTokenSource.IsCancellationRequested) + { + this.statusBar.lblTaskStatus.Text = "活动商品查询停止"; + BaseMsgForm.ShowInfo("活动商品查询停止"); + } + else + { + this.statusBar.lblTaskStatus.Text = "活动商品查询完毕"; + BaseMsgForm.ShowInfo("活动商品查询完毕"); + } + pbLoading.Visible = false; + btnSearchOrder.Enabled = true; + })); + }, cancellationTokenSource.Token); + } + + private void btnStopSearch2_Click(object sender, EventArgs e) + { + if (this.cancellationTokenSource != null) + this.cancellationTokenSource.Cancel(); + } + + private void btnSetStock_Click(object sender, EventArgs e) + { + var rowLst = dgvSelectProduct.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); + if (rowLst.Count <= 0) + { + BaseMsgForm.ShowError("请勾选需要修改库存的商品！"); + return; + } + + this.pbLoading.Visible = true; + if (cancellationTokenSource != null && !cancellationTokenSource.IsCancellationRequested) + cancellationTokenSource.Cancel(); + cancellationTokenSource = new CancellationTokenSource(); + + DateTime nextTime = DateTime.Now; + + Task.Run(() => + { + do + { + if (DateTime.Now >= nextTime) + { + SetStock(rowLst); + } + nextTime = DateTime.Now.AddMinutes(txtIntervalMin.Text.ParseToInt()); + Thread.Sleep(1000); + } + while (chkSetStockLoop.Checked); + + Invoke(new Action(() => + { + if (cancellationTokenSource.IsCancellationRequested) + { + this.statusBar.lblTaskStatus.Text = "修改库存中断"; + BaseMsgForm.ShowInfo("修改库存中断"); + } + else + { + this.statusBar.lblTaskStatus.Text = "修改库存完毕"; + BaseMsgForm.ShowInfo("修改库存完毕"); + } + + this.pbLoading.Visible = false; + })); + }, cancellationTokenSource.Token); + } + + public void SetStock(List rowLst) + { + Invoke(new Action(() => + { + this.pbLoading.Visible = true; + this.statusBar.lblTaskStatus.Text = "正在报名活动" + "...".Substring(0, DateTime.Now.Second % 4); + this.statusBar.pgbTaskProgress.Maximum = rowLst.Count; + this.statusBar.UpdateProgressBar(0); + })); + + while (rowLst.Count > 0) + { + if (cancellationTokenSource.IsCancellationRequested) + break; + + var r0 = rowLst.FirstOrDefault(); + var shopId = r0.Cells["colSupplierId"].Value.ParseToString(); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + var rowLstTmp = rowLst.Where(r => r.Cells["colSupplierId"].Value.ParseToString() == shopId).Take(50).ToList(); + + foreach (var r in rowLstTmp) + { + rowLst.RemoveAll(rw => rw.Cells["colDraftId"].Value == r.Cells["colDraftId"].Value); + + Invoke(new Action(() => + { + this.statusBar.lblTaskStatus.Text = "正在取消报名活动" + "...".Substring(0, DateTime.Now.Second % 4); + this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); + r.Cells["colOpResult"].Value = ""; + })); + } + if (shop == null) + { + Invoke(new Action(() => + { + foreach (var r in rowLstTmp) + { + r.Cells["colOpResult"].Value = "店铺不存在"; + } + })); + continue; + } + if (shop.LoginStatus != "登录成功") + { + Invoke(new Action(() => + { + foreach (var r in rowLstTmp) + { + r.Cells["colOpResult"].Value = "店铺掉线"; + } + })); + continue; + } + + //{"cosignmentOrderId":"4436464658179189760","cosignmentProductList":[{"spuId":"10000826730228","skuId":"14511204738","cancelScene":2}],"orderId":"3736464645960385280"} + JObject signActivityObj = new JObject(); + signActivityObj["platformActivityId"] = "1269"; + var jArr = new JArray(); + bool hasProdForCancelActivity = false; + foreach (var row in rowLstTmp) + { + + Thread.Sleep(Randomx.GetId(10, 20)); + var prodId = row.Cells["colDraftId"].Value.ParseToString(); + + if (jArr.ParseToString().Contains(prodId)) + { + continue; + } + + var skus = this.wxActivityData.requestProductInfoList.resultList.Where(p => p.product.productId == prodId).ToList(); + var skuIds = rowLstTmp.Where(r => r.Cells["colDraftId"].Value.ParseToString() == prodId).Select(r => r.Cells["colSkuId"].Value.ParseToString()).ToList(); + + //if (chkSkipPriceEnd.Checked && txtSkipPriceEnd.Text.Trim().Length > 0 && skus.Any(s => (s.salePrice.ParseToInt() * 0.01m).ParseToString().EndsWith(txtSkipPriceEnd.Text.Trim()))) + //{ + // row.Cells["colOpResult"].Value = "价格尾数命中跳过"; + // continue; + //} + + if (skus.All(s => s.isAdded != true) && skuIds.Count == 0) + { + Invoke(new Action(() => { row.Cells["colOpResult"].Value = "已取消报名"; })); + } + else + { + hasProdForCancelActivity = true; + Invoke(new Action(() => { row.Cells["colOpResult"].Value = "正在取消报名"; })); + } + + if (skus.Count > 0) + { + skus = skus.Where(s => s.isAdded == true).ToList(); + foreach (var sku in skus) + { + JObject prodObj = new JObject(); + prodObj["productId"] = prodId; + prodObj["skuId"] = sku.product.skuId; + //prodObj["activityStockNum"] = 0; + //Invoke(new Action(() => + //{ + // if (cmbType.Text == "价格比例") + // prodObj["activityPrice"] = (sku.salePrice.ParseToInt() * (100 - discountPercent) * 0.01m).ParseToInt(); + // else + // prodObj["activityPrice"] = sku.salePrice.ParseToInt() - discountPrice; + //})); + //prodObj["stockMode"] = sku.defaultStockMode; + jArr.Add(prodObj); + } + } + else if (skuIds.Count > 0) + { + foreach (var skuId in skuIds) + { + JObject prodObj = new JObject(); + prodObj["productId"] = prodId; + prodObj["skuId"] = skuId; + jArr.Add(prodObj); + } + } + } + signActivityObj["productList"] = jArr; + signActivityObj["actionType"] = 1; + + if (!hasProdForCancelActivity) + continue; + + var signRst = WXActivity.signWxActivity(shop, signActivityObj); + Thread.Sleep(Randomx.GetId(500, 1000)); + if (!signRst.Contains("\"code\":0")) + { + if (signRst.Contains("biz magic invalid")) + { + WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + if (shop.LoginStatus != "登录成功") + { + Invoke(new Action(() => + { + foreach (var row in rowLstTmp) + { + row.Cells["colOpResult"].Value = "店铺掉线"; + } + })); + continue; + } + } + + var errmsg = BaseRegex.GetStringJson(ref signRst, "msg"); + if (string.IsNullOrWhiteSpace(errmsg)) + errmsg = signRst; + + Invoke(new Action(() => + { + foreach (var row in rowLstTmp) + { + row.Cells["colOpResult"].Value = errmsg; + } + })); + } + + JArray rstArr = new JArray(); + try + { + rstArr = JsonHelper.JObjectParse(signRst)["checkResultList"] as JArray; + if (rstArr == null) + rstArr = new JArray(); + } + catch + { } + + if (signRst.Contains("\"code\":0")) + { + foreach (var row in rowLstTmp) + { + if (row.Cells["colOpResult"].Value.ParseToString() == "已取消报名") + continue; + + var errStr = ""; + var prodId = row.Cells["colDraftId"].Value.ParseToString(); + var jObjs = rstArr.Where(a => a["product"]["productId"].ParseToString() == prodId).ToList(); + foreach (var jObj in jObjs) + { + if (!string.IsNullOrWhiteSpace(jObj["invalidString"].ParseToString())) + errStr += jObj["product"]["skuId"] + ":" + jObj["invalidString"] + ";"; + } + errStr = errStr.Trim(';'); + + Invoke(new Action(() => + { + row.Cells["colOpResult"].Value = "取消报名成功 " + errStr; + })); + } + } + } + } } public class WXActivity @@ -1368,7 +1781,7 @@ namespace TemuKJD.WXForms.ProductForms string url = "https://store.weixin.qq.com/shop-faas/mmeckolmarketingnode/activity/cgi/getPlatformInvestmentProductInfoList?token=&lang=zh_CN"; string refere = "https://store.weixin.qq.com/shop/marketingkol/activity/detail?id=" + activityId + "&curTab=2"; - string data = @"{""platformActivityId"":""" + activityId + @""",""pageNum"":" + page + @",""pageSize"":" + pageSize + @",""auditStatus"":2,""productId"":""""}"; + string data = @"{""platformActivityId"":""" + activityId + @""",""pageNum"":" + page + @",""pageSize"":" + pageSize + @",""auditStatus"":0,""productId"":""""}"; var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, refere); return result; @@ -1384,7 +1797,21 @@ namespace TemuKJD.WXForms.ProductForms } } - public class ActivityProd + public class GetActivityInProdInfo + { + public int code { get; set; } // 0 + public List productList { get; set; } + public int totalNum { get; set; } + public List statusNumber { get; set; } + } + + public class StatusNo + { + public int? status { get; set; } // 1, // 审核中 + public int? number { get; set; } // 3 // 数量3 + } + + public class ActivityInProd { public string requestTime { get; set; } // "1781096322", public string shopNickname { get; set; } // "夜笙供应链", diff --git a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.resx b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.resx index acbb923..d833935 100644 --- a/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.resx +++ b/TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.resx @@ -198,6 +198,9 @@ True + + True + True diff --git a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.Designer.cs index d736b55..dade287 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.Designer.cs @@ -1288,7 +1288,6 @@ namespace TemuKJD.WXForms.ProductForms this.colCheck.ReadOnly = true; this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colCheck.Visible = false; this.colCheck.Width = 30; // // colSelectId diff --git a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.cs b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.cs index 66d17d5..6130258 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdClearNoVisit260606Form.cs @@ -68,7 +68,7 @@ namespace TemuKJD.WXForms.ProductForms dgvShop.Columns["colSelect"].HeaderText = ""; chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; - this.dgvSelectProduct.AddSelectorColumn("colCheck"); + //this.dgvSelectProduct.AddSelectorColumn("colCheck"); dgvSelectProduct.AddImgColumn("colProductSkcPic", "colImgUrl"); dgvSelectProduct.AddImgColumn("colSkuFakeImg", "colSkuFakeImgUrl"); @@ -367,6 +367,7 @@ namespace TemuKJD.WXForms.ProductForms break; } case "": + case "选择": dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value; break; default: @@ -481,6 +482,10 @@ namespace TemuKJD.WXForms.ProductForms //getProdOnSaleRst = WXClearNoVisit260606.searchProduct(shop, 1, pageSize, spuIds, onSaleStatusCode); pageSize = 50; + if (page > 3) + { + + } getProdOnSaleRst = WxPlatformRecommendProdManage.searchProductWithSaleStatus(shop, page, pageSize, onSaleStatusCode); Thread.Sleep(Randomx.GetId(50, 100)); if (!getProdOnSaleRst.Contains("\"success\":true")) @@ -531,14 +536,14 @@ namespace TemuKJD.WXForms.ProductForms WXPlatformRecommendProdInfo recommendProd = new WXPlatformRecommendProdInfo(); recommendProd.product_id = wxProdObj["productId"].ParseToString(); recommendProd.title = wxProdObj["title"].ParseToString(); - var ViewUvCnt = productMetric.rowsMap + var ViewUvCnt = productMetric.rowsMap? .Where(r => r.value?.spu_id_ == recommendProd.product_id) .Sum(r => r.value?.shopxspu_growth_product_view_cnt_30d_2.ParseToInt()); - recommendProd.product_view_uv = ViewUvCnt.ParseToString(); - var PayCnt = productMetric.rowsMap + recommendProd.product_view_uv = ViewUvCnt.ParseToInt().ParseToString(); + var PayCnt = productMetric.rowsMap? .Where(r => r.value?.spu_id_ == recommendProd.product_id) .Sum(r => r.value?.shopxspu_growth_pay_product_cnt_30d_2.ParseToInt()); - recommendProd.pay_order_cnt = PayCnt.ParseToString(); + recommendProd.pay_order_cnt = PayCnt.ParseToInt().ParseToString(); if (ViewUvCnt > 0) recommendProds.Add(recommendProd); @@ -604,7 +609,7 @@ namespace TemuKJD.WXForms.ProductForms "", // 备注 "", // 操作结果 "删除", - BaseClass.StampToDateTime(wxProdObj["lastEditDraftTime"].ParseToInt()).ToString("yy-MM-dd HH:mm"), + BaseClass.StampToDateTime(wxProdObj["updateStatusTime"].ParseToInt()).ToString("yy-MM-dd HH:mm"), ""); dgvSelectProduct.Rows[rowIndex].Height = 60; diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs index 792d6f7..300f515 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs @@ -275,6 +275,7 @@ namespace Work._29Tools.Forms.UserForms user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance"); 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.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -303,6 +304,8 @@ namespace Work._29Tools.Forms.UserForms "+", Math.Max(2.2m, user.postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs index 6a03a28..afaa388 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs @@ -64,6 +64,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.pnlRefundPostagePerOrder = new System.Windows.Forms.Panel(); + this.lblRefundPostagePerOrderUserId = new System.Windows.Forms.Label(); + this.lblRefundPostagePerOrderUserInfo = new System.Windows.Forms.Label(); + this.panel6 = new System.Windows.Forms.Panel(); + this.numRefundPostagePerOrder = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.btnRefundPostagePerOrderCancel = new DevComponents.DotNetBar.PanelEx(); + this.btnRefundPostagePerOrder = new DevComponents.DotNetBar.PanelEx(); this.pnlPostagePerOrder = new System.Windows.Forms.Panel(); this.lblPostagePerOrderUserId = new System.Windows.Forms.Label(); this.lblPostagePerOrderUserInfo = new System.Windows.Forms.Label(); @@ -119,6 +127,8 @@ namespace TemuKJD.WXForms.ShopForms this.colBalancePlus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colRefundPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); @@ -131,6 +141,9 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.pnlRefundPostagePerOrder.SuspendLayout(); + this.panel6.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).BeginInit(); this.pnlPostagePerOrder.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numPostagePerOrder)).BeginInit(); @@ -484,6 +497,7 @@ namespace TemuKJD.WXForms.ShopForms // // splitContainer1.Panel1 // + this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder); this.splitContainer1.Panel1.Controls.Add(this.pnlBalance); this.splitContainer1.Panel1.Controls.Add(this.pnlShopPointsPerMonth); @@ -497,6 +511,131 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.SplitterDistance = 620; this.splitContainer1.TabIndex = 2; // + // pnlRefundPostagePerOrder + // + this.pnlRefundPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pnlRefundPostagePerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserId); + this.pnlRefundPostagePerOrder.Controls.Add(this.lblRefundPostagePerOrderUserInfo); + this.pnlRefundPostagePerOrder.Controls.Add(this.panel6); + this.pnlRefundPostagePerOrder.Location = new System.Drawing.Point(23, 85); + this.pnlRefundPostagePerOrder.Name = "pnlRefundPostagePerOrder"; + this.pnlRefundPostagePerOrder.Size = new System.Drawing.Size(360, 146); + this.pnlRefundPostagePerOrder.TabIndex = 13; + this.pnlRefundPostagePerOrder.Visible = false; + // + // lblRefundPostagePerOrderUserId + // + this.lblRefundPostagePerOrderUserId.AutoSize = true; + this.lblRefundPostagePerOrderUserId.Location = new System.Drawing.Point(256, 19); + this.lblRefundPostagePerOrderUserId.Name = "lblRefundPostagePerOrderUserId"; + this.lblRefundPostagePerOrderUserId.Size = new System.Drawing.Size(47, 17); + this.lblRefundPostagePerOrderUserId.TabIndex = 457; + this.lblRefundPostagePerOrderUserId.Text = "UserId"; + this.lblRefundPostagePerOrderUserId.Visible = false; + // + // lblRefundPostagePerOrderUserInfo + // + this.lblRefundPostagePerOrderUserInfo.AutoSize = true; + this.lblRefundPostagePerOrderUserInfo.Location = new System.Drawing.Point(20, 19); + this.lblRefundPostagePerOrderUserInfo.Name = "lblRefundPostagePerOrderUserInfo"; + this.lblRefundPostagePerOrderUserInfo.Size = new System.Drawing.Size(58, 17); + this.lblRefundPostagePerOrderUserInfo.TabIndex = 455; + this.lblRefundPostagePerOrderUserInfo.Text = "UserInfo"; + // + // 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.Controls.Add(this.numRefundPostagePerOrder); + this.panel6.Controls.Add(this.label18); + this.panel6.Controls.Add(this.btnRefundPostagePerOrderCancel); + this.panel6.Controls.Add(this.btnRefundPostagePerOrder); + this.panel6.Location = new System.Drawing.Point(23, 52); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(310, 57); + this.panel6.TabIndex = 454; + // + // numRefundPostagePerOrder + // + this.numRefundPostagePerOrder.DecimalPlaces = 2; + this.numRefundPostagePerOrder.Location = new System.Drawing.Point(119, 16); + this.numRefundPostagePerOrder.Maximum = new decimal(new int[] { + 100000, + 0, + 0, + 0}); + this.numRefundPostagePerOrder.Minimum = new decimal(new int[] { + 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}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(13, 19); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(116, 17); + this.label18.TabIndex = 456; + this.label18.Text = "退货每单运费金额："; + // + // btnRefundPostagePerOrderCancel + // + this.btnRefundPostagePerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRefundPostagePerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefundPostagePerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefundPostagePerOrderCancel.Location = new System.Drawing.Point(238, 16); + this.btnRefundPostagePerOrderCancel.Name = "btnRefundPostagePerOrderCancel"; + this.btnRefundPostagePerOrderCancel.Size = new System.Drawing.Size(56, 23); + this.btnRefundPostagePerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRefundPostagePerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRefundPostagePerOrderCancel.Style.GradientAngle = 90; + this.btnRefundPostagePerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRefundPostagePerOrderCancel.TabIndex = 458; + this.btnRefundPostagePerOrderCancel.Text = "取消"; + this.btnRefundPostagePerOrderCancel.Click += new System.EventHandler(this.btnRefundPostagePerOrderCancel_Click); + // + // btnRefundPostagePerOrder + // + this.btnRefundPostagePerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefundPostagePerOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefundPostagePerOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefundPostagePerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefundPostagePerOrder.Location = new System.Drawing.Point(179, 16); + this.btnRefundPostagePerOrder.Name = "btnRefundPostagePerOrder"; + this.btnRefundPostagePerOrder.Size = new System.Drawing.Size(56, 23); + this.btnRefundPostagePerOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefundPostagePerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefundPostagePerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefundPostagePerOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefundPostagePerOrder.Style.GradientAngle = 90; + this.btnRefundPostagePerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefundPostagePerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefundPostagePerOrder.TabIndex = 453; + this.btnRefundPostagePerOrder.Text = "确定"; + this.btnRefundPostagePerOrder.Click += new System.EventHandler(this.btnRefundPostagePerOrder_Click); + // // pnlPostagePerOrder // this.pnlPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1017,6 +1156,8 @@ namespace TemuKJD.WXForms.ShopForms this.colBalancePlus, this.colPostagePerOrder, this.colChangePostagePerOrder, + this.colRefundPostagePerOrder, + this.colChangeRefundPostagePerOrder, this.editColumn, this.deleteColumn}); this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1200,6 +1341,22 @@ namespace TemuKJD.WXForms.ShopForms this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; this.colChangePostagePerOrder.ReadOnly = true; // + // colRefundPostagePerOrder + // + this.colRefundPostagePerOrder.FillWeight = 60F; + this.colRefundPostagePerOrder.HeaderText = "每单退货快递费"; + this.colRefundPostagePerOrder.Name = "colRefundPostagePerOrder"; + this.colRefundPostagePerOrder.ReadOnly = true; + // + // colChangeRefundPostagePerOrder + // + this.colChangeRefundPostagePerOrder.FillWeight = 25F; + this.colChangeRefundPostagePerOrder.HeaderText = "改"; + this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; + this.colChangeRefundPostagePerOrder.ReadOnly = true; + this.colChangeRefundPostagePerOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colChangeRefundPostagePerOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // editColumn // this.editColumn.FillWeight = 40F; @@ -1265,6 +1422,11 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.pnlRefundPostagePerOrder.ResumeLayout(false); + this.pnlRefundPostagePerOrder.PerformLayout(); + this.panel6.ResumeLayout(false); + this.panel6.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).EndInit(); this.pnlPostagePerOrder.ResumeLayout(false); this.pnlPostagePerOrder.PerformLayout(); this.panel5.ResumeLayout(false); @@ -1355,6 +1517,14 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtCompany; private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel pnlRefundPostagePerOrder; + private System.Windows.Forms.Label lblRefundPostagePerOrderUserId; + private System.Windows.Forms.Label lblRefundPostagePerOrderUserInfo; + private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.NumericUpDown numRefundPostagePerOrder; + private System.Windows.Forms.Label label18; + private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrderCancel; + private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrder; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; @@ -1377,6 +1547,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs index 38bda60..a7750af 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs @@ -125,7 +125,8 @@ namespace TemuKJD.WXForms.ShopForms user.points = BaseRegex.GetIntJson(ref oStr, "points"); user.balance = BaseRegex.GetDecimalJson(ref oStr, "balance"); 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.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order"); + user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order"); user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id"); user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name"); var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name"); @@ -154,6 +155,8 @@ namespace TemuKJD.WXForms.ShopForms "+", Math.Max(2.2m, user.postage_per_order.ParseToDecimal()), (user.group_id == "3") ? "改" : null, + Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()), + (user.group_id == "3") ? "改" : null, user.group_id == "3" ? "添加店铺" : "", "编辑", "删除"); @@ -198,6 +201,7 @@ namespace TemuKJD.WXForms.ShopForms string authority = dgvUser.Rows[e.RowIndex].Cells["colAuthority"].Value.ParseToString(); 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(); var row = dgvUser.Rows[e.RowIndex]; if (columText == "编辑") { @@ -256,6 +260,15 @@ namespace TemuKJD.WXForms.ShopForms this.pnlPostagePerOrder.BringToFront(); this.lblPostagePerOrderUserId.Text = uid; } + if (columName == "colChangeRefundPostagePerOrder") + { + this.lblRefundPostagePerOrderUserInfo.Text = mobile + " - " + nickName; + this.numRefundPostagePerOrder.Value = refundPostagePerOrder; + this.pnlRefundPostagePerOrder.Tag = row; + this.pnlRefundPostagePerOrder.Visible = true; + this.pnlRefundPostagePerOrder.BringToFront(); + this.lblRefundPostagePerOrderUserId.Text = uid; + } } if (columText == "") row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool(); @@ -300,6 +313,7 @@ namespace TemuKJD.WXForms.ShopForms pnlShopPointsPerMonth.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); + pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y); this.txtSearch.GotFocus += TxtSearch_GotFocus; this.txtSearch.LostFocus += TxtSearch_LostFocus; @@ -504,5 +518,44 @@ namespace TemuKJD.WXForms.ShopForms { pnlPostagePerOrder.Visible = false; } + + private void btnRefundPostagePerOrder_Click(object sender, EventArgs e) + { + if (updateRefundPostagePerOrder(lblRefundPostagePerOrderUserId.Text)) + { + pnlRefundPostagePerOrder.Visible = false; + BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功"); + } + } + + public bool updateRefundPostagePerOrder(string userDbId, bool showFailBox = true) + { + string url = BaseClass.BuildObjString("user/update_user"); + string data = UserLogin.GetSignaturex(); + data += "&id=" + userDbId; + data += "&refund_postage_per_order=" + numRefundPostagePerOrder.Value; + + string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); + if (!html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg"); + if (showFailBox) + { + Invoke(new Action(() => { BaseMsgForm.ShowError(msg); })); + } + return false; + } + var row = dgvUser.Rows.Cast().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId); + if (row != null) + { + Invoke(new Action(() => { row.Cells["colRefundPostagePerOrder"].Value = numRefundPostagePerOrder.Value; })); + } + return true; + } + + private void btnRefundPostagePerOrderCancel_Click(object sender, EventArgs e) + { + pnlRefundPostagePerOrder.Visible = false; + } } } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx index 12fdf68..c6c54e2 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx @@ -183,6 +183,12 @@ True + + True + + + True + True diff --git a/Work/Initialization.cs b/Work/Initialization.cs index cad9bf1..a771240 100644 --- a/Work/Initialization.cs +++ b/Work/Initialization.cs @@ -706,13 +706,13 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no // File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound.zip")); // } //} - if (!FileBase.Exists("temp\\wxCatBound60323")) + if (!FileBase.Exists("temp\\wxCatBound60810")) { - if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "wxCatBound60323.zip", "temp\\wxCatBound60323.dll" + ".bak")) + if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "wxCatBound60810.zip", "temp\\wxCatBound60810.dll" + ".bak")) { - FileBase.Move("temp\\wxCatBound60323.dll" + ".bak", "temp\\wxCatBound60323.zip"); - ZipFile.ExtractToDirectory(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60323.zip"), Path.Combine(Environment.CurrentDirectory, "temp")); - File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60323.zip")); + FileBase.Move("temp\\wxCatBound60810.dll" + ".bak", "temp\\wxCatBound60810.zip"); + ZipFile.ExtractToDirectory(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60810.zip"), Path.Combine(Environment.CurrentDirectory, "temp")); + File.Delete(Path.Combine(Environment.CurrentDirectory, "temp\\wxCatBound60810.zip")); } } diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index 1ea004f..ed0cb6f 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -93,6 +93,7 @@ namespace Work BaseClass.ShopPointsPerMonth = BaseRegex.GetStringJson(ref html, "shop_points_per_month").ParseToInt(); BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance"); BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order")); + BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order")); BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id"); BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name"); BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");