暂存

AppStart/Helper/InstallmentDeductionService.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using MySystem.Models;
+using Library;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 分期扣款(每月20号执行)
+    /// </summary>
+    public class InstallmentDeductionService
+    {
+        public readonly static InstallmentDeductionService Instance = new InstallmentDeductionService();
+        private InstallmentDeductionService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(doSomething);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomething()
+        {
+            while (true)
+            {
+                if (DateTime.Now.Day == 20 && DateTime.Now.Hour > 2 && DateTime.Now.Hour < 19)
+                {
+                    try
+                    {
+                        string check = function.ReadInstance("/InstallmentDeduction/check" + DateTime.Now.ToString("yyyy-MM-20") + ".txt");
+                        if (string.IsNullOrEmpty(check))
+                        {
+                            function.WritePage("/InstallmentDeduction/", "check" + DateTime.Now.ToString("yyyy-MM-20") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                            WebCMSEntities db = new WebCMSEntities();
+                            var startdate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-20 00:00:00"));
+                            var enddate = startdate.AddDays(1);
+                            // var info = db.ToChargeBackRecordSub.Where(m => m.Status == 0 && m.StartDate >= startdate && m.StartDate < enddate).ToList();//分期扣款记录明细
+                            var info = db.ToChargeByStage.Where(m => m.Status == 0).ToList();//分期扣款记录
+                            foreach (var item in info)
+                            {
+                                var toChargeBackRecordSub = db.ToChargeBackRecordSub.FirstOrDefault(m => m.Status == 0 && m.ParentId == item.Id && m.StartDate >= startdate && m.StartDate < enddate) ?? new ToChargeBackRecordSub();
+                                if (toChargeBackRecordSub.Id > 0)
+                                {
+                                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.UserId);
+                                    if (userAccount == null)
+                                    {
+                                        userAccount = db.UserAccount.Add(new UserAccount()
+                                        {
+                                            Id = item.UserId,
+                                            UserId = item.UserId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    toChargeBackRecordSub.Status = 2;
+                                    if (toChargeBackRecordSub.Kind == 0) userAccount.ToChargeAmount += toChargeBackRecordSub.ChargeAmount;//增加创客预扣款
+                                    if (toChargeBackRecordSub.Kind == 1) userAccount.LeaderToChargeAmount += toChargeBackRecordSub.ChargeAmount;//增加盟主预扣款
+                                    if (toChargeBackRecordSub.Kind == 2) userAccount.OperateToChargeAmount += toChargeBackRecordSub.ChargeAmount;//增加运营中心预扣款
+                                    var toChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
+                                    {
+                                        CreateDate = DateTime.Now,
+                                        Sort = toChargeBackRecordSub.Id,
+                                        UserId = item.UserId,
+                                        ChargeAmount = toChargeBackRecordSub.ChargeAmount,
+                                        ChargeType = 2,//分期预扣款
+                                        Remark = toChargeBackRecordSub.Remark,
+                                        Kind = toChargeBackRecordSub.Kind,
+
+                                    }).Entity;
+                                }
+
+                                // //只能存在一笔分期扣款记录(先前有的但是余额不够未扣除的则不添加新的)
+                                // var checks = db.ToChargeBackRecord.Any(m => m.Sort > 0 && (m.Status == 0 || m.Status == 3) && m.ChargeType == 2 && m.UserId == item.UserId);
+                                // if (!checks)
+                                // {
+                                //     string checkAdd = RedisDbconn.Instance.Get<string>("InstallmentDeductionAddRecord:" + item.UserId);
+                                //     if (string.IsNullOrEmpty(check))
+                                //     {
+                                //         var toChargeBackRecordSub = db.ToChargeBackRecordSub.FirstOrDefault(m => m.Status == 0 && m.ParentId == item.Id && m.StartDate >= startdate && m.StartDate < enddate) ?? new ToChargeBackRecordSub();
+                                //         if (toChargeBackRecordSub.Id > 0)
+                                //         {
+                                //             var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == item.UserId);
+                                //             if (userAccount == null)
+                                //             {
+                                //                 userAccount = db.UserAccount.Add(new UserAccount()
+                                //                 {
+                                //                     Id = item.UserId,
+                                //                     UserId = item.UserId,
+                                //                 }).Entity;
+                                //                 db.SaveChanges();
+                                //             }
+                                //             userAccount.ToChargeAmount += toChargeBackRecordSub.ChargeAmount;//增加预扣款
+                                //             var toChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
+                                //             {
+                                //                 CreateDate = DateTime.Now,
+                                //                 Sort = toChargeBackRecordSub.Id,
+                                //                 UserId = item.UserId,
+                                //                 ChargeAmount = toChargeBackRecordSub.ChargeAmount,
+                                //                 ChargeType = 2,//分期预扣款
+                                //                 Remark = "分期预扣款",
+
+                                //             }).Entity;
+                                //         }
+                                //     }
+                                //     RedisDbconn.Instance.Set("InstallmentDeductionAddRecord:" + item.UserId, "wait");
+                                //     RedisDbconn.Instance.SetExpire("InstallmentDeductionAddRecord:" + item.UserId, 300);
+                                // }
+                            }
+                            db.SaveChanges();
+
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "执行分期扣费异常");
+                    }
+                }
+                Thread.Sleep(10000);
+            }
+        }
+    }
+}

AppStart/Helper/TimeOutPosChargeService.cs

@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using MySystem.Models;
+using Library;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 过期机具执行扣费
+    /// </summary>
+    public class TimeOutPosChargeService
+    {
+        public readonly static TimeOutPosChargeService Instance = new TimeOutPosChargeService();
+        private TimeOutPosChargeService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(doSomething);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomething()
+        {
+            while (true)
+            {
+                if (DateTime.Now.Hour < 9)
+                {
+                    try
+                    {
+                        string check = function.ReadInstance("/TimeOutPosCharge/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
+                        if (string.IsNullOrEmpty(check))
+                        {
+                            function.WritePage("/TimeOutPosCharge/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                            WebCMSEntities db = new WebCMSEntities();
+                            var date = DateTime.Now.AddDays(-60).ToString("yyyy-MM-dd 00:00:00");//过期限制时间
+                            var time = DateTime.Parse(date);//过期限制时间
+
+                            DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND ScanQrTrade=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.SqlConnStr);//扣费创客
+                            var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.ScanQrTrade == 0 && m.RecycEndDate < time).ToList();//循环过期超过15天机具
+                            var brandInfo = db.KqProducts.ToList();
+                            foreach (DataRow item in dt.Rows)
+                            {
+                                int BuyUserId = int.Parse(item["BuyUserId"].ToString());
+                                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == BuyUserId);
+                                if (userAccount == null)
+                                {
+                                    userAccount = db.UserAccount.Add(new UserAccount()
+                                    {
+                                        Id = BuyUserId,
+                                        UserId = BuyUserId,
+                                    }).Entity;
+                                    db.SaveChanges();
+                                }
+                                var posInfo = query.Where(m => m.BuyUserId == BuyUserId);
+                                var amount = 0;
+                                foreach (var pos in posInfo)
+                                {
+                                    var poss = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id) ?? new PosMachinesTwo();
+                                    poss.ScanQrTrade = 999;
+                                    var Brand = brandInfo.FirstOrDefault(m => m.Id == pos.BrandId);
+                                    if (Brand.Name.Contains("电签"))
+                                    {
+                                        amount = 200;
+                                    }
+                                    if (Brand.Name.Contains("大POS"))
+                                    {
+                                        amount = 300;
+                                    }
+                                    userAccount.ToChargeAmount += amount;//增加预扣款
+                                    var toChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
+                                    {
+                                        CreateDate = DateTime.Now,
+                                        UserId = BuyUserId,
+                                        ChargeAmount = amount,
+                                        ChargeType = 124,//过期机具货款扣费
+                                        Remark = pos.PosSn,
+
+                                    }).Entity;
+                                }
+                            }
+                            db.SaveChanges();
+
+                            DoChargeAmount(db);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "过期机具执行扣费异常");
+                    }
+                }
+                Thread.Sleep(1000);
+            }
+        }
+
+
+
+        public void StartDoChargeAmount()
+        {
+            Thread th = new Thread(StartDoChargeAmountReady);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDoChargeAmountReady()
+        {
+            while (true)
+            {
+                WebCMSEntities db = new WebCMSEntities();
+                DoChargeAmount(db);
+                db.Dispose();
+                Thread.Sleep(600000);
+            }
+        }
+
+        public void ListenChargeAmount()
+        {
+            Thread th = new Thread(ListenChargeAmountReady);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void ListenChargeAmountReady()
+        {
+            while (true)
+            {
+                string content = RedisDbconn.Instance.RPop<string>("DoChargeAmountQueue");
+                if (!string.IsNullOrEmpty(content))
+                {
+                    WebCMSEntities db = new WebCMSEntities();
+                    DoChargeAmount(db, int.Parse(function.CheckInt(content)));
+                    db.Dispose();
+                }
+            }
+        }
+
+        public void DoChargeAmount(WebCMSEntities db, int UserId = 0)
+        {
+            IQueryable<ToChargeBackRecord> list = db.ToChargeBackRecord.Where(m => m.Status == 0);//过期机具扣费记录
+            if (UserId > 0)
+            {
+                list = list.Where(m => m.UserId == UserId);
+            }
+            var info = list.ToList();
+            foreach (var items in info)
+            {
+                function.WriteLog(DateTime.Now.ToString(), "扣款监听日志");
+                function.WriteLog(items.UserId.ToString(), "扣款监听日志");
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == items.UserId) ?? new UserAccount();
+                var record = info.FirstOrDefault(m => m.Id == items.Id);
+
+                function.WriteLog("BalanceAmount:" + userAccount.BalanceAmount + ";ChargeAmount:" + record.ChargeAmount + ";", "扣款监听日志");
+                if (userAccount.BalanceAmount >= record.ChargeAmount)
+                {
+                    function.WriteLog("in", "扣款监听日志");
+                    var ChangeType = 0;
+                    var Remark = "";
+                    if (record.ChargeType == 124)//过期机具货款扣费
+                    {
+                        ChangeType = 124;
+                        Remark = "扣机具货款";
+                    }
+                    if (record.ChargeType == 1)//普通预扣款
+                    {
+                        ChangeType = 202;
+                        // Remark = "普通扣款";
+                        Remark = items.Remark;
+                    }
+                    if (record.ChargeType == 2)//分期预扣款
+                    {
+                        ChangeType = 201;
+                        // Remark = "分期扣款";
+                        Remark = items.Remark;
+                    }
+                    var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = items.UserId,
+                        BeforeBalanceAmount = userAccount.BalanceAmount,
+                        AfterBalanceAmount = userAccount.BalanceAmount - record.ChargeAmount,
+                        ChangeAmount = record.ChargeAmount,
+                        ChangeType = ChangeType,
+                        Remark = Remark,
+
+                    }).Entity;
+                    record.Status = 1;
+                    if (record.ChargeType == 2)
+                    {
+                        var toChargeBackRecordSub = db.ToChargeBackRecordSub.FirstOrDefault(m => m.Id == record.Sort) ?? new ToChargeBackRecordSub();
+                        var toChargeByStage = db.ToChargeByStage.FirstOrDefault(m => m.Id == toChargeBackRecordSub.ParentId && m.TimeNumber > m.QueryCount) ?? new ToChargeByStage();
+                        toChargeBackRecordSub.Status = 1;
+                        toChargeByStage.QueryCount += 1;
+                        toChargeByStage.ChargeAmount += toChargeBackRecordSub.ChargeAmount;
+                        if (toChargeByStage.TimeNumber == toChargeByStage.QueryCount)
+                        {
+                            toChargeByStage.Status = 1;
+                        }
+                    }
+                    function.WriteLog("ToChargeAmount:" + userAccount.ToChargeAmount + ";ChargeAmount:" + record.ChargeAmount + ";", "扣款监听日志");
+                    if (userAccount.ToChargeAmount >= record.ChargeAmount)
+                    {
+                        function.WriteLog("ok", "扣款监听日志");
+                        userAccount.ToChargeAmount -= record.ChargeAmount;//分期扣款
+                    }
+                    userAccount.BalanceAmount -= record.ChargeAmount;//扣减余额
+
+                    ToChargeBackRecord edit = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == items.Id);
+                    if(edit != null)
+                    {
+                        edit.UpdateDate = DateTime.Now;
+                    }
+                    function.WriteLog("\n\n", "扣款监听日志");
+                }
+            }
+            db.SaveChanges();
+        }
+    }
+}

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 待扣款明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string PosSn, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string PosSn, string CreateDateData, string ChargeTypeSelect, string KindSelect, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -81,6 +81,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ChargeType=" + ChargeTypeSelect;
             }
