Merge branch 'feature-dgy-辅助工具添加30天内注销恢复' into feature-dgy-后台测试

AppStart/Helper/LeaderAmountMonthChangeQueue.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Linq;
-using System.Data;
-using MySystem;
-using MySystem.Models;
-using Library;
-using LitJson;
-
-/// <summary>
-/// 每月一号记录上月盟主储蓄金和可提现余额
-/// </summary>
-public class LeaderAmountMonthChangeQueue
-{
-    public readonly static LeaderAmountMonthChangeQueue Instance = new LeaderAmountMonthChangeQueue();
-    private LeaderAmountMonthChangeQueue()
-    {
-    }
-
-    public void Start()
-    {
-        Thread th = new Thread(StartDo);
-        th.IsBackground = true;
-        th.Start();
-    }
-
-    private void StartDo()
-    {
-        while (true)
-        {
-            // if (DateTime.Now.Day == 1)
-            if (DateTime.Now.Hour < 18)
-            {
-                try
-                {
-                    string check = function.ReadInstance("/LeaderAmountMonthChange/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                    if (string.IsNullOrEmpty(check))
-                    {
-                        function.WritePage("/LeaderAmountMonthChange/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
-                        WebCMSEntities db = new WebCMSEntities();
-                        var leaders = db.Leaders.Select(m => new { m.UserId, m.ExpiredDate }).ToList();
-                        foreach (var item in leaders)
-                        {
-                            var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.UserId) ?? new UserAccount();
-                            var leaderInfo = db.Leaders.FirstOrDefault(m => m.Id == item.UserId) ?? new Leaders();
-                            db.LeaderReconRecord.Add(new LeaderReconRecord()
-                            {
-                                CreateDate = DateTime.Now,
-                                UserId = item.UserId,
-                                StatMonth = DateTime.Now.ToString("yyyy-MM"),
-                                ReserveAmount = userAccount.LeaderReserve,
-                                BalanceAmount = userAccount.LeaderBalanceAmount
-                            });
-                            db.SaveChanges();
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "每月一号记录上月盟主储蓄金和可提现余额线程异常");
-                }
-            }
-            Thread.Sleep(1000);
-        }
-    }
-}

AppStart/Helper/SycnProfitServiceV3.cs

@@ -272,14 +272,18 @@ namespace MySystem
             CustomerSqlConn.op("update UserAccount a set BalanceAmount=BalanceAmount+(select ProfitRate from UserProfit where Id=a.Id),TotalAmount=TotalAmount+(select ProfitRate from UserProfit where Id=a.Id) where Id in (select Id from UserProfit)", conn);
 
             string Month = DateTime.Now.AddDays(-90).ToString("yyyy-MM");
+            
+            CustomerSqlConn.op("delete from UserFriend", conn);
+            
+            CustomerSqlConn.op("insert into UserFriend (Id) select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00' and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1))", conn);
 
-            CustomerSqlConn.op("update UserAccount a set BalanceAmount=0 where Id in (select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00') and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1)) and BalanceAmount>0 and BalanceAmount<10", conn);
+            CustomerSqlConn.op("update UserAccount a set BalanceAmount=0 where Id in (select Id from UserFriend) and BalanceAmount>0 and BalanceAmount<10", conn);
 
-            CustomerSqlConn.op("update UserAccount a set BalanceAmount=BalanceAmount-10 where Id in (select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00') and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1)) and BalanceAmount>=10", conn);
+            CustomerSqlConn.op("update UserAccount a set BalanceAmount=BalanceAmount-10 where Id in (select Id from UserFriend) and BalanceAmount>=10", conn);
             
-            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,BalanceAmount,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-BalanceAmount AfterBalanceAmount from UserAccount where Id in (select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00') and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1)) and BalanceAmount>0 and BalanceAmount<10", conn);
+            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,BalanceAmount,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-BalanceAmount AfterBalanceAmount from UserAccount where Id in (select Id from UserFriend) and BalanceAmount>0 and BalanceAmount<10", conn);
 
-            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,10,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-10 AfterBalanceAmount from UserAccount where Id in (select Id from Users where AuthFlag=1 and AuthDate<'" + Month + "-01 00:00:00') and Id not in (select UserId from PosMachinesTwo where `Status`>-1 and BuyUserId!=UserId and UserId not in (select UserId from PullnewSummary) and UserId not in (select BuyUserId from PosMachinesTwo where `Status`>-1)) and BalanceAmount>=10;", conn);
+            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount) select now(),now(),Id,125,10,TotalAmount BeforeTotalAmount,TotalAmount AfterTotalAmount,FreezeAmount,FreezeAmount,BalanceAmount BeforeBalanceAmount,BalanceAmount-10 AfterBalanceAmount from UserAccount where Id in (select Id from UserFriend) and BalanceAmount>=10;", conn);
         }
 
         #endregion

AppStart/RelationClassForConst.cs

@@ -154,8 +154,14 @@ namespace MySystem
                     result = "运营中心分仓奖励";
                     break;
                 case 130:
+                    result = "码牌激活奖励";
+                    break;
+                case 131:
                     result = "预发临时额度退还";
                     break;
+                case 132:
+                    result = "直营团队提现";
+                    break;
                 case 201:
                     result = "分期预扣款";
                     break;

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -167,6 +167,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoKeyword", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8));
             Fields.Add("SeoDescription", data.SeoDescription);
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MsgAlert", Fields, 0);
+            string error = "";
             if (!string.IsNullOrEmpty(MakerCodes))
             {
                 string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
@@ -187,10 +188,14 @@ namespace MySystem.Areas.Admin.Controllers
                     else
                     {
                         new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("MsgAlert", Id);
-                        return "创客" + item + "不存在或者已经添加了相关信息";
+                        error += "创客" + item + "不存在或者已经添加了相关信息" + '\n';
                     }
                 }
             }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
             AddSysLog(data.Id.ToString(), "MsgAlert", "add");
             db.SaveChanges();
 
