Merge branch 'feature-dgy-后台优化' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -511,7 +511,18 @@ namespace MySystem.Areas.Admin.Controllers
                 db.SaveChanges();
             }
             userAccount.StoreDeposit = data.Deposit;
+            userAccount.ValidAmount = userAccountOld.ValidAmount;
+            userAccount.TempAmount = userAccountOld.TempAmount;
+            userAccount.TempAmountForBalance = userAccountOld.TempAmountForBalance;
             userAccountOld.StoreDeposit = 0;
+            userAccountOld.ValidAmount = 0;
+            userAccountOld.TempAmount = 0;
+            userAccountOld.TempAmountForBalance = 0;
+            // Obj.Add("Amount", query.ValidAmount); //可用总额度
+            // Obj.Add("TotalAmount", query.FixedAmount + query.TempAmount + query.TempAmountForBalance); //总额度
+            // Obj.Add("FixedAmount", query.FixedAmount); //固定额度
+            // Obj.Add("TempAmount", query.TempAmount + query.TempAmountForBalance); //临时额度
+            // Obj.Add("LeaderBalanceAmount", amount); //保证金额度
             db.SaveChanges();
             // RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
             decimal olddeposit = 0;//旧押金