+            //待扣类别
+            if (!string.IsNullOrEmpty(KindSelect))
+            {
+                condition += " and Kind=" + KindSelect;
+            }
             //扣款状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -103,10 +108,16 @@ namespace MySystem.Areas.Admin.Controllers
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
                 if (ChargeType == 124) dic["ChargeTypeName"] = "过期机具扣款";
-                if (ChargeType == 1) dic["ChargeTypeName"] = "创客预扣款";
+                if (ChargeType == 1) dic["ChargeTypeName"] = "普通预扣款";
                 if (ChargeType == 2) dic["ChargeTypeName"] = "分期预扣款";
                 if (ChargeType == 0) dic["ChargeTypeName"] = "";
 
+                //待扣类别
+                int Kind = int.Parse(dic["Kind"].ToString());
+                if (Kind == 0) dic["KindName"] = "创客预扣款";
+                if (Kind == 1) dic["KindName"] = "盟主预扣款";
+                if (Kind == 2) dic["KindName"] = "运营中心预扣款";
+
                 //扣款状态
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待扣款";
@@ -169,6 +180,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("UserId", user.Id); //创客Id
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
             Fields.Add("ChargeType", 1); //待扣类型
+            Fields.Add("Kind", data.Kind); //待扣别
             Fields.Add("Remark", data.Remark); //备注
             Fields.Add("Field1", data.Field1); //备用字段
 