@@ -262,6 +267,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, data.Id);
+            string error = "";
             var duserSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == data.Id).ToList();
             foreach (var item in duserSwapWhite)
             {
@@ -286,10 +292,14 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                     else
                     {
-                        return "创客" + item + "不存在或者已经添加了相关信息";
+                        error += "创客" + item + "不存在或者已经添加了相关信息" + '\n';
                     }
                 }
             }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
             AddSysLog(data.Id.ToString(), "MsgAlert", "update");
             db.SaveChanges();
 

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -1103,7 +1103,8 @@ namespace MySystem.Areas.Admin.Controllers
                     if (mer.Id > 0 && !string.IsNullOrEmpty(mer.MerIdcardNo))
                     {
                         string MerchantName = Regex.Replace(mer.MerchantName, @"\d|\W|[A-Za-z]", "");
-                        var posMerchants = db.PosMerchantInfo.Where(m => m.MerIdcardNo.ToUpper().StartsWith(mer.MerIdcardNo.ToUpper().Substring(0, 6)) && m.MerIdcardNo.ToUpper().EndsWith(mer.MerIdcardNo.ToUpper().Substring(mer.MerIdcardNo.Length - 4, 4)) && m.MerchantName.Contains(MerchantName)).ToList();
+                        // var posMerchants = db.PosMerchantInfo.Where(m => m.MerIdcardNo.ToUpper().StartsWith(mer.MerIdcardNo.ToUpper().Substring(0, 6)) && m.MerIdcardNo.ToUpper().EndsWith(mer.MerIdcardNo.ToUpper().Substring(mer.MerIdcardNo.Length - 4, 4)) && m.MerchantName.Contains(MerchantName)).ToList();
+                        var posMerchants = db.PosMerchantInfo.Where(m => m.MerchantName.Contains(MerchantName)).ToList();
                         foreach (var item in posMerchants)
                         {
                             Dictionary<string, object> curData = new Dictionary<string, object>();
@@ -1152,28 +1153,38 @@ namespace MySystem.Areas.Admin.Controllers
             var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
             var thisdate = pos.BindingTime;
             var otherdate = pos.BindingTime;
-            var changeFlag = 0;
-            foreach (var item in posMerchants)
+            if (posMerchants.Count > 0)
             {
-                Dictionary<string, object> curData = new Dictionary<string, object>();
-                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item.KqSnNo) ?? new PosMachinesTwo();
-                otherdate = posInfo.BindingTime;
-                if (thisdate < otherdate)
+                var flag = 0;
+                foreach (var item in posMerchants)
                 {
-                    changeFlag = 1;
-                    posInfo.IsFirst = 0;
+                    var changeFlag = 0;
+                    Dictionary<string, object> curData = new Dictionary<string, object>();
+                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item.KqSnNo) ?? new PosMachinesTwo();
+                    otherdate = posInfo.BindingTime;
+                    if (thisdate <= otherdate)
+                    {
+                        changeFlag = 1;
+                        posInfo.IsFirst = 0;
+                        flag = changeFlag;
+                    }
+                    else
+                    {
+                        return "不符合设置条件";
+                    }
                 }
-                else
+                if (flag == 1)
                 {
-                    return "不符合设置条件";
+                    AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
+                    pos.IsFirst = 1;
                 }
             }
