暂存

Areas/Admin/Controllers/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -457,7 +457,7 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.ManageMakerCode = manage.MakerCode;
             ViewBag.ManageRealName = manage.RealName;
 
-            Users user = db.Users.FirstOrDefault(m => m.Id == editData.ManageUserId) ?? new Users();
+            Users user = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
             ViewBag.MakerCode = user.MakerCode;
             return View();
         }
@@ -475,6 +475,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("CreateMan", SysUserName); //创建人
+            Fields.Add("UpdateMan", SysUserName + "-" + SysRealName); //修改人
             Fields.Add("StoreName", data.StoreName); //仓库名称
             Fields.Add("FilePath", data.FilePath); //附件
             Fields.Add("Deposit", data.Deposit); //押金
@@ -483,11 +484,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
             }
-            var check = db.StoreHouse.Any(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId);
-            if (check)
-            {
-                return "创客" + MakerCode + "名下已存在分仓，不可再变更";
-            }
             Fields.Add("UserId", user.UserId); //仓库归属人
             Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
             Fields.Add("ManageMobile", data.ManageMobile);
@@ -498,116 +494,285 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
             }
+            Fields.Add("ManageUserId", manage.UserId); //仓库管理员
+            Fields.Add("Remark", data.Remark); //备注
+            Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库
+            Fields.Add("StoreKind", data.StoreKind); //仓库归属类型
+            Fields.Add("Status", data.Status);
+            Fields.Add("StoreStatus", data.Status);
             var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
             var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == sto.UserId).ToList();
             UserAccount userAccountOld = db.UserAccount.FirstOrDefault(m => m.Id == sto.UserId);
             UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
-            if (userAccount == null)
-            {
-                userAccount = db.UserAccount.Add(new UserAccount()
-                {
-                    Id = user.UserId,
-                    UserId = user.UserId,
-                }).Entity;
-                db.SaveChanges();
-            }
-            var checks = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == sto.UserId);
-            if (checks)
-            {
-                var storeHouseAmountPromiss = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == sto.UserId).ToList();
-                foreach (var item in storeHouseAmountPromiss)
-                {
-                    var info = storeHouseAmountPromiss.FirstOrDefault(m => m.Id == item.Id);
-                    info.UpdateDate = DateTime.Now;
-                    info.UpdateMan = SysRealName + "-" + SysUserName;
-                    info.ToUserId = user.UserId;
-                }
-            }
-            userAccount.StoreDeposit = data.Deposit;
-            userAccount.FixedAmount = userAccountOld.FixedAmount;
-            userAccount.ValidAmount = userAccountOld.ValidAmount;
-            userAccount.TempAmount = userAccountOld.TempAmount;
-            userAccount.TempAmountForBalance = userAccountOld.TempAmountForBalance;
-            userAccountOld.StoreDeposit = 0;
-            userAccountOld.ValidAmount = 0;
-            userAccountOld.FixedAmount = 0;
-            userAccountOld.TempAmount = 0;
-            userAccountOld.TempAmountForBalance = 0;
-            db.SaveChanges();
-            // RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
             decimal olddeposit = 0;//旧押金
             decimal newdeposit = 0;//新押金
             newdeposit = data.Deposit;
             olddeposit = sto.Deposit;