@@ -192,7 +204,9 @@ namespace MySystem.Areas.Admin.Controllers
                     }).Entity;
                     db.SaveChanges();
                 }
-                userAccount.ToChargeAmount += decimal.Parse(data.ChargeAmount.ToString());
+                if (data.Kind == 0) userAccount.ToChargeAmount += decimal.Parse(data.ChargeAmount.ToString());
+                if (data.Kind == 1) userAccount.LeaderToChargeAmount += decimal.Parse(data.ChargeAmount.ToString());
+                if (data.Kind == 2) userAccount.OperateToChargeAmount += decimal.Parse(data.ChargeAmount.ToString());
             }
             AddSysLog(data.Id.ToString(), "ToChargeBackRecord", "add");
             db.SaveChanges();
@@ -236,17 +250,25 @@ namespace MySystem.Areas.Admin.Controllers
             var info = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == data.Id) ?? new ToChargeBackRecord();
             if (info.ChargeAmount != data.ChargeAmount)
             {
-                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == info.UserId) ?? new UserAccount();
-                if (info.ChargeAmount > data.ChargeAmount)
-                {
-                    userAccount.ToChargeAmount -= info.ChargeAmount - data.ChargeAmount;
-                }
-                if (info.ChargeAmount < data.ChargeAmount)
+                if (info.Kind != data.Kind)
                 {
-                    userAccount.ToChargeAmount += data.ChargeAmount - info.ChargeAmount;
+                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == info.UserId) ?? new UserAccount();
+                    if (info.ChargeAmount > data.ChargeAmount)
+                    {
+                        if (data.Kind == 0) userAccount.ToChargeAmount -= info.ChargeAmount - data.ChargeAmount;
+                        if (data.Kind == 1) userAccount.LeaderToChargeAmount -= info.ChargeAmount - data.ChargeAmount;
+                        if (data.Kind == 2) userAccount.OperateToChargeAmount -= info.ChargeAmount - data.ChargeAmount;
+                    }
+                    if (info.ChargeAmount < data.ChargeAmount)
+                    {
+                        if (data.Kind == 0) userAccount.ToChargeAmount += data.ChargeAmount - info.ChargeAmount;
+                        if (data.Kind == 1) userAccount.LeaderToChargeAmount += data.ChargeAmount - info.ChargeAmount;
+                        if (data.Kind == 2) userAccount.OperateToChargeAmount += data.ChargeAmount - info.ChargeAmount;
+                    }
                 }
             }
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
+            Fields.Add("Kind", data.Kind); //待扣金额
             Fields.Add("SeoDescription", data.SeoDescription);
             if (info.ChargeType != 124)
             {
@@ -276,7 +298,9 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == id) ?? new ToChargeBackRecord();
                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
