调整

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1577,7 +1577,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var amount = 0;
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
-                var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0 && m.OpId == 0);
+                var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == 0);
                 var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
                 if (brandInfo.Name.Contains("电签"))
                 {
@@ -1639,7 +1639,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         else
                         {
-                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0).ToList();
+                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0).ToList();
                             var posCount = pos.Count();
                             var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
                             if (brandInfo.Name.Contains("电签"))
@@ -1677,7 +1677,7 @@ namespace MySystem.Areas.Admin.Controllers
                             var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId && m.StoreKind != 2);
                             if (storeInfo.OpId == 0)
                             {
-                                var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0).ToList();
+                                var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0).ToList();
                                 var posCount = pos.Count();
                                 var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
                                 if (brandInfo.Name.Contains("电签"))
@@ -1836,7 +1836,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var amount = 0;
                 var tamount = 0;
                 var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
-                var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0 && m.OpId == storeInfo.OpId);
+                var posCount = db.PosMachinesTwo.Count(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == storeInfo.OpId);
                 var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
                 if (brandInfo.Name.Contains("电签"))
                 {
@@ -1900,7 +1900,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         else
                         {
-                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
+                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
                             var posCount = pos.Count();
                             var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(store.BrandId));
                             if (brandInfo.Name.Contains("电签"))
@@ -1942,8 +1942,8 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     //扣减押金
-                    userAmount.ValidAmount -= deposit;
-                    opdb.SaveChanges();
+                    // userAmount.ValidAmount -= deposit;
+                    // opdb.SaveChanges();
                     if (!string.IsNullOrEmpty(error))
                     {
                         return "Warning|" + error;
@@ -1956,7 +1956,7 @@ namespace MySystem.Areas.Admin.Controllers
                             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, StoreId);
                             db.SaveChanges();
                             var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId && m.StoreKind != 2);
-                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
+                            var pos = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.OpId == sysAdmin.UserId).ToList();
                             foreach (var items in pos)
                             {
                                 var posInfo = pos.FirstOrDefault(m => m.Id == items.Id) ?? new PosMachinesTwo();

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -391,22 +391,29 @@ namespace MySystem.Areas.Admin.Controllers
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 2);
                 var query = opdb.StoreMachineApply.FirstOrDefault(m => m.Id == id);
+                string[] amountlist = query.SeoTitle.Split(',');
+                decimal ValidAmount = decimal.Parse(amountlist[0]);
+                decimal TotalAmt = decimal.Parse(amountlist[1]);
+                decimal ValidForGetAmount = decimal.Parse(amountlist[2]);
                 var users = opdb.UserAccount.FirstOrDefault(m => m.Status == 0 && m.UserId == query.UserId) ?? new UserAccount();
                 if (users.Id > 0)
                 {
-                    users.ValidAmount += query.UseAmount;
                     var amountRecord = opdb.AmountRecord.Add(new AmountRecord()
                     {
                         CreateDate = DateTime.Now,
                         CreateMan = SysUserName + "-" + SysRealName,
                         SeoDescription = "机具申请驳回",
                         OperateType = 1,//增加
-                        BeforeAmount = users.ValidAmount,
-                        AfterAmount = users.ValidAmount + query.UseAmount,
+                        BeforeAmount = users.ValidAmount+ users.TotalAmt + users.ValidForGetAmount,
+                        AfterAmount = users.ValidAmount+ users.TotalAmt + users.ValidForGetAmount + query.UseAmount,
                         UseAmount = query.UseAmount,
                         UserId = query.UserId,
                         ApplyId = query.Id,
                     }).Entity;
+
+                    users.ValidAmount += ValidAmount;
+                    users.TotalAmt += TotalAmt;
+                    users.ValidForGetAmount += ValidForGetAmount;
                     opdb.SaveChanges();
                 }
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, id);
@@ -570,6 +577,12 @@ namespace MySystem.Areas.Admin.Controllers
             List<SendInfo> sendInfos = new List<SendInfo>();
             List<CheckSendInfo> checksendInfos = new List<CheckSendInfo>();
             StoreMachineApply apply = opdb.StoreMachineApply.FirstOrDefault(m => m.Id == data.Id) ?? new StoreMachineApply();