-            if (changeFlag == 1)
+            else
             {
                 AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
                 pos.IsFirst = 1;
-                db.SaveChanges();
             }
+            db.SaveChanges();
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -194,7 +194,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
                 }
-                else if (pos.BrandId == 12)
+                else if (pos.BrandId == 12 || pos.BrandId == 13)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
                 }
@@ -450,7 +450,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
                 }
-                else if (pos.BrandId == 12)
+                else if (pos.BrandId == 12 || pos.BrandId == 13)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
                 }
@@ -689,7 +689,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
                 }
-                else if (pos.BrandId == 12)
+                else if (pos.BrandId == 12 || pos.BrandId == 13)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
                 }
@@ -936,7 +936,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
-                        else if (pos.BrandId == 12 && pos.IsFirst == 1 && ActPrize == 0) //盒易付首台无押金机返50
+                        else if ((pos.BrandId == 12 || pos.BrandId == 13) && pos.IsFirst == 1 && ActPrize == 0) //盒易付首台无押金机返50
                         {
                             prizes.Add(50);
                         }
@@ -1355,7 +1355,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             string tradeAmount = pos.CreditTrade.ToString();
             decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-            if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11 && pos.BrandId != 12)
+            var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
+            if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(Deposit.ToString()))
             {
                 Deposit = Deposit / 100;
             }
@@ -3100,9 +3101,9 @@ namespace MySystem.Areas.Admin.Controllers
             result += "订单号：" + order.OrderNo + "\n";
             result += "下单创客\n创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile + "\n";
             result += "上级创客\n创客编号：" + puser.MakerCode + "，姓名：" + puser.RealName + "，手机号：" + puser.Mobile + "\n";
-            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台兑换机
-            int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
-            if (machineCount + ActiveCount >= 3)
+            int posCouponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张未使用的券
+            int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
+            if (posCouponCount + ActiveCount >= 3)
             {
                 string IsGet = "未发放";
                 int ToUserId = 0;
@@ -3131,7 +3132,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                result += "上级创客未满足条件\n兑换机：" + machineCount + "台，激活机：" + ActiveCount + "台\n";
+                result += "上级创客未满足条件\n手中有未使用券：" + posCouponCount + "张，激活机：" + ActiveCount + "台\n";
                 dic.Add("code", "1");
             }
             dic.Add("result", result);
@@ -5306,7 +5307,15 @@ namespace MySystem.Areas.Admin.Controllers
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }
                     var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
-                    if (mer.Id <= merchantId)
+                    // if (mer.Id <= merchantId)
+                    // {
+                    //     IsFirst = "首台";
+                    // }
+                    // else
+                    // {
+                    //     IsFirst = "非首台";
+                    // }
+                    if (pos.IsFirst == 1)
                     {
                         IsFirst = "首台";
                     }
@@ -5352,7 +5361,7 @@ namespace MySystem.Areas.Admin.Controllers
                     result += IsFirst + "\n";
                     result += IsOk + "\n";
                     var BindingTime = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
-                    var ActivationTime = pos.ActivationTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    var ActivationTime = pos.ActivationTime == null ? "" : pos.ActivationTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     result += "开机时间：" + BindingTime + "\n";
                     result += "激活时间：" + ActivationTime + "\n";
                     result += "商户姓名：" + mer.MerRealName + "\n";