-            if (sto.OpId > 0)
+            if (sto.UserId != user.UserId)
             {
-                var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
-                if (newdeposit > olddeposit)
+                var check = db.StoreHouse.Any(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId);
+                if (check)
+                {
+                    return "创客" + MakerCode + "名下已存在分仓，不可再变更";
+                }
+                else
                 {
-                    var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                    if (userAccount == null)
                     {
-                        CreateDate = DateTime.Now,
-                        UserId = sto.OpId,
-                        SeoDescription = "分仓押金变更",
-                        OperateType = 1,
-                        UseAmount = newdeposit - olddeposit,
-                        BeforeAmount = amount.ValidAmount,
-                        AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
-                    }).Entity;
-                    opdb.SaveChanges();
+                        userAccount = db.UserAccount.Add(new UserAccount()
+                        {
+                            Id = user.UserId,
+                            UserId = user.UserId,
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    var checks = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == sto.UserId);
+                    if (checks)
+                    {
+                        var storeHouseAmountPromiss = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == sto.UserId).ToList();
+                        foreach (var item in storeHouseAmountPromiss)
+                        {
+                            var info = storeHouseAmountPromiss.FirstOrDefault(m => m.Id == item.Id);
+                            info.UpdateDate = DateTime.Now;
+                            info.UpdateMan = SysRealName + "-" + SysUserName;
+                            info.ToUserId = user.UserId;
+                        }
+                    }
+                    userAccount.UpdateMan = SysUserName + "-" + SysRealName;
+                    userAccount.StoreDeposit = data.Deposit;
+                    userAccount.FixedAmount = userAccountOld.FixedAmount;
+                    userAccount.ValidAmount = userAccountOld.ValidAmount;
+                    userAccount.TempAmount = userAccountOld.TempAmount;
+                    userAccount.TempAmountForBalance = userAccountOld.TempAmountForBalance;
+                    userAccountOld.UpdateMan = SysUserName + "-" + SysRealName;
+                    userAccountOld.StoreDeposit = 0;
+                    userAccountOld.ValidAmount = 0;
+                    userAccountOld.FixedAmount = 0;
+                    userAccountOld.TempAmount = 0;
+                    userAccountOld.TempAmountForBalance = 0;
+                    // db.SaveChanges();
+                    // RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
+                    if (sto.OpId > 0)
+                    {
+                        var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
+                        if (newdeposit > olddeposit)
+                        {
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = sto.OpId,
+                                SeoDescription = "分仓押金变更",
+                                OperateType = 1,
+                                UseAmount = newdeposit - olddeposit,
+                                BeforeAmount = amount.ValidAmount,
+                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                            }).Entity;
+                        }
+                        if (newdeposit < olddeposit)
+                        {
+                            var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                            {
+                                CreateDate = DateTime.Now,
+                                UserId = sto.OpId,
+                                SeoDescription = "分仓押金变更",
+                                OperateType = 2,
+                                UseAmount = olddeposit - newdeposit,
+                                BeforeAmount = amount.ValidAmount,
+                                AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                            }).Entity;
+                        }
+                        amount.ValidAmount -= sto.Deposit;
+                        amount.ValidAmount += data.Deposit;
+                    }
+                    var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
+                    var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+                    newUserInfo.UpdateMan = SysUserName + "-" + SysRealName;
+                    newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
+                    newUserInfo.StoreStock = oldUserInfo.StoreStock;
+                    newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
+                    oldUserInfo.UpdateMan = SysUserName + "-" + SysRealName;
+                    oldUserInfo.CreateStoreDate = null;
+                    oldUserInfo.StoreStock = 0;
+                    oldUserInfo.ThisMonthSend = 0;
+                    foreach (var item in store)
+                    {
+                        var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
+                        var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
+                        storeInfo.UpdateMan = SysUserName + "-" + SysRealName;
+                        storeInfo.UserId = user.UserId;
+                        storeInfo.ManageUserId = manage.UserId;
+                        storeInfo.ManagerEmail = data.ManagerEmail;
+                        storeInfo.ManageMobile = data.ManageMobile;
+                        storeInfo.Address = data.Address;
+                        storeInfo.Areas = data.Areas;
+                        storeInfo.LimitTopUserId = data.LimitTopUserId;
+                        storeInfo.FilePath = data.FilePath;
+                        storeInfo.Deposit = data.Deposit;
+                        storeInfo.Remark = data.Remark;
+                        storeOp.UpdateDate = DateTime.Now;
+                        storeOp.QueryCount = user.UserId;
+                    }
+
                 }