+
+            string[] amountlist = apply.SeoTitle.Split(',');
+            decimal ValidAmount = decimal.Parse(amountlist[0]);
+            decimal TotalAmt = decimal.Parse(amountlist[1]);
+            decimal ValidForGetAmount = decimal.Parse(amountlist[2]);
+
             JsonData ApplyList = JsonMapper.ToObject(apply.SendSn);
             decimal ApplyAmount = 0;
             decimal Amount = 0;
@@ -716,6 +729,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, int> storeData = new Dictionary<string, int>();
             Dictionary<string, int> toStoreData = new Dictionary<string, int>();
+            var amount = 0;
             for (int index = 1; index < list.Count; index++)
             {
                 JsonData dr = list[index];
@@ -726,6 +740,18 @@ namespace MySystem.Areas.Admin.Controllers
                 string OutNote = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
 
                 BrandId = Convert.ToInt32(Brand);
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandId);
+                if (brandInfo != null)
+                {
+                    if (brandInfo.Name.Contains("电签"))
+                    {
+                        amount = 100;
+                    }
+                    if (brandInfo.Name.Contains("大POS"))
+                    {
+                        amount = 150;
+                    }
+                }
 
                 if (BrandId == 1) FromStoreId = 7;
                 if (BrandId == 2) FromStoreId = 721;
@@ -832,6 +858,24 @@ namespace MySystem.Areas.Admin.Controllers
 
                         //添加机具所属运营中心
                         machine.OpId = tostore.UserId;
+
+                        //额度标记
+                        if (ValidAmount >= amount)
+                        {
+                            ValidAmount -= amount;
+                            machine.OpReserveKind = 3;
+                        }
+                        else if (TotalAmt >= amount)
+                        {
+                            TotalAmt -= amount;
+                            machine.OpReserveKind = 1;
+                        }
+                        else if (ValidForGetAmount >= amount)
+                        {
+                            ValidForGetAmount -= amount;
+                            machine.OpReserveKind = 2;
+                        }
+
                         db.SaveChanges();
                     }
                 }

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -98,15 +98,18 @@ namespace MySystem.Areas.Admin.Controllers
                 SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["MakerName"] = sysAdmin.MakerName;
-                
+
                 //登陆地址
                 dic["LoginUrl"] = OpHost + "/Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345") + "/Login";
 
-                //实缴额度
+                //未使用用额度
                 UserAccount userAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort == Id) ?? new UserAccount();
                 dic["TotalAmt"] = userAccount.TotalAmt;
 
-                //当前额度
+                //可提现额度
+                dic["ValidForGetAmount"] = userAccount.ValidForGetAmount;
+
+                //关联分仓额度
                 dic["ValidAmount"] = userAccount.ValidAmount;
 
                 //已提现金额
@@ -219,7 +222,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Sort = edit.Id,//所属运营中心
                             CreateMan = SysUserName + "_" + SysRealName,
                             Details = "运营中心管理员，可以操作运营中心所有权限",
-                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_2_2,1_2_3,1_3,1_3_1,1_3_1_import,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_4_3,1_4_3_edit,1_4_3_base,1_4_3_audit,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
+                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_2_2,1_3,1_3_1,1_3_1_import,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_4_3,1_4_3_edit,1_4_3_base,1_4_3_audit,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
                             Name = "运营中心管理员",
 
                         }).Entity;
@@ -549,7 +552,7 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 修改运营中心账户金额
+        #region 修改运营中心未使用额度
 
         public IActionResult EditAmt(string right, int Id = 0)
         {
@@ -563,44 +566,49 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 修改运营中心账户金额
+        #region 修改运营中心未使用额度
 
         [HttpPost]
         public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind)
         {
-            int OpId = data.UserId;
-            var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == OpId);
+            var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
+            var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
+            decimal BeforeAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更前总金额
             //扣减
-            if (Kind == 1 && decimal.Parse(OperationAmount) > account.ValidAmount)
+            if (Kind == 1 && decimal.Parse(OperationAmount) > account.TotalAmt)
             {
-                return "账号额度不足";
+                return "未使用额度不足";
             }
             int OperateType = 0;
-            if (Kind == 1 && decimal.Parse(OperationAmount) <= account.ValidAmount)
+            var description = "";
+            if (Kind == 1 && decimal.Parse(OperationAmount) <= account.TotalAmt)
             {
-                account.ValidAmount -= decimal.Parse(OperationAmount);
-                account.TotalAmount -= decimal.Parse(OperationAmount);
-                OperateType = 1;//系统扣减
+                account.TotalAmt -= decimal.Parse(OperationAmount);
+                OperateType = 2;//系统扣减
+                description ="系统扣减";
             }
