暂存

AppStart/Helper/LeaderTimeoutSendMessageService.cs

@@ -0,0 +1,71 @@
+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 LeaderTimeoutSendMessageService
+{
+    public readonly static LeaderTimeoutSendMessageService Instance = new LeaderTimeoutSendMessageService();
+    private LeaderTimeoutSendMessageService()
+    {
+    }
+
+    public void StartEverTime()
+    {
+        Thread th = new Thread(StartEverTimeDo);
+        th.IsBackground = true;
+        th.Start();
+    }
+
+    private void StartEverTimeDo()
+    {
+        while (true)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            try
+            {
+                var leaders = db.Leaders.Select(m => new { m.UserId }).ToList();
+                var time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+                foreach (var item in leaders)
+                {
+                    var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
+                    var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId) ?? new UserRankWhite();
+                    var leaderTimeOutDate = DateTime.Parse(userRankWhite.UpdateDate.Value.ToString("yyyy-MM-dd"));
+                    if (time <= leaderTimeOutDate.AddDays(-5))
+                    {
+                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        {
+                            UserId = item.UserId, //创客
+                            Title = "盟主权益即将到期提醒", //标题
+                            Content = "<div class='f16'>尊敬的" + user.RealName + "创客您好:<br/>您的盟主即将到期，为保障您的收益持续到账，请尽快续期！</ div > ",//内容
+                            CreateDate = DateTime.Now,
+                        }));
+                    }
+                    if (time >= leaderTimeOutDate)
+                    {
+                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        {
+                            UserId = item.UserId, //创客
+                            Title = "盟主权益到期提醒", //标题
+                            Content = "<div class='f16'>尊敬的" + user.RealName + "创客您好:<br/>您的盟主已经过期，重新开通后可恢复相关权益！</ div > ",//内容
+                            CreateDate = DateTime.Now,
+                        }));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "盟主过期消息推送线程异常");
+            }
+            db.Dispose();
+            Thread.Sleep(1000);
+        }
+    }
+}

AppStart/Helper/TimeOutPosChargeReturnService.cs

@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Threading;
-using MySystem.Models;
-using Library;
-
-namespace MySystem
-{
-    /// <summary>
-    /// 过期兑换机具循环截止时间超过15天激活扣费退还
-    /// </summary>
-    public class TimeOutPosChargeReturnService
-    {
-        public readonly static TimeOutPosChargeReturnService Instance = new TimeOutPosChargeReturnService();
-        private TimeOutPosChargeReturnService()
-        { }
-
-        public void Start()
-        {
-            Thread th = new Thread(doSomething);
-            th.IsBackground = true;
-            th.Start();
-        }
-
-        public void doSomething()
-        {
-            while (true)
-            {
-                if (DateTime.Now.Hour < 18)
-                {
-                    try
-                    {
-                        string check = function.ReadInstance("/TimeOutPosChargeReturn/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                        if (string.IsNullOrEmpty(check))
-                        {
-                            function.WritePage("/TimeOutPosChargeReturn/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
-                            WebCMSEntities db = new WebCMSEntities();
-                            DataTable dt = CustomerSqlConn.dtable("SELECT a.Id Id FROM ToChargeBackRecord a LEFT JOIN PosMachinesTwo b ON a.Remark=b.PosSn WHERE a.`Status`=1 AND b.PosSnType=0  AND b.BindingState=1 AND b.ActivationState=1", MysqlConn.connstr);//循环过期超过15天激活机具退费创客
-                            foreach (DataRow item in dt.Rows)
-                            {
-                                int Id = int.Parse(item["Id"].ToString());
-                                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == Id && m.Status == 1) ?? new ToChargeBackRecord();
-                                if (toChargeBackRecord.Id > 0)
-                                {
-                                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
-                                    var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
-                                    {
-                                        CreateDate = DateTime.Now,
-                                        UserId = toChargeBackRecord.UserId,
-                                        BeforeBalanceAmount = userAccount.BalanceAmount,
-                                        AfterBalanceAmount = userAccount.BalanceAmount + toChargeBackRecord.ChargeAmount,
-                                        ChangeAmount = toChargeBackRecord.ChargeAmount,
-                                        ChangeType = 126,//过期兑换机具超过15天激活扣费退还
-                                        Remark = "机具货款退还",
-
-                                    }).Entity;
-                                    toChargeBackRecord.Status = 2;//过期兑换机具循环截止时间超过15天激活扣费退还标识
-                                    userAccount.BalanceAmount += toChargeBackRecord.ChargeAmount;
-                                    db.SaveChanges();
-                                }
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "过期兑换机具超过15天激活扣费退还");
-                    }
-                }
-                Thread.Sleep(1000);
-            }
-        }
-    }
-}

AppStart/Helper/TimeOutPosChargeService.cs

@@ -1,209 +0,0 @@
-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 < 3)
-                {
-                    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)
-            {
-                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == items.UserId) ?? new UserAccount();
-                var record = info.FirstOrDefault(m => m.Id == items.Id);
-
-                if (userAccount.BalanceAmount >= record.ChargeAmount)
-                {
-                    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;
-                        }
-                    }
-                    if (userAccount.ToChargeAmount >= record.ChargeAmount)
-                    {
-                        userAccount.ToChargeAmount -= record.ChargeAmount;//分期扣款
-                    }
-                    userAccount.BalanceAmount -= record.ChargeAmount;//扣减余额
-                }
-            }
-            db.SaveChanges();
-        }
-    }
-}