-                userAccount.ToChargeAmount -= toChargeBackRecord.ChargeAmount;//删除预扣款记录时扣减相应预扣额度
+                if (toChargeBackRecord.Kind == 0) userAccount.ToChargeAmount -= toChargeBackRecord.ChargeAmount;//删除预扣款记录时扣减相应预扣额度
+                if (toChargeBackRecord.Kind == 1) userAccount.LeaderToChargeAmount -= toChargeBackRecord.ChargeAmount;//删除预扣款记录时扣减相应预扣额度
+                if (toChargeBackRecord.Kind == 2) userAccount.OperateToChargeAmount -= toChargeBackRecord.ChargeAmount;//删除预扣款记录时扣减相应预扣额度
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ToChargeBackRecord", Fields, id);
@@ -416,6 +440,8 @@ namespace MySystem.Areas.Admin.Controllers
                 string Name = itemJson.Contains("\"B\"") ? dr["B"].ToString() : "";
                 string Amount = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";
                 string Remark = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
+                string KindName = itemJson.Contains("\"E\"") ? dr["E"].ToString() : "";
+                int Kind = 0;
                 var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 var users = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.RealName == Name) ?? new Users();
                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == users.Id);
@@ -434,7 +460,21 @@ namespace MySystem.Areas.Admin.Controllers
                         }).Entity;
                         db.SaveChanges();
                     }
-                    userAccount.ToChargeAmount += decimal.Parse(Amount);
+                    if (KindName == "创客预扣款")
+                    {
+                        Kind = 0;
+                        userAccount.ToChargeAmount += decimal.Parse(Amount);
+                    }
+                    if (KindName == "盟主预扣款")
+                    {
+                        Kind = 1;
+                        userAccount.LeaderToChargeAmount += decimal.Parse(Amount);
+                    }
+                    if (KindName == "运营中心预扣款")
+                    {
+                        Kind = 2;
+                        userAccount.OperateToChargeAmount += decimal.Parse(Amount);
+                    }
                     var ToChargeBackRecord = db.ToChargeBackRecord.Add(new ToChargeBackRecord
                     {
                         CreateDate = DateTime.Now,
@@ -442,6 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
                         SeoDescription = Remark,
                         Remark = Remark,
                         ChargeType = 1,
+                        Kind = Kind,
                         ChargeAmount = decimal.Parse(Amount),
                         UserId = users.Id,
                     }).Entity;
@@ -589,7 +630,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(ToChargeBackRecord data, string CreateDateData, string UserIdMakerCode, string ChargeTypeSelect, string StatusSelect)
+        public JsonResult ExportExcel(ToChargeBackRecord data, string CreateDateData, string UserIdMakerCode, string ChargeTypeSelect, string KindSelect, string StatusSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             // Fields.Add("CreateDate", "3"); //时间
@@ -612,6 +653,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ChargeType=" + ChargeTypeSelect;
             }
+            //待扣类别
+            if (!string.IsNullOrEmpty(KindSelect))
+            {
+                condition += " and Kind=" + KindSelect;
+            }
             //扣款状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -619,7 +665,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecord", Fields, "Id desc", "0", 1, 20000, condition, "Id,UserId,ChargeAmount,ChargeType,Remark", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecord", Fields, "Id desc", "0", 1, 20000, condition, "Id,UserId,ChargeAmount,ChargeType,Kind,Remark", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -633,6 +679,15 @@ namespace MySystem.Areas.Admin.Controllers
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
                 if (ChargeType == 124) dic["ChargeType"] = "过期机具扣款";
+                if (ChargeType == 1) dic["ChargeType"] = "普通预扣款";
+                if (ChargeType == 2) dic["ChargeType"] = "分期预扣款";
+                if (ChargeType == 0) dic["ChargeType"] = "";
+
+                //待扣类别
+                int Kind = int.Parse(dic["Kind"].ToString());
+                if (Kind == 0) dic["Kind"] = "创客预扣款";
+                if (Kind == 1) dic["Kind"] = "盟主预扣款";
+                if (Kind == 2) dic["Kind"] = "运营中心预扣款";
 
                 int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
                 var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == Id) ?? new ToChargeBackRecord();