-            else if (Kind == 1 && decimal.Parse(OperationAmount) > account.ValidAmount)
+            else if (Kind == 1 && decimal.Parse(OperationAmount) > account.TotalAmt)
             {
-                return "扣减金额大于可用额度";
+                return "扣减金额大于未使用额度";
             }
             //增加
             else if (Kind == 2)
             {
-                account.ValidAmount += decimal.Parse(OperationAmount);
-                account.TotalAmount += decimal.Parse(OperationAmount);
-                OperateType = 2;//系统增加
+                account.TotalAmt += decimal.Parse(OperationAmount);
+                OperateType = 1;//系统增加
+                description ="系统增加";
             }
+            decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
+
             AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
             {
                 CreateDate = DateTime.Now,
-                UserId = OpId, //运营中心Id
+                SeoDescription = description,
+                UserId = sysAdmin.UserId, //运营中心Id
                 CreateMan = SysUserName + "-" + SysRealName,
                 UseAmount = decimal.Parse(OperationAmount),//操作金额
-                BeforeAmount = account.ValidAmount,//使用前剩余额度
-                AfterAmount = account.ValidAmount + decimal.Parse(OperationAmount),//使用后剩余额度
+                BeforeAmount = BeforeAmount,//使用前剩余额度
+                AfterAmount = AfterAmount,//使用后剩余额度
                 OperateType = OperateType,//操作类别
             }).Entity;
             opdb.SaveChanges();
@@ -612,7 +620,7 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 修改账户金额
+        #region 修改运营中心可提现额度
 
         public IActionResult EditBalance(string right, int Id = 0)
         {
@@ -625,78 +633,49 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
-        #region 修改账户金额
+        #region 修改运营中心可提现额度
 
         [HttpPost]
         public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind)
         {
-            int OpId = data.UserId;
-            var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == OpId);
-            if ((Kind == 1 || Kind == 3) && decimal.Parse(OperationAmount) > account.BalanceAmount)
+            var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
+            var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
+            if ((Kind == 1) && decimal.Parse(OperationAmount) > account.ValidForGetAmount)
             {
                 return "账号余额不足";
             }
-            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-            int ChangeType = 0;
-            if (Kind == 1 && decimal.Parse(OperationAmount) <= account.BalanceAmount)
-            {
-                account.BalanceAmount -= decimal.Parse(OperationAmount);
-                account.FreezeAmount += decimal.Parse(OperationAmount);
-                ChangeType = 61;
-            }
-            else if (Kind == 1 && decimal.Parse(OperationAmount) > account.BalanceAmount)
-            {
-                return "冻结金额大于余额";
-            }
-            else if (Kind == 2 && decimal.Parse(OperationAmount) <= account.FreezeAmount)
-            {
-                account.BalanceAmount += decimal.Parse(OperationAmount);
-                account.FreezeAmount -= decimal.Parse(OperationAmount);
-                ChangeType = 62;
-            }
-            else if (Kind == 2 && decimal.Parse(OperationAmount) > account.FreezeAmount)
-            {
-                return "解冻金额大于冻结金额";
-            }
-            else if (Kind == 3 && decimal.Parse(OperationAmount) <= account.BalanceAmount)
+            decimal BeforeAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更前总金额
+            int OperateType = 0;
+            var description = "";
+            if (Kind == 1 && decimal.Parse(OperationAmount) <= account.ValidForGetAmount)
             {
-                account.TotalAmount -= decimal.Parse(OperationAmount);
-                account.BalanceAmount -= decimal.Parse(OperationAmount);
-                ChangeType = 63;
+                account.ValidForGetAmount -= decimal.Parse(OperationAmount);
+                OperateType = 2;
+                description ="系统扣减";
             }
-            else if (Kind == 3 && decimal.Parse(OperationAmount) > account.BalanceAmount)
+            else if (Kind == 1 && decimal.Parse(OperationAmount) > account.ValidForGetAmount)
             {
-                return "扣减金额大于余额";
+                return "扣减金额大于可提现额度";
             }
-            else if (Kind == 4)
+            else if (Kind == 2)
             {
-                account.TotalAmount += decimal.Parse(OperationAmount);
-                account.BalanceAmount += decimal.Parse(OperationAmount);
-                ChangeType = 64;
+                account.ValidForGetAmount += decimal.Parse(OperationAmount);
+                OperateType = 1;
+                description ="系统增加";
             }