@@ -5522,6 +5531,44 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 注销30天内恢复创客信息
+
+        public IActionResult RestoreUserInfo(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string RestoreUserInfoDo(string MakerCode)
+        {
+            var user = db.Users.FirstOrDefault(m => m.Status == -1 && m.MakerCode == MakerCode && m.LogOutDate <= DateTime.Now.AddDays(-30)) ?? new Users();
+            if (user.Id == 0)
+            {
+                return "创客" + MakerCode + "不存在或不满足恢复条件";
+            }
+            else
+            {
+                user.Status = 0;
+                db.UserForMobile.Add(new UserForMobile()
+                {
+                    Mobile = user.Mobile,
+                    UserId = user.Id,
+                });
+                db.UserForMakerCode.Add(new UserForMakerCode()
+                {
+                    MakerCode = user.MakerCode,
+                    UserId = user.Id,
+                });
+                db.SaveChanges();
+            }
+            return "success";
+        }
+        #endregion
+
+
         #region 直营团队数据
 
         public IActionResult Team1Info(string right)

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -176,10 +176,23 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.Remark);
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ToChargeBackRecord", Fields, 0);
-            var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == Id) ?? new ToChargeBackRecord();
-            if (toChargeBackRecord.Id > 0)
+            var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.Id);
+            if (user.Id == 0)
+            {
+                return "失败：" + MakerCode + "创客不存在" + '\n';
+            }
+            else
             {
-                toChargeBackRecord.UpdateDate = null;
+                if (userAccount == null)
+                {
+                    userAccount = db.UserAccount.Add(new UserAccount()
+                    {
+                        Id = user.Id,
+                        UserId = user.Id,
+                    }).Entity;
+                    db.SaveChanges();
+                }
+                userAccount.ToChargeAmount += decimal.Parse(data.ChargeAmount.ToString());
             }
             AddSysLog(data.Id.ToString(), "ToChargeBackRecord", "add");
             db.SaveChanges();

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -1377,9 +1377,9 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             RedisDbconn.Instance.AddList("JkCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
                         }
-                        else if(Channel == 3)
+                        else if(Channel == 3 || Channel == 4)
                         {
-                            RedisDbconn.Instance.AddList("HyfCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
+                            RedisDbconn.Instance.AddList("HyfCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit) + "#cut#" + Channel);
                         }
                     }
                 }

Areas/Admin/Controllers/MainServer/UserCashRecordForBusinessController.cs

@@ -150,7 +150,8 @@ namespace MySystem.Areas.Admin.Controllers
                     decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
                     decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
                     account.BalanceAmount -= decimal.Parse(Amount);
-                    account.FreezeAmount += decimal.Parse(Amount);
+                    // account.FreezeAmount += decimal.Parse(Amount);
+                    account.WithdrawAmount += decimal.Parse(Amount);
                     decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
                     decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
                     decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
@@ -161,6 +162,7 @@ namespace MySystem.Areas.Admin.Controllers
                         UserId = userInfo.Id, //创客
                         ChangeType = 132, //变动类型
                         Kind = 2,
+                        Remark = data.SeoKeyword, // 备注
                         ChangeAmount = decimal.Parse(Amount), //变更金额
                         BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
                         AfterTotalAmount = AfterTotalAmount, //变更后总金额

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2517,7 +2517,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             var error = "";
             //实际押金
-            string SeoKeyword = "0";
             Dictionary<string, object> errorInfo = new Dictionary<string, object>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             if (string.IsNullOrEmpty(PosSns) && string.IsNullOrEmpty(MerNos))