@@ -661,7 +716,8 @@ namespace MySystem.Areas.Admin.Controllers
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("Id", "Id");
-            ReturnFields.Add("ChargeType", "类型");
+            ReturnFields.Add("ChargeType", "待扣类型");
+            ReturnFields.Add("Kind", "待扣类别");
             ReturnFields.Add("Remark", "机具sn");
             ReturnFields.Add("BrandId", "品牌");
             ReturnFields.Add("PosSnType", "机具类型");
@@ -692,7 +748,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string QuickExportExcelDo(string UserIdMakerCode, string PosSn, string CreateDateData, string ChargeTypeSelect, string StatusSelect)
+        public string QuickExportExcelDo(string UserIdMakerCode, string PosSn, string CreateDateData, string ChargeTypeSelect, string KindSelect, string StatusSelect)
         {
 
             string SqlString = " where 1=1 and a.Status>-1";
@@ -712,6 +768,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SqlString += " and a.Remark=" + PosSn;
             }
+            //待扣类别
+            if (!string.IsNullOrEmpty(KindSelect))
+            {
+                SqlString += " and a.Kind=" + KindSelect;
+            }
             //待扣类型
             if (!string.IsNullOrEmpty(ChargeTypeSelect))
             {
@@ -722,7 +783,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SqlString += " and a.Status=" + StatusSelect;
             }
-            var Sql = "SELECT b.MakerCode '创客编号',b.RealName '创客真实姓名',b.Mobile '手机号',DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',a.ChargeAmount '扣款金额',(CASE WHEN a.ChargeType=124 THEN '过期机具扣款' WHEN a.ChargeType=1 THEN '创客预扣款' WHEN a.ChargeType=2 THEN '分期预扣款' ELSE '' end) '扣款类型',DATE_FORMAT(a.UpdateDate,'%Y-%m-%d %H:%i:%s') '扣款/更新时间',(CASE WHEN a.`Status`=0 THEN '待扣款' WHEN a.`Status`=1 THEN '已扣款' WHEN a.`Status`=2 THEN '已退还' WHEN a.`Status`=3 THEN '暂停扣款'  ELSE '' end) '扣款状态',a.Remark '机具Sn',a.SeoDescription '备注',a.SeoTitle '操作人' FROM ToChargeBackRecord a LEFT JOIN Users b ON a.UserId=b.Id " + SqlString + "";
+            var Sql = "SELECT b.MakerCode '创客编号',b.RealName '创客真实姓名',b.Mobile '手机号',DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',a.ChargeAmount '扣款金额',(CASE WHEN a.ChargeType=124 THEN '过期机具扣款' WHEN a.ChargeType=1 THEN '普通预扣款' WHEN a.ChargeType=2 THEN '分期预扣款' ELSE '' end) '扣款类型',(CASE WHEN a.Kind=0 THEN '创客预扣款' WHEN a.Kind=1 THEN '盟主预扣款' WHEN a.Kind=2 THEN '运营中心预扣款' ELSE '' end) '扣款类别',DATE_FORMAT(a.UpdateDate,'%Y-%m-%d %H:%i:%s') '扣款/更新时间',(CASE WHEN a.`Status`=0 THEN '待扣款' WHEN a.`Status`=1 THEN '已扣款' WHEN a.`Status`=2 THEN '已退还' WHEN a.`Status`=3 THEN '暂停扣款'  ELSE '' end) '扣款状态',a.Remark '机具Sn',a.SeoDescription '备注',a.SeoTitle '操作人' FROM ToChargeBackRecord a LEFT JOIN Users b ON a.UserId=b.Id " + SqlString + "";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "创客预扣款记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";

Areas/Admin/Controllers/MainServer/ToChargeBackRecordSubController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 待扣款明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeBackRecordSub data, string OrderNo, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeBackRecordSub data, string OrderNo, string StatusSelect, string KindSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -68,6 +68,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and ParentId=" + toChargeByStage.Id;
             }
 
+            //待扣类别
+            if (!string.IsNullOrEmpty(KindSelect))
+            {
+                condition += " and Kind=" + KindSelect;
+            }
+
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -103,6 +109,12 @@ namespace MySystem.Areas.Admin.Controllers
                     dic["StatusName"] = "扣款中";
                 }
 
+                //待扣类别
+                int Kind = int.Parse(dic["Kind"].ToString());
+                if (Kind == 0) dic["KindName"] = "创客预扣款";
+                if (Kind == 1) dic["KindName"] = "盟主预扣款";
+                if (Kind == 2) dic["KindName"] = "运营中心预扣款";
+
                 //分期单号
                 int ParentId = int.Parse(function.CheckInt(dic["ParentId"].ToString()));
                 var toChargeByStage = db.ToChargeByStage.FirstOrDefault(m => m.Id == ParentId) ?? new ToChargeByStage();