-            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-            UserAccountRecord userAccountRecord = opdb.UserAccountRecord.Add(new UserAccountRecord()
+            decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
+            AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
             {
                 CreateDate = DateTime.Now,
+                SeoDescription = description,
+                UserId = sysAdmin.UserId, //运营中心Id
                 CreateMan = SysUserName + "-" + SysRealName,
-                UpdateMan = SysUserName + "-" + SysRealName,
-                UserId = OpId, //运营中心Id
-                ChangeType = ChangeType, //变动类型
-                ChangeAmount = decimal.Parse(OperationAmount), //变更金额
-                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                Remark = Note,
+                UseAmount = decimal.Parse(OperationAmount),//操作金额
+                BeforeAmount = BeforeAmount,//使用前剩余额度
+                AfterAmount = AfterAmount,//使用后剩余额度
+                OperateType = OperateType,//操作类别
             }).Entity;
             opdb.SaveChanges();
-            RedisDbconn.Instance.Set("OpUserAccount:" + OpId, account);
             AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
             opdb.SaveChanges();
             return "success";
@@ -705,21 +684,5 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 修改账户金额
-
-        [HttpPost]
-        public string LoginUrl(string Ids)
-        {
-            int Id = int.Parse(Ids);
-            var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new OpModels.SysAdmin();
-            if (sysAdmin.Id > 0)
-            {
-                return Host + "/Admin/" + dbconn.Encrypt3DES(sysAdmin.Sort.ToString(), "kxs12345") + "/Login";
-            }
-            return "success";
-        }
-        #endregion
-
-
     }
 }

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -345,67 +345,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);//设置提现记录为成功
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
-                var userCashRecord = opdb.UserCashRecord.FirstOrDefault(m => m.Id == id) ?? new UserCashRecord();
-                if (userCashRecord.Id > 0)
-                {
-                    UserAccount account = opdb.UserAccount.FirstOrDefault(m => m.UserId == Convert.ToInt32(userCashRecord.UserId));
-                    if (account != null)
-                    {
-                        account.QueryCount = 1;
-                        decimal TradeAmount = userCashRecord.TradeAmount;
-                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                        opdb.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            CreateDate = DateTime.Now,
-                            UserId = userCashRecord.UserId, //运营中心
-                            ChangeType = 3, //变动类型
-                            ProductType = 99, //产品类型
-                            ChangeAmount = userCashRecord.ActualTradeAmount, //变更金额
-                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                        });
-                        opdb.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            CreateDate = DateTime.Now,
-                            UserId = userCashRecord.UserId, //运营中心
-                            ChangeType = 4, //变动类型
-                            ProductType = 99, //产品类型
-                            ChangeAmount = userCashRecord.TradeFee, //变更金额
-                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                        });
-                        opdb.UserAccountRecord.Add(new UserAccountRecord()
-                        {
-                            CreateDate = DateTime.Now,
-                            UserId = userCashRecord.UserId, //运营中心
-                            ChangeType = 5, //变动类型
-                            ProductType = 99, //产品类型
-                            ChangeAmount = userCashRecord.ManageFee, //变更金额
-                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                        });
-                        opdb.SaveChanges();
-                        RedisDbconn.Instance.Set("OpUserAccount:" + userCashRecord.UserId, account);
-                    }
-                }
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);                
             }
             opdb.SaveChanges();
             return "success";
