Merge branch 'feature-dgy-后台优化' into DuGuYang

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -511,8 +511,28 @@ namespace MySystem.Areas.Admin.Controllers
                 }).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;//旧押金