@@ -198,16 +210,22 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (toChargeBackRecordSub.ChargeAmount != data.ChargeAmount)
             {
+
                 var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeByStage.UserId) ?? new UserAccount();
                 if (toChargeBackRecordSub.ChargeAmount > data.ChargeAmount)
                 {
                     toChargeByStage.TotalAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
-                    userAccount.ToChargeAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
+                    if (toChargeBackRecordSub.Kind == 0) userAccount.ToChargeAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
+                    if (toChargeBackRecordSub.Kind == 1) userAccount.LeaderToChargeAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
+                    if (toChargeBackRecordSub.Kind == 2) userAccount.OperateToChargeAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
                 }
                 if (toChargeBackRecordSub.ChargeAmount < data.ChargeAmount)
                 {
                     toChargeByStage.TotalAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
-                    userAccount.ToChargeAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
+                    
+                    if (toChargeBackRecordSub.Kind == 0) userAccount.ToChargeAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
+                    if (toChargeBackRecordSub.Kind == 1) userAccount.LeaderToChargeAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
+                    if (toChargeBackRecordSub.Kind == 2) userAccount.OperateToChargeAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
                 }
             }
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额

Areas/Admin/Controllers/MainServer/ToChargeByStageController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分期扣款信息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeByStage data, string MakerCode, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeByStage data, string MakerCode, string StatusSelect, string KindSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -66,6 +66,11 @@ namespace MySystem.Areas.Admin.Controllers
                 var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 condition += " and UserId=" + userForMakerCode.UserId;
             }
+            //待扣类别
+            if (!string.IsNullOrEmpty(KindSelect))
+            {
+                condition += " and Kind=" + KindSelect;
+            }
 
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -105,6 +110,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerName"] = userid_Users.RealName;
                 dic["MakerMobile"] = userid_Users.Mobile;
 
+                //待扣类别
+                int Kind = int.Parse(dic["Kind"].ToString());
+                if (Kind == 0) dic["KindName"] = "创客预扣款";
+                if (Kind == 1) dic["KindName"] = "盟主预扣款";
+                if (Kind == 2) dic["KindName"] = "运营中心预扣款";
+
                 //扣款状态
                 int TimeNumber = int.Parse(function.CheckInt(dic["TimeNumber"].ToString()));
                 int QueryCount = int.Parse(function.CheckInt(dic["QueryCount"].ToString()));
@@ -170,6 +181,7 @@ namespace MySystem.Areas.Admin.Controllers
             var StartTime = DateTime.Parse(DateTime.Parse(data.StartDate.ToString()).ToString("yyyy-MM-20 00:00:00"));
             Fields.Add("UserId", user.UserId); //创客Id
             Fields.Add("Remark", data.Remark); //备注
+            Fields.Add("Kind", data.Kind); //带扣类型(0 创客预扣款 1 盟主预扣款 2 运营宗欣预扣款)
             Fields.Add("StartDate", StartTime); //扣款开始时间
             Fields.Add("TimeNumber", data.TimeNumber); //期数
             Fields.Add("TotalAmount", data.TotalAmount); //扣款总金额
@@ -189,6 +201,7 @@ namespace MySystem.Areas.Admin.Controllers
                     ChargeAmount = decimal.Parse(ChargeAmount),
                     ParentId = Id,
                     Remark = data.Remark,
+                    Kind = data.Kind,
                 }).Entity;
             }
             AddSysLog(data.Id.ToString(), "ToChargeByStage", "add");
@@ -232,6 +245,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("UserId", data.UserId); //创客
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
             Fields.Add("Remark", data.Remark); //备注
+            Fields.Add("Kind", data.Kind); //带扣类型(0 创客预扣款 1 盟主预扣款 2 运营宗欣预扣款)
             Fields.Add("StartDate", data.StartDate); //扣款开始时间
             Fields.Add("TimeNumber", data.TimeNumber); //期数
             Fields.Add("TotalAmount", data.TotalAmount); //扣款总金额

Areas/Admin/Views/MainServer/ToChargeBackRecord/Add.cshtml

@@ -54,6 +54,16 @@
                                     </select>
                                 </div>
                             </div> *@
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">待扣类别</label>
+                                <div class="layui-input-inline">
+                                    <select id="Kind" name="Kind" lay-search="">
+                                        <option value="0" selected="selected">创客预扣款</option>
+                                        <option value="1">盟主预扣款</option>
+                                        <option value="2">运营中心预扣款</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">

Areas/Admin/Views/MainServer/ToChargeBackRecord/Edit.cshtml

@@ -63,6 +63,17 @@
                                     <script>$("#ChargeType").val("@editData.ChargeType");</script>
                                 </div>
                             </div> *@
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">待扣类别</label>
+                                <div class="layui-input-inline">
+                                    <select id="Kind" name="Kind" lay-search="" readonly>
+                                        <option value="0">创客预扣款</option>
+                                        <option value="1">盟主预扣款</option>
+                                        <option value="2">运营中心预扣款</option>
+                                    </select>
+                                    <script>$("#Kind").val("@editData.Kind");</script>
+                                </div>
+                            </div>
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">

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

@@ -82,11 +82,22 @@
                             <select id="ChargeTypeSelect" name="ChargeTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="124">过期机具扣款</option>
-                                <option value="1">创客预扣款</option>
+                                <option value="1">普通预扣款</option>
                                 <option value="2">分期预扣款</option>
                             </select>
                         </div>
                     </div>
+                     <div class="layui-inline">
+                        <label class="layui-form-label">待扣类别</label>
+                        <div class="layui-input-inline">
+                            <select id="KindSelect" name="KindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">创客预扣款</option>
+                                <option value="1">盟主预扣款</option>
+                                <option value="2">运营中心预扣款</option>
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">

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