@@ -605,26 +545,18 @@ namespace MySystem.Areas.Admin.Controllers
                 if (account != null)
                 {
                     decimal TradeAmount = edit.TradeAmount;
-                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                    account.BalanceAmount += TradeAmount;//返回余额
-                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                    opdb.UserAccountRecord.Add(new UserAccountRecord()
+                    decimal BeforeAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更前总金额
+                    decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount + TradeAmount; //变更后总金额
+                    account.ValidForGetAmount += TradeAmount;//返回可提现余额
+                    opdb.AmountRecord.Add(new AmountRecord()
                     {
                         CreateDate = DateTime.Now,
                         UserId = edit.UserId, //创客
-                        ChangeType = 6, //变动类型
-                        ProductType = 99, //产品类型
-                        ChangeAmount = TradeAmount, //变更金额
-                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        SeoDescription = "提现驳回",
+                        UseAmount = TradeAmount, //变更金额
+                        BeforeAmount = BeforeAmount, //变更前总金额
+                        AfterAmount = AfterAmount, //变更后总金额
+                        OperateType = 1,
                     });
                     opdb.SaveChanges();
                 }

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -606,25 +606,16 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     decimal TradeAmount = edit.TradeAmount;
                     decimal BeforeTotalAmount = account.ValidForGetAmount; //变更前总金额
-                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
                     account.ValidForGetAmount += TradeAmount;//返回可提现余额
                     decimal AfterTotalAmount = account.ValidForGetAmount; //变更后总金额
-                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                    opdb.UserAccountRecord.Add(new UserAccountRecord()
+                    opdb.AmountRecord.Add(new AmountRecord()
                     {
                         CreateDate = DateTime.Now,
+                        SeoDescription = "提现驳回",
                         UserId = edit.UserId, //创客
-                        ChangeType = 6, //变动类型
-                        ProductType = 99, //产品类型
-                        ChangeAmount = TradeAmount, //变更金额
-                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        UseAmount = TradeAmount, //变更金额
+                        BeforeAmount = BeforeTotalAmount, //变更前总金额
+                        AfterAmount = AfterTotalAmount, //变更后总金额
                     });
                     opdb.SaveChanges();
                 }

Areas/Admin/Views/OperateServer/SysAdminOperate/EditBalance.cshtml

@@ -42,10 +42,8 @@
                             <div class="layui-input-inline">
                                 <select id="Kind" name="Kind" lay-verify="required|">
                                     <option value="">请选择</option>
-                                    <option value="1">冻结</option>
-                                    <option value="2">解冻</option>
-                                    <option value="3">扣减</option>
-                                    <option value="4">增加</option>
+                                    <option value="1">扣减</option>
+                                    <option value="2">增加</option>
                                 </select>
                             </div>
                         </div>

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -108,11 +108,11 @@
                     }
                     @if (RightInfo.Contains("," + right + "_EditAmt,"))
                     {
-                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="EditAmt"><i class="layui-icon layui-icon-edit"></i>修改可用额度</a>
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="EditAmt"><i class="layui-icon layui-icon-edit"></i>修改未使用额度</a>
                     }
                     @if (RightInfo.Contains("," + right + "_EditBalance,"))
                     {
-                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="EditBalance"><i class="layui-icon layui-icon-edit"></i>修改账户余额</a>
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="EditBalance"><i class="layui-icon layui-icon-edit"></i>修改可提现额度</a>
                     }
                 </script>
             </div>

wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js

@@ -81,6 +81,7 @@ function CheckImport(table, key, loadindex, index) {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -263,12 +264,6 @@ layui.config({
                 width: 150,
                 title: '可用小分仓额度',
                 sort: true
-            }, {
-                title: '操作',
-                width: 350,
-                align: 'center',
-                fixed: 'right',
-                toolbar: '#table-list-tools'
             }
             ]
         ],