-                if (newdeposit < olddeposit)
+            }
+            else
+            {
+                userAccount.UpdateMan = SysUserName + "-" + SysRealName;
+                userAccount.StoreDeposit = data.Deposit;
+                if (sto.OpId > 0)
                 {
-                    var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                    var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
+                    if (newdeposit > olddeposit)
                     {
-                        CreateDate = DateTime.Now,
-                        UserId = sto.OpId,
-                        SeoDescription = "分仓押金变更",
-                        OperateType = 2,
-                        UseAmount = olddeposit - newdeposit,
-                        BeforeAmount = amount.ValidAmount,
-                        AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
-                    }).Entity;
-                    opdb.SaveChanges();
+                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = sto.OpId,
+                            SeoDescription = "分仓押金变更",
+                            OperateType = 1,
+                            UseAmount = newdeposit - olddeposit,
+                            BeforeAmount = amount.ValidAmount,
+                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                        }).Entity;
+                    }
+                    if (newdeposit < olddeposit)
+                    {
+                        var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = sto.OpId,
+                            SeoDescription = "分仓押金变更",
+                            OperateType = 2,
+                            UseAmount = olddeposit - newdeposit,
+                            BeforeAmount = amount.ValidAmount,
+                            AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+                        }).Entity;
+                    }
+                    amount.ValidAmount -= sto.Deposit;
+                    amount.ValidAmount += data.Deposit;
+                }
+                foreach (var item in store)
+                {
+                    var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
+                    storeInfo.UpdateMan = SysUserName + "-" + SysRealName;
+                    storeInfo.UserId = user.UserId;
+                    storeInfo.ManageUserId = manage.UserId;
+                    storeInfo.ManagerEmail = data.ManagerEmail;
+                    storeInfo.ManageMobile = data.ManageMobile;
+                    storeInfo.Address = data.Address;
+                    storeInfo.Areas = data.Areas;
+                    storeInfo.LimitTopUserId = data.LimitTopUserId;
+                    storeInfo.FilePath = data.FilePath;
+                    storeInfo.Deposit = data.Deposit;
+                    storeInfo.Remark = data.Remark;
                 }
-                amount.ValidAmount -= sto.Deposit;
-                amount.ValidAmount += data.Deposit;
-                opdb.SaveChanges();
-            }
-            var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
-            var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
-            newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
-            newUserInfo.StoreStock = oldUserInfo.StoreStock;
-            newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
-            oldUserInfo.CreateStoreDate = null;
-            oldUserInfo.StoreStock = 0;
-            oldUserInfo.ThisMonthSend = 0;
-            foreach (var item in store)
-            {
-                var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
-                var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
-                storeInfo.Deposit = data.Deposit;
-                storeInfo.UserId = user.UserId;
-                storeInfo.ManageUserId = manage.UserId;
-                storeInfo.ManagerEmail = data.ManagerEmail;
-                storeInfo.ManageMobile = data.ManageMobile;
-                storeInfo.Address = data.Address;
-                storeInfo.Areas = data.Areas;
-                storeInfo.LimitTopUserId = data.LimitTopUserId;
-                storeInfo.FilePath = data.FilePath;
-                storeInfo.Deposit = data.Deposit;
-                storeInfo.Remark = data.Remark;
-                storeOp.UpdateDate = DateTime.Now;
-                storeOp.QueryCount = user.UserId;
             }
             db.SaveChanges();
             opdb.SaveChanges();