@@ -57,6 +57,17 @@
                             <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
                                 placeholder="" autocomplete="off">
                         </div>
+                    </div>
+                     <div class="layui-inline">
+                        <label class="layui-form-label">待扣类别</label>
+                        <div class="layui-input-inline">
+                            <select id="KindSelect" name="KindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">创客预扣款</option>
+                                <option value="1">盟主预扣款</option>
+                                <option value="2">运营中心预扣款</option>
+                            </select>
+                        </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">扣款状态</label>

Areas/Admin/Views/MainServer/ToChargeByStage/Add.cshtml

@@ -51,6 +51,16 @@
                                 maxlength="20" lay-verify="required|" autocomplete="off" placeholder="请输入待扣金额">
                                 </div>
                                 </div> *@
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">待扣类别</label>
+                                <div class="layui-input-inline">
+                                    <select id="Kind" name="Kind" lay-search="">
+                                        <option value="0" selected="selected">创客预扣款</option>
+                                        <option value="1">盟主预扣款</option>
+                                        <option value="2">运营中心预扣款</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">

Areas/Admin/Views/MainServer/ToChargeByStage/Edit.cshtml

@@ -43,6 +43,17 @@
                                         placeholder="请输入创客">
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">待扣类别</label>
+                                <div class="layui-input-inline">
+                                    <select id="Kind" name="Kind" lay-search="" readonly>
+                                        <option value="0">创客预扣款</option>
+                                        <option value="1">盟主预扣款</option>
+                                        <option value="2">运营中心预扣款</option>
+                                    </select>
+                                    <script>$("#Kind").val("@editData.Kind");</script>
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">已扣金额</label>
                                 <div class="layui-input-inline">

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

@@ -67,6 +67,17 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="SeoTitle" placeholder="" autocomplete="off">
                         </div>
+                    </div>
+                     <div class="layui-inline">
+                        <label class="layui-form-label">待扣类别</label>
+                        <div class="layui-input-inline">
+                            <select id="KindSelect" name="KindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">创客预扣款</option>
+                                <option value="1">盟主预扣款</option>
+                                <option value="2">运营中心预扣款</option>
+                            </select>
+                        </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">扣款状态</label>