@@ -281,6 +276,7 @@ layui.config({
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -470,6 +466,9 @@ layui.config({
         }
     });
     form.on('submit(LAY-list-front-searchall)', function (data) {
+        loadindex = layer.load(1, {
+            shade: [0.5, '#000']
+        });
         var field = data.field;
         field.ShowFlag = 1;
         field.StoreNo = "";

wwwroot/layuiadmin/modules_operate/StoreMachineApply_Admin.js

@@ -24,6 +24,7 @@ function ConfirmImport() {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -119,6 +120,7 @@ layui.config({
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -152,6 +154,9 @@ layui.config({
                 , area: ['500px', '450px']
                 , btn: ['确定', '取消']
                 , yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index]
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
@@ -215,7 +220,10 @@ layui.config({
             });
             // layer.full(perContent);
         } else if (obj.event === 'Close') {
-            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的可用额度', function (index) {
+            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的对应额度', function (index) {
+                loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
                 $.ajax({
                     type: "POST",
                     url: "/Admin/StoreMachineApplyOperate/Close?r=" + Math.random(1),
@@ -243,6 +251,9 @@ layui.config({
                 area: ['450px', '680px'],
                 btn: ['确定发货', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -376,12 +387,6 @@ var active = {
                         }
                     });
                 }, 300);
-
-
-
-
-
-
                 //监听提交
                 iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                     var field = data.field; //获取提交的字段

wwwroot/layuiadmin/modules_operate/StoreMachineApplys1_Admin.js

@@ -24,6 +24,7 @@ function ConfirmImport() {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -119,6 +120,7 @@ layui.config({
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -215,7 +217,10 @@ layui.config({
             });
             // layer.full(perContent);
         } else if (obj.event === 'Close') {
-            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的可用额度', function (index) {
+            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的对应额度', function (index) {
+                loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
                 $.ajax({
                     type: "POST",
                     url: "/Admin/StoreMachineApplysOperate/Close?r=" + Math.random(1),
@@ -243,6 +248,9 @@ layui.config({
                 area: ['450px', '680px'],
                 btn: ['确定发货', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -259,7 +267,7 @@ layui.config({
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        if(clickflag == 0) {
+                        if (clickflag == 0) {
                             clickflag = 1;
                             var field = data.field; //获取提交的字段
                             var userdata = "";
@@ -305,215 +313,209 @@ layui.config({
 
                 }
             });
-}
+        }
     });
 
 
-//监听搜索
-form.on('submit(LAY-list-front-search)', function (data) {
-    var field = data.field;
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
 
-    //执行重载
-    table.reload('LAY-list-manage', {
-        where: field,
-        page: {
-            curr: 1
-        }
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
     });
-});
-form.on('submit(LAY-list-front-searchall)', function (data) {
-    table.reload('LAY-list-manage', {
-        where: null,
-        page: {
-            curr: 1
-        }
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
     });
-});
 
-//事件
-var active = {
-    batchdel: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要删除的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplysOperate/Delete?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApplysOperate/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
                         }
-                    }
+                    });
                 });
-            });
+            }
         }
-    }
-    , add: function () {
-        var perContent = layer.open({
-            type: 2
-            , title: '分仓机具申请记录-添加'
-            , content: 'Add'
-            , maxmin: true
-            , area: ['500px', '450px']
-            , btn: ['确定', '取消']
-            , yes: function (index, layero) {
-                var iframeWindow = window['layui-layer-iframe' + index]
-                    , submitID = 'LAY-list-front-submit'
-                    , submit = layero.find('iframe').contents().find('#' + submitID);
+        , add: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '分仓机具申请记录-添加'
+                , content: 'Add'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                setTimeout(function () {
-                    layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
-                        var errObj = $(this).find('.layui-form-danger');
-                        if (errObj.length > 0) {
-                            iframeWindow.element.tabChange('mytabbar', String(i + 1));
-                            submit.click();
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
                         }
-                    });
-                }, 300);
-
-
-
-
-
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
 
-                //监听提交
-                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                    var field = data.field; //获取提交的字段
-                    var userdata = "";
-                    for (var prop in field) {
-                        userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
-                    }
-                    //提交 Ajax 成功后，静态更新表格中的数据
-                    //$.ajax({});
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApplysOperate/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
 
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        }
+        , ImportData: function () {
+            ExcelKind = 1;
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
+                }
+            });
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+        }
+        , ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/StoreMachineApplysOperate/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要开启的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/StoreMachineApplysOperate/Add?r=" + Math.random(1),
-                        data: userdata,
+                        url: "/Admin/StoreMachineApplysOperate/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
-                            layer.close(index); //关闭弹层
+                            layer.close(index);
                             if (data == "success") {
-                                table.reload('LAY-list-manage'); //数据刷新
+                                table.reload('LAY-list-manage');
                             } else {
                                 layer.msg(data);
                             }
                         }
                     });
                 });
-
-                submit.trigger('click');
             }
-        });
-        layer.full(perContent);
-    }
-    , ImportData: function () {
-        ExcelKind = 1;
-        layer.open({
-            type: 1,
-            title: '导入',
-            maxmin: false,
-            area: ['460px', '280px'],
-            content: $('#excelForm'),
-            cancel: function () {
-            }
-        });
-        $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
-    }
-    , ExportExcel: function () {
-        var userdata = '';
-        $(".layuiadmin-card-header-auto input").each(function (i) {
-            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-        });
-        $(".layuiadmin-card-header-auto select").each(function (i) {
-            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-        });
-        $.ajax({
-            type: "GET",
-            url: "/Admin/StoreMachineApplysOperate/ExportExcel?r=" + Math.random(1),
-            data: userdata,
-            dataType: "json",
-            success: function (data) {
-                data.Obj.unshift(data.Fields);
-                excel.exportExcel(data.Obj, data.Info, 'xlsx');
-            }
-        });
-    }
-    , Open: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要开启的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要开启吗？', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplysOperate/Open?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
-                        }
-                    }
-                });
-            });
         }