AppStart/Helper/TimeOutPosSendMessageService.cs

@@ -1,83 +0,0 @@
-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 TimeOutPosSendMessageService
-    {
-        public readonly static TimeOutPosSendMessageService Instance = new TimeOutPosSendMessageService();
-        private TimeOutPosSendMessageService()
-        { }
-
-        public void Start()
-        {
-            Thread th = new Thread(doSomething);
-            th.IsBackground = true;
-            th.Start();
-        }
-
-        public void doSomething()
-        {
-            while (true)
-            {
-                if (DateTime.Now.Hour < 20)
-                {
-                    try
-                    {
-                        string check = function.ReadInstance("/TimeOutPosSendMessage/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
-                        if (string.IsNullOrEmpty(check))
-                        {
-                            function.WritePage("/TimeOutPosSendMessage/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
-                            WebCMSEntities db = new WebCMSEntities();
-                            var date = DateTime.Now.AddDays(-55).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.connstr);//消息推送创客
-                            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();//循环过期超过55天机具
-                            var brandInfo = db.KqProducts.ToList();
-                            foreach (DataRow item in dt.Rows)
-                            {
-                                int BuyUserId = int.Parse(item["BuyUserId"].ToString());
-                                var BrandName = "";
-                                var PosSn = "";
-                                var SendInfo = "";
-                                foreach (var items in brandInfo)
-                                {
-                                    int BrandId = int.Parse(items.Id.ToString());
-                                    BrandName = items.Name.ToString();
-                                    var posInfo = query.Where(m => m.BuyUserId == BuyUserId && m.BrandId == BrandId);
-                                    foreach (var pos in posInfo)
-                                    {
-                                        PosSn += BrandName +"："+pos.PosSn + "," + "<br/>";
-                                    }
-                                }
-                                SendInfo = PosSn.TrimEnd(',') + "<br/>";
-                                RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                                {
-                                    UserId = BuyUserId, //创客
-                                    Title = "机具循环过期提醒", //标题
-                                    Content = "<div class='f16'>尊敬的创客您好:<br/>您的" + SendInfo + "循环已过期五十五天以上，请在五日内完成激活或通过机具回收回寄该机具。</ div > ",//内容
-                                    Summary = "系统检测到您的部分机具可回收，请打开我的-回收机具及时处理！",
-                                    CreateDate = DateTime.Now,
-                                }));
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "过期机具预扣费消息推送异常");
-                    }
-                }
-                Thread.Sleep(1000);
-            }
-        }
-    }
-}

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 盟主管理列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Leaders data, string UserIdMakerCode, string LeaderLevelSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(Leaders data, string UserIdMakerCode, string LeaderLevelSelect, string LeaderStatusSelect, string UpateDateData, string LeaderTimeOutDateData, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -67,7 +67,42 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and LeaderLevel=" + LeaderLevelSelect;
             }