@@ -2537,6 +2536,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string[] PosSnsList = PosSns.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
                     foreach (string PosSn in PosSnsList)
                     {
+                        string SeoKeyword = "0";
                         Dictionary<string, object> data = new Dictionary<string, object>();
                         var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
                         if (pos.Id > 0)
@@ -2555,7 +2555,7 @@ namespace MySystem.Areas.Admin.Controllers
                             var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
                             if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(pos.SeoKeyword))
                             {
-                                SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                                SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                             }
                             else
                             {
@@ -2620,6 +2620,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string[] MerNosList = MerNos.Replace("\r", "").Replace("\n", ",").Replace(" ", ",").Split(',');
                     foreach (string MerNo in MerNosList)
                     {
+                        string SeoKeyword = "0";
                         Dictionary<string, object> data = new Dictionary<string, object>();
                         var mer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo) ?? new PosMerchantInfo();
                         if (mer.Id > 0)
@@ -2638,7 +2639,7 @@ namespace MySystem.Areas.Admin.Controllers
                             var brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new KqProducts();
                             if (brand.Id > 0 && brand.SingleDepositApi == 0 && !string.IsNullOrEmpty(pos.SeoKeyword))
                             {
-                                SeoKeyword = (decimal.Parse(SeoKeyword) / 100).ToString();
+                                SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                             }
                             else
                             {

Areas/Admin/Views/MainServer/SysTools/RestoreUserInfo.cshtml

@@ -0,0 +1,247 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>恢复创客信息</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <form class="layui-form" id="confirmFrm">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="layui-tab" lay-filter="mytabbar">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this" lay-id="1">基本信息</li>
+                        </ul>
+                        <div class="layui-tab-content mt20">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">创客编码</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="MakerCode"
+                                            name="MakerCode" maxlength="50" lay-verify="required|"
+                                            autocomplete="off" placeholder="请输入创客编码">
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="layui-form-item ml10">
+                        <div class="layui-input-block">
+                            <button type="button" class="layui-btn" onclick="save()">查询</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        function save() {
+            var OrderNo = $('#MakerCode').val();
+            if (OrderNo == '') {
+                layer.msg('请输入创客编码');
+            }
+            else {
+                var index = layer.confirm('确定要还原该创客的App帐号吗？', function (index) {
+                    var indexs = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
+                    var userdata = $("#confirmFrm").serialize();
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/SysTools/RestoreUserInfoDo?r=" + Math.random(1),
+                        data: userdata,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index); //关闭弹层}
+                            if (data == "success") {
+                                layer.close(indexs); //关闭弹层
+                                layer.msg('还原成功', {
+                                    time: 1000
+                                }, function () {
+                                    window.location.reload();
+                                });
+                            } else {
+                                layer.close(indexs); //关闭弹层
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        
+                    
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+        
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -127,6 +127,8 @@
                                 <option value="126">机具货款退还</option>
                                 <option value="127">运营中心分仓奖励</option>
                                 <option value="130">预发临时额度退还</option>
+                                <option value="131">码牌激活奖励</option>
+                                <option value="132">直营团队提现</option>
                                 <option value="201">分期预扣款</option>
                                 <option value="202">创客预扣款</option>
                             </select>

Areas/Admin/Views/MainServer/UserCashRecord/Cash.cshtml

@@ -42,7 +42,8 @@
                                     <select id="Channel" name="Channel" lay-search="">
                                         <option value="1">云汇算</option>
                                         <option value="2">金控</option>
-                                        <option value="3">盒子</option>
+                                        <option value="3">盒子-润观米</option>
+                                        <option value="4">盒子-聚贤缘</option>
                                     </select>
                                 </div>
                             </div>

Models/LeaderCompAddTrade.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderCompAddTrade
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string ParentNav { get; set; }
+        public int ParentUserId { get; set; }
+        public decimal AddTradeAmount { get; set; }
+        public int UserId { get; set; }
+        public string StatMonth { get; set; }
+    }
+}

Models/LeaderCompAddTradeBak.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderCompAddTradeBak
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string ParentNav { get; set; }
+        public int ParentUserId { get; set; }
+        public decimal AddTradeAmount { get; set; }
+        public int UserId { get; set; }
+        public string StatMonth { get; set; }
+    }
+}

Models/MachineApply.cs

@@ -56,5 +56,6 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public string ApplyNo { get; set; }
         public int OperateId { get; set; }
+        public string OutBatchNo { get; set; }
     }
 }

Models/PosMachinesTwo.cs

@@ -59,5 +59,6 @@ namespace MySystem.Models
         public DateTime? RecycStartDate { get; set; }
         public string SourcePosSn { get; set; }
         public int RecycStatus { get; set; }
+        public string OutBatchNo { get; set; }
     }
 }

Models/Users.cs

@@ -96,5 +96,6 @@ namespace MySystem.Models
         public int ThisMonthSend { get; set; }
         public string BusinessLogo { get; set; }
         public string BusinessName { get; set; }