-    }
-    , Close: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要关闭的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要关闭吗？', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplysOperate/Close?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
+        , Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要关闭的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApplysOperate/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
                         }
-                    }
+                    });
                 });
-            });
+            }
         }
-    }
-};
+    };
 
-$('.layui-btn').on('click', function () {
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-});
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
 });

wwwroot/layuiadmin/modules_operate/StoreMachineApplys_Admin.js

@@ -24,6 +24,7 @@ function ConfirmImport() {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -119,6 +120,7 @@ layui.config({
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -243,6 +245,9 @@ layui.config({
                 area: ['450px', '680px'],
                 btn: ['确定发货', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -259,7 +264,7 @@ layui.config({
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        if(clickflag == 0) {
+                        if (clickflag == 0) {
                             clickflag = 1;
                             var field = data.field; //获取提交的字段
                             var userdata = "";
@@ -305,209 +310,209 @@ layui.config({
 
                 }
             });
-}
+        }
     });
 
 
-//监听搜索
-form.on('submit(LAY-list-front-search)', function (data) {
-    var field = data.field;
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
 
-    //执行重载
-    table.reload('LAY-list-manage', {
-        where: field,
-        page: {
-            curr: 1
-        }
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
     });
-});
-form.on('submit(LAY-list-front-searchall)', function (data) {
-    table.reload('LAY-list-manage', {
-        where: null,
-        page: {
-            curr: 1
-        }
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
     });
-});
 
-//事件
-var active = {
-    batchdel: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要删除的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplyOperate/Delete?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApplyOperate/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
                         }
-                    }
+                    });
                 });
-            });
+            }
         }
-    }
-    , add: function () {
-        var perContent = layer.open({
-            type: 2
-            , title: '分仓机具申请记录-添加'
-            , content: 'Add'
-            , maxmin: true
-            , area: ['500px', '450px']
-            , btn: ['确定', '取消']
-            , yes: function (index, layero) {
-                var iframeWindow = window['layui-layer-iframe' + index]
-                    , submitID = 'LAY-list-front-submit'
-                    , submit = layero.find('iframe').contents().find('#' + submitID);
+        , add: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '分仓机具申请记录-添加'
+                , content: 'Add'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                setTimeout(function () {
-                    layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
-                        var errObj = $(this).find('.layui-form-danger');
-                        if (errObj.length > 0) {
-                            iframeWindow.element.tabChange('mytabbar', String(i + 1));
-                            submit.click();
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
                         }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/StoreMachineApplyOperate/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
                     });
-                }, 300);
-                //监听提交
-                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                    var field = data.field; //获取提交的字段
-                    var userdata = "";
-                    for (var prop in field) {
-                        userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
-                    }
-                    //提交 Ajax 成功后，静态更新表格中的数据
-                    //$.ajax({});
 
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        }
+        , ImportData: function () {
+            ExcelKind = 1;
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
+                }
+            });
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+        }
+        , ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/StoreMachineApplyOperate/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要开启的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/StoreMachineApplyOperate/Add?r=" + Math.random(1),
-                        data: userdata,
+                        url: "/Admin/StoreMachineApplyOperate/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
-                            layer.close(index); //关闭弹层
+                            layer.close(index);
                             if (data == "success") {
-                                table.reload('LAY-list-manage'); //数据刷新
+                                table.reload('LAY-list-manage');
                             } else {
                                 layer.msg(data);
                             }
                         }
                     });
                 });
-
-                submit.trigger('click');
             }
-        });
-        layer.full(perContent);
-    }
-    , ImportData: function () {
-        ExcelKind = 1;
-        layer.open({
-            type: 1,
-            title: '导入',
-            maxmin: false,
-            area: ['460px', '280px'],
-            content: $('#excelForm'),
-            cancel: function () {
-            }
-        });
-        $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
-    }
-    , ExportExcel: function () {
-        var userdata = '';
-        $(".layuiadmin-card-header-auto input").each(function (i) {
-            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-        });
-        $(".layuiadmin-card-header-auto select").each(function (i) {
-            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-        });
-        $.ajax({
-            type: "GET",
-            url: "/Admin/StoreMachineApplyOperate/ExportExcel?r=" + Math.random(1),
-            data: userdata,
-            dataType: "json",
-            success: function (data) {
-                data.Obj.unshift(data.Fields);
-                excel.exportExcel(data.Obj, data.Info, 'xlsx');
-            }
-        });
-    }
-    , Open: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要开启的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要开启吗？', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplyOperate/Open?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
-                        }
-                    }
-                });
-            });
         }