-            Fields.Add("ManageUserId", manage.UserId); //仓库管理员
-            Fields.Add("Remark", data.Remark); //备注
-            Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库
-            Fields.Add("StoreKind", data.StoreKind); //仓库归属类型
-            Fields.Add("Status", data.Status);
-            Fields.Add("StoreStatus", data.Status);
+
+
+            // var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == sto.UserId).ToList();
+            // UserAccount userAccountOld = db.UserAccount.FirstOrDefault(m => m.Id == sto.UserId);
+            // UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
+            // if (userAccount == null)
+            // {
+            //     userAccount = db.UserAccount.Add(new UserAccount()
+            //     {
+            //         Id = user.UserId,
+            //         UserId = user.UserId,
+            //     }).Entity;
+            //     db.SaveChanges();
+            // }
+            // var checks = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == sto.UserId);
+            // if (checks)
+            // {
+            //     var storeHouseAmountPromiss = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == sto.UserId).ToList();
+            //     foreach (var item in storeHouseAmountPromiss)
+            //     {
+            //         var info = storeHouseAmountPromiss.FirstOrDefault(m => m.Id == item.Id);
+            //         info.UpdateDate = DateTime.Now;
+            //         info.UpdateMan = SysRealName + "-" + SysUserName;
+            //         info.ToUserId = user.UserId;
+            //     }
+            // }
+            // userAccount.StoreDeposit = data.Deposit;
+            // userAccount.FixedAmount = userAccountOld.FixedAmount;
+            // userAccount.ValidAmount = userAccountOld.ValidAmount;
+            // userAccount.TempAmount = userAccountOld.TempAmount;
+            // userAccount.TempAmountForBalance = userAccountOld.TempAmountForBalance;
+            // userAccountOld.StoreDeposit = 0;
+            // userAccountOld.ValidAmount = 0;
+            // userAccountOld.FixedAmount = 0;
+            // userAccountOld.TempAmount = 0;
+            // userAccountOld.TempAmountForBalance = 0;
+            // db.SaveChanges();
+            // // RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
+            // decimal olddeposit = 0;//旧押金
+            // decimal newdeposit = 0;//新押金
+            // newdeposit = data.Deposit;
+            // olddeposit = sto.Deposit;
+            // if (sto.OpId > 0)
+            // {
+            //     var amount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sto.OpId) ?? new OpModels.UserAccount();
+            //     if (newdeposit > olddeposit)
+            //     {
+            //         var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+            //         {
+            //             CreateDate = DateTime.Now,
+            //             UserId = sto.OpId,
+            //             SeoDescription = "分仓押金变更",
+            //             OperateType = 1,
+            //             UseAmount = newdeposit - olddeposit,
+            //             BeforeAmount = amount.ValidAmount,
+            //             AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+            //         }).Entity;
+            //         opdb.SaveChanges();
+            //     }
+            //     if (newdeposit < olddeposit)
+            //     {
+            //         var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
+            //         {
+            //             CreateDate = DateTime.Now,
+            //             UserId = sto.OpId,
+            //             SeoDescription = "分仓押金变更",
+            //             OperateType = 2,
+            //             UseAmount = olddeposit - newdeposit,
+            //             BeforeAmount = amount.ValidAmount,
+            //             AfterAmount = amount.ValidAmount + newdeposit - olddeposit,
+            //         }).Entity;
+            //         opdb.SaveChanges();
+            //     }
+            //     amount.ValidAmount -= sto.Deposit;
+            //     amount.ValidAmount += data.Deposit;
+            //     opdb.SaveChanges();
+            // }
+            // var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
+            // var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+            // newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
+            // newUserInfo.StoreStock = oldUserInfo.StoreStock;
+            // newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
+            // oldUserInfo.CreateStoreDate = null;
+            // oldUserInfo.StoreStock = 0;
+            // oldUserInfo.ThisMonthSend = 0;
+            // foreach (var item in store)
+            // {
+            //     var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
+            //     var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
+            //     storeInfo.UserId = user.UserId;
+            //     storeInfo.ManageUserId = manage.UserId;
+            //     storeInfo.ManagerEmail = data.ManagerEmail;
+            //     storeInfo.ManageMobile = data.ManageMobile;
+            //     storeInfo.Address = data.Address;
+            //     storeInfo.Areas = data.Areas;
+            //     storeInfo.LimitTopUserId = data.LimitTopUserId;
+            //     storeInfo.FilePath = data.FilePath;
+            //     storeInfo.Deposit = data.Deposit;
+            //     storeInfo.Remark = data.Remark;
+            //     storeOp.UpdateDate = DateTime.Now;
+            //     storeOp.QueryCount = user.UserId;
+            // }
+            // db.SaveChanges();
+            // opdb.SaveChanges();
 
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreHouse", "update");
@@ -639,7 +804,7 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.ManageMakerCode = manage.MakerCode;
             ViewBag.ManageRealName = manage.RealName;
 
-            Users user = db.Users.FirstOrDefault(m => m.Id == editData.ManageUserId) ?? new Users();
+            Users user = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
             ViewBag.MakerCode = user.MakerCode;
             return View();
         }

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录