+        public DateTime? LogOutDate { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -70,6 +70,8 @@ namespace MySystem.Models
         public virtual DbSet<KqProductRuleSet> KqProductRuleSet { get; set; }
         public virtual DbSet<KqProducts> KqProducts { get; set; }
         public virtual DbSet<LeaderAccountRecord> LeaderAccountRecord { get; set; }
+        public virtual DbSet<LeaderCompAddTrade> LeaderCompAddTrade { get; set; }
+        public virtual DbSet<LeaderCompAddTradeBak> LeaderCompAddTradeBak { get; set; }
         public virtual DbSet<LeaderCompPrize> LeaderCompPrize { get; set; }
         public virtual DbSet<LeaderCompPrizeBak> LeaderCompPrizeBak { get; set; }
         public virtual DbSet<LeaderCompTmp> LeaderCompTmp { get; set; }
@@ -4195,6 +4197,170 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<LeaderCompAddTrade>(entity =>
+            {
+                entity.HasComment("领导人达标奖增量");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AddTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("增量");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("varchar(1000)")
+                    .HasComment("上级创客集合")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级创客");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.StatMonth)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("统计月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<LeaderCompAddTradeBak>(entity =>
+            {
+                entity.HasComment("领导人达标奖增量bak");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AddTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("增量");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("varchar(1000)")
+                    .HasComment("上级创客集合")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级创客");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.StatMonth)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("统计月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<LeaderCompPrize>(entity =>
             {
                 entity.HasComment("领导人达标奖");
@@ -4899,6 +5065,12 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OutBatchNo)
+                    .HasColumnType("varchar(2000)")
+                    .HasComment("出库批次号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.ProductName)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -9546,6 +9718,12 @@ namespace MySystem.Models
 
                 entity.Property(e => e.OrderId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OutBatchNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("出库批次号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.PosSn)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -18969,6 +19147,10 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LogOutDate)
+                    .HasColumnType("datetime")
+                    .HasComment("注销时间");
+
                 entity.Property(e => e.LoginPwd)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")

Startup.cs

@@ -141,7 +141,6 @@ namespace MySystem
             ExcelHelper.Instance.Start();
             OpExcelHelper.Instance.Start();
             SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
-            LeaderAmountMonthChangeQueue.Instance.Start(); // 每月一号记录上月盟主储蓄金和可提现余额
         }
 
 

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -189,8 +189,17 @@ layui.config({
                                 if (data == "success") {
                                     layer.msg("编辑成功");
                                     table.reload('LAY-list-manage'); //数据刷新
+                                } else if (data.indexOf("Warning") == 0) {
+                                    var datalist = data.split('|');
+                                    layer.alert(datalist[1], { time: 20000 }, function () {
+                                        window.location.reload();
+                                    });
                                 } else {
-                                    layer.msg(data);
+                                    layer.msg(data, {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
                                 }
                             }
                         });
@@ -304,6 +313,11 @@ layui.config({
                                 if (data == "success") {
                                     layer.msg("添加成功");
                                     table.reload('LAY-list-manage'); //数据刷新
+                                } else if (data.indexOf("Warning") == 0) {
+                                    var datalist = data.split('|');
+                                    layer.alert(datalist[1], { time: 20000 }, function () {
+                                        window.location.reload();
+                                    });
                                 } else {
                                     layer.msg(data, {
                                         time: 1500

wwwroot/layuiadmin/modules_main/ToChargeBackRecord_Admin.js

@@ -1,4 +1,5 @@
 var ExcelData, ExcelKind;
+var clickFlag = true;
 //导入预扣信息
 function ConfirmChargeImport() {
     $.ajax({
@@ -371,36 +372,33 @@ layui.config({
                             }
                         });
                     }, 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/ToChargeBackRecord/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);
-                                }
+                        if (clickFlag) {
+                            clickFlag = false;
+                            var field = data.field; //获取提交的字段
+                            var userdata = "";
+                            for (var prop in field) {
+                                userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
                             }
-                        });
+                            //提交 Ajax 成功后，静态更新表格中的数据
+                            //$.ajax({});
+
+                            $.ajax({
+                                type: "POST",
+                                url: "/Admin/ToChargeBackRecord/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');