-    }
-    , Close: function () {
-        var checkStatus = table.checkStatus('LAY-list-manage')
-            , data = checkStatus.data; //得到选中的数据
-        if (data.length < 1) {
-            parent.layer.msg("请选择要关闭的项");
-        } else {
-            var ids = "";
-            $.each(data, function (index, value) {
-                ids += data[index].Id + ",";
-            });
-            ids = ids.substring(0, ids.length - 1);
-            var index = layer.confirm('确定要关闭吗？', function (index) {
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/StoreMachineApplyOperate/Close?r=" + Math.random(1),
-                    data: "Id=" + ids,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index);
-                        if (data == "success") {
-                            table.reload('LAY-list-manage');
-                        } else {
-                            layer.msg(data);
+        , Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要关闭的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/StoreMachineApplyOperate/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
                         }
-                    }
+                    });
                 });
-            });
+            }
         }
-    }
-};
+    };
 
-$('.layui-btn').on('click', function () {
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-});
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
 });

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -22,6 +22,7 @@ function ConfirmImport() {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -132,11 +133,15 @@ layui.config({
                 sort: true
             }, {
                 field: 'TotalAmt',
-                title: '实缴额度',
+                title: '未使用额度',
+                sort: true
+            }, {
+                field: 'ValidForGetAmount',
+                title: '可提现额度',
                 sort: true
             }, {
                 field: 'ValidAmount',
-                title: '当前额度',
+                title: '关联分仓额度',
                 sort: true
             }, {
                 field: 'WithdrawAmount',
@@ -173,6 +178,7 @@ layui.config({
         text: '对不起，加载出现异常！',
         done: function (res, curr, count) {
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -200,12 +206,15 @@ layui.config({
             var tr = $(obj.tr);
             var perContent = layer.open({
                 type: 2,
-                title: '修改运营中心可用金额',
+                title: '修改未使用金额',
                 content: 'EditAmt?Id=' + data.Id,
                 maxmin: false,
                 area: ['550px', '550px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -254,12 +263,15 @@ layui.config({
             var tr = $(obj.tr);
             var perContent = layer.open({
                 type: 2,
-                title: '修改运营中心金额',
+                title: '修改可提现金额',
                 content: 'EditBalance?Id=' + data.Id,
                 maxmin: false,
                 area: ['550px', '550px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -314,6 +326,9 @@ layui.config({
                 area: ['500px', '450px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -413,12 +428,15 @@ layui.config({
         add: function () {
             var perContent = layer.open({
                 type: 2,
-                title: '后台管理员-添加',
+                title: '运营中心管理员-添加',
                 content: 'Add',
                 maxmin: true,
                 area: ['500px', '450px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);

wwwroot/layuiadmin/modules_operate/UserCashRecord_Admin.js

@@ -42,6 +42,7 @@ function CheckImport(table, key, loadindex, index) {
 }
 
 var excel;
+var loadindex;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
 }).extend({
@@ -206,6 +207,7 @@ layui.config({
             $("#FailAmount").text(res.other.FailAmount);
             $("#WaitAmount").text(res.other.WaitAmount);            
             $(".layui-none").text("无数据");
+            layer.close(loadindex);
         }
     });
 
@@ -270,12 +272,6 @@ layui.config({
                             }
                         });
                     }, 300);
-
-
-
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段
@@ -319,6 +315,9 @@ layui.config({
                 area: ['500px', '450px'],
                 btn: ['确定', '取消'],
                 yes: function (index, layero) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     var iframeWindow = window['layui-layer-iframe' + index],
                         submitID = 'LAY-list-front-submit',
                         submit = layero.find('iframe').contents().find('#' + submitID);
@@ -442,12 +441,6 @@ layui.config({
                             }
                         });
                     }, 300);
-
-
-
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段
@@ -557,6 +550,9 @@ layui.config({
                 });
                 ids = ids.substring(0, ids.length - 1);
                 var index = layer.confirm('确定要设为成功状态吗？', function (index) {
+                    loadindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     $.ajax({
                         type: "POST",
                         url: "/Admin/UserCashRecordOperate/BatchSetting?r=" + Math.random(1),