Models/LeaderRankWhite.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderRankWhite
+    {
+        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 int Rank { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/MachineChangeDetail.cs

@@ -30,5 +30,6 @@ namespace MySystem.Models
         public int BackProductType { get; set; }
         public int ChangeId { get; set; }
         public string ChangeNo { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

Models/MachineUnBind.cs

@@ -22,5 +22,6 @@ namespace MySystem.Models
         public int BrandId { get; set; }
         public int UserId { get; set; }
         public string ApplyNo { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

Models/MerchantDepositRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MerchantDepositRecord
+    {
+        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 ulong NoticeFlag { get; set; }
+        public string OrderId { get; set; }
+        public int UserId { get; set; }
+        public decimal DepositAmount { get; set; }
+        public string MerNo { get; set; }
+        public string SnNo { get; set; }
+        public string AgentNo { get; set; }
+    }
+}

Models/OperatorRankWhite.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class OperatorRankWhite
+    {
+        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 int Rank { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/PosMerchantInfo.cs

@@ -45,5 +45,6 @@ namespace MySystem.Models
         public string MerchantNo { get; set; }
         public int StandardMonths { get; set; }
         public int StandardStatus { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

Models/ToChargeBackRecord.cs

@@ -22,5 +22,6 @@ namespace MySystem.Models
         public decimal TotalAmount { get; set; }
         public int TimeNumber { get; set; }
         public DateTime? StartDate { get; set; }
+        public int Kind { get; set; }
     }
 }

Models/ToChargeBackRecordSub.cs

@@ -19,5 +19,6 @@ namespace MySystem.Models
         public string Remark { get; set; }
         public decimal ChargeAmount { get; set; }
         public int ParentId { get; set; }
+        public int Kind { get; set; }
     }
 }

Models/ToChargeByStage.cs

@@ -20,5 +20,6 @@ namespace MySystem.Models
         public string Remark { get; set; }
         public decimal ChargeAmount { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

Models/UserAccount.cs

@@ -46,5 +46,7 @@ namespace MySystem.Models
         public decimal PreTempAmountForBalance { get; set; }
         public decimal PreTempAmount { get; set; }
         public decimal ToChargeAmount { get; set; }
+        public decimal LeaderToChargeAmount { get; set; }
+        public decimal OperateToChargeAmount { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -80,6 +80,7 @@ namespace MySystem.Models
         public virtual DbSet<LeaderCompTmpBak> LeaderCompTmpBak { get; set; }
         public virtual DbSet<LeaderCompTradeStat> LeaderCompTradeStat { get; set; }
         public virtual DbSet<LeaderCompTradeStatBak> LeaderCompTradeStatBak { get; set; }
+        public virtual DbSet<LeaderRankWhite> LeaderRankWhite { get; set; }
         public virtual DbSet<LeaderReconRecord> LeaderReconRecord { get; set; }
         public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<Leaders> Leaders { get; set; }
@@ -100,6 +101,7 @@ namespace MySystem.Models
         public virtual DbSet<MerchantClass> MerchantClass { get; set; }
         public virtual DbSet<MerchantCol> MerchantCol { get; set; }
         public virtual DbSet<MerchantComment> MerchantComment { get; set; }
+        public virtual DbSet<MerchantDepositRecord> MerchantDepositRecord { get; set; }
         public virtual DbSet<MerchantDepositReturns> MerchantDepositReturns { get; set; }
         public virtual DbSet<MerchantDepositSet> MerchantDepositSet { get; set; }
         public virtual DbSet<MerchantForCode> MerchantForCode { get; set; }
@@ -128,6 +130,7 @@ namespace MySystem.Models
         public virtual DbSet<OpenSnSnapshot> OpenSnSnapshot { get; set; }
         public virtual DbSet<OperateLog> OperateLog { get; set; }
         public virtual DbSet<OperateRightList> OperateRightList { get; set; }
+        public virtual DbSet<OperatorRankWhite> OperatorRankWhite { get; set; }
         public virtual DbSet<OrderForNo> OrderForNo { get; set; }
         public virtual DbSet<OrderProduct> OrderProduct { get; set; }
         public virtual DbSet<OrderRefund> OrderRefund { get; set; }
@@ -296,7 +299,6 @@ namespace MySystem.Models
         {
             modelBuilder.Entity<ActiveReward>(entity =>
             {
-
                 entity.HasIndex(e => e.KqSnNo)
                     .HasName("ActiveRewardIndex");
 
@@ -1044,8 +1046,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<AppVersion>(entity =>
             {
-                entity.HasComment("App版本管理");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CancelText)
@@ -4966,6 +4966,72 @@ namespace MySystem.Models
                     .HasComment("版本号");
             });
 
+            modelBuilder.Entity<LeaderRankWhite>(entity =>
+            {
+                entity.HasComment("盟主预设职级");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                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.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.Rank)
+                    .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.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<LeaderReconRecord>(entity =>
             {
                 entity.HasComment("盟主对账记录");
@@ -5605,6 +5671,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.NoticeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("推送标记");
+
                 entity.Property(e => e.OutProductName)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -5910,6 +5981,11 @@ namespace MySystem.Models
 
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
+                entity.Property(e => e.NoticeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("推送标记");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -6754,6 +6830,105 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantDepositRecord>(entity =>
+            {
+                entity.HasComment("商户押金记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AgentNo)
+                    .IsRequired()
+                    .HasColumnType("varchar(30)")
+                    .HasComment("代理商号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.DepositAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("押金金额");
+
+                entity.Property(e => e.MerNo)
+                    .IsRequired()
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.NoticeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("推送标记");
+
+                entity.Property(e => e.OrderId)
+                    .IsRequired()
+                    .HasColumnType("varchar(50)")
+                    .HasComment("订单流水号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.SnNo)
+                    .IsRequired()
+                    .HasColumnType("varchar(50)")
+                    .HasComment("机具SN")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                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<MerchantDepositReturns>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -8721,6 +8896,72 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<OperatorRankWhite>(entity =>
+            {
+                entity.HasComment("运营中心预设职级");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                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.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.Rank)
+                    .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.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<OrderForNo>(entity =>
             {
                 entity.HasKey(e => e.OrderNo)
@@ -10019,6 +10260,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.NoticeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("推送标记");
+
                 entity.Property(e => e.Province)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -16062,6 +16308,10 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("待扣类别");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.Remark)
@@ -16107,6 +16357,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("待扣类别");
+
                 entity.Property(e => e.ParentId).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -16150,6 +16404,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("待扣类别");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.Remark)
@@ -16678,8 +16936,16 @@ namespace MySystem.Models
 
                 entity.Property(e => e.LeaderReserve).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.LeaderToChargeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("盟主待扣金额");
+
                 entity.Property(e => e.LockStatus).HasColumnType("int(11)");
 
+                entity.Property(e => e.OperateToChargeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("运营中心待扣金额");
+
                 entity.Property(e => e.PreTempAmount).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.PreTempAmountForBalance).HasColumnType("decimal(18,2)");

wwwroot/layuiadmin/modules_main/ToChargeBackRecordSub_Admin.js

@@ -93,6 +93,7 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'KindName', width: 200, title: '扣款类别', sort: true }
             , { field: 'ChargeAmount', width: 200, title: '待扣金额', sort: true }
             , { field: 'StartDate', width: 200, title: '扣款开始时间', sort: true }
             , { field: 'TimeNumber', width: 200, title: '期数', sort: true }

wwwroot/layuiadmin/modules_main/ToChargeBackRecord_Admin.js

@@ -155,6 +155,7 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'ChargeAmount', width: 200, title: '扣款金额', sort: true }
             , { field: 'ChargeTypeName', width: 200, title: '扣款类型', sort: true }
+            , { field: 'KindName', width: 200, title: '扣款类别', sort: true }
             , { field: 'UpdateDate', width: 200, title: '扣款/更新时间', sort: true }
             , { field: 'StatusName', width: 200, title: '扣款状态', sort: true }
             , { field: 'Remark', width: 200, title: '机具Sn', sort: true }

wwwroot/layuiadmin/modules_main/ToChargeByStage_Admin.js

@@ -95,6 +95,7 @@ layui.config({
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '扣款状态', sort: true }
+            , { field: 'KindName', width: 200, title: '扣款类别', sort: true }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'MakerName', width: 200, title: '创客姓名', sort: true }
             , { field: 'MakerMobile', width: 200, title: '创客手机号', sort: true }