Merge branch 'develop' of http://47.109.31.237:13000/kxs-end/admin-server into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -790,7 +790,8 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         List<decimal> prizes = new List<decimal>();
                         decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-                        if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6 || pos.BrandId == 8 || pos.BrandId == 9)
+                        KqProducts product = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
+                        if (product.NoticeMoneyUnit == 2)
                         {
                             ActPrize = ActPrize / 100;
                         }

Controllers/HomeController.cs

@@ -179,20 +179,29 @@ namespace MySystem.Controllers
         public string test(string p)
         {
             
-            BsModels.WebCMSEntities db = new BsModels.WebCMSEntities();
-            var sysadmins = db.SysAdmin.ToList();
-            foreach(var sysadmin in sysadmins)
-            {
-                BsModels.SysAdmin edit = db.SysAdmin.FirstOrDefault(m => m.Id == sysadmin.Id);
-                if(edit != null)
-                {
-                    string pwd = function.get_Random(8);
-                    edit.Password = function.MD5_32(pwd);
-                    db.SaveChanges();
-                    function.WriteLog(edit.AdminName + ":" + pwd, "pwd");
-                }
-            }
-            db.Dispose();
+            // BsModels.WebCMSEntities db = new BsModels.WebCMSEntities();
+            // var sysadmins = db.SysAdmin.ToList();
+            // foreach(var sysadmin in sysadmins)
+            // {
+            //     BsModels.SysAdmin edit = db.SysAdmin.FirstOrDefault(m => m.Id == sysadmin.Id);
+            //     if(edit != null)
+            //     {
+            //         string pwd = function.get_Random(8);
+            //         edit.Password = function.MD5_32(pwd);
+            //         db.SaveChanges();
+            //         function.WriteLog(edit.AdminName + ":" + pwd, "pwd");
+            //     }
+            // }
+            // db.Dispose();
+
+            // WebCMSEntities db = new WebCMSEntities();
+            // List<string> nos = new List<string>();
+            // nos.Add("BC2024010814562964923941884");
+            // List<UserCashRecord> list = db.UserCashRecord.Where(m => nos.Contains(m.CashOrderNo)).ToList();
+            // foreach (UserCashRecord edit in list)
+            // {
+            //     RedisDbconn.Instance.AddList("JkCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+            // }
             return "ok";
         }