-            //创建时间
+            //状态
+            if (!string.IsNullOrEmpty(LeaderStatusSelect))
+            {
+                var leaders = db.Leaders.Select(m => new { m.UserId }).ToList();
+                var Ids = "";
+                DateTime time = DateTime.Now;
+                if (LeaderStatusSelect == "0")
+                {
+                    foreach (var item in leaders)
+                    {
+                        var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId && m.UpdateDate >= time) ?? new UserRankWhite();
+                        if (userRankWhite.Id > 0)
+                        {
+                            Ids += item.UserId + ",";
+                        }
+                    }
+                    Ids = Ids.TrimEnd(',');
+                    condition += " and Id in (" + Ids + ")";
+                }
+                else
+                {
+
+                    foreach (var item in leaders)
+                    {
+                        var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId && m.UpdateDate >= time) ?? new UserRankWhite();
+                        if (userRankWhite.Id > 0)
+                        {
+                            Ids += item.UserId + ",";
+                        }
+                    }
+                    Ids = Ids.TrimEnd(',');
+                    condition += " and Id in (" + Ids + ")";
+                }
+
+            }
+            //首次购买时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
@@ -75,6 +110,33 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
+            //最后购买时间
+            if (!string.IsNullOrEmpty(UpateDateData))
+            {
+                string[] datelist = UpateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UpateDate>='" + start + " 00:00:00' and UpateDate<='" + end + " 23:59:59'";
+            }
+            //盟主到期时间
+            if (!string.IsNullOrEmpty(LeaderTimeOutDateData))
+            {
+                string[] datelist = LeaderTimeOutDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                DateTime start = DateTime.Parse(datelist[0] + " 00:00:00");
+                DateTime end = DateTime.Parse(datelist[1] + " 23:59:59");
+                var leaders = db.Leaders.Select(m => new { m.UserId }).ToList();
+                var Ids = "";
+                foreach (var item in leaders)
+                {
+                    var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == item.UserId && m.UpdateDate >= start && m.UpdateDate <= end) ?? new UserRankWhite();
+                    if (userRankWhite.Id > 0)
+                    {
+                        Ids += item.UserId + ",";
+                    }
+                }
+                Ids = Ids.TrimEnd(',');
+                condition += " and Id in (" + Ids + ")";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Leaders", Fields, "Id desc", "0", page, limit, condition);
@@ -90,6 +152,17 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["LeaderReserve"] = userAccount.LeaderReserve;
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
+
+                var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == UserId) ?? new UserRankWhite();
+                if (userRankWhite.UpdateDate > DateTime.Now)
+                {
+                    dic["LeaderStatus"] = "未过期";
+                }
+                else
+                {
+                    dic["LeaderStatus"] = "已过期";
+                }
+                dic["LeaderTimeOutDate"] = userRankWhite.UpdateDate;
                 dic.Remove("UserId");
                 //盟主等级
                 int LeaderLevel = int.Parse(dic["LeaderLevel"].ToString());

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

@@ -51,12 +51,26 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
+                        <label class="layui-form-label">首次购买时间</label>
                         <div class="layui-input-inline">
                             <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">
+                            <input class="layui-input" type="text" readonly name="UpateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">盟主到期时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="LeaderTimeOutDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">盟主等级</label>
                         <div class="layui-input-inline">
@@ -67,6 +81,16 @@
                             </select>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="LeaderStatusSelect" name="LeaderStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">未过期</option>
+                                <option value="1">已过期</option>
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">

Startup.cs

@@ -143,8 +143,6 @@ namespace MySystem
             SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
 
 
-            // InstallmentDeductionService.Instance.Start();//每月20号执行分期扣费
-            // TimeOutPosChargeService.Instance.StartDoChargeAmount();//每天执行预扣款
         }
 
 

wwwroot/layuiadmin/modules_main/Leaders_Admin.js

@@ -94,7 +94,10 @@ layui.config({
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'UserIdRealName', width: 200, title: '真实姓名', sort: true }
-            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'CreateDate', width: 200, title: '首次购买时间', sort: true }
+            , { field: 'UpateDate', width: 200, title: '最后购买时间', sort: true }
+            , { field: 'LeaderTimeOutDate', width: 200, title: '盟主到期时间', sort: true }
+            , { field: 'LeaderStatus', width: 200, title: '状态', sort: true }
             , { field: 'LeaderLevel', width: 200, title: '盟主等级', sort: true }
             , { field: 'LeaderReserve', width: 200, title: '盟主储蓄金', sort: true }
             , { field: 'LeaderBalanceAmount', width: 200, title: '盟主可提现余额', sort: true }