暂存

AppStart/Helper/LeaderTimeoutSendMessageService.cs

@@ -28,43 +28,49 @@ public class LeaderTimeoutSendMessageService
     {
         while (true)
         {
-            WebCMSEntities db = new WebCMSEntities();
-            try
+            if (DateTime.Now.Hour < 20)
             {
-                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)
+                try
                 {
-                    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))
+                    string check = function.ReadInstance("/LeaderTimeoutSendMessage/check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt");
+                    if (string.IsNullOrEmpty(check))
                     {
-                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        function.WritePage("/LeaderTimeoutSendMessage/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                        WebCMSEntities db = new WebCMSEntities();
+                        var leaders = db.Leaders.Select(m => new { m.UserId, m.ExpiredDate }).ToList();
+                        var time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+                        foreach (var item in leaders)
                         {
-                            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,
-                        }));
+                            var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
+                            var leaderTimeOutDate = DateTime.Parse(item.ExpiredDate.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(), "盟主过期消息推送线程异常");
+                }
             }
-            catch (Exception ex)
-            {
-                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "盟主过期消息推送线程异常");
-            }
-            db.Dispose();
             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 LeaderStatusSelect, string UpateDateData, string LeaderTimeOutDateData, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(Leaders data, string UserIdMakerCode, string LeaderLevelSelect, string LeaderStatusSelect, string LastBuyDateData, string ExpiredDateData, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -111,31 +111,20 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             //最后购买时间
-            if (!string.IsNullOrEmpty(UpateDateData))
+            if (!string.IsNullOrEmpty(LastBuyDateData))
             {
-                string[] datelist = UpateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string[] datelist = LastBuyDateData.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'";
+                condition += " and LastBuyDate>='" + start + " 00:00:00' and LastBuyDate<='" + end + " 23:59:59'";
             }
             //盟主到期时间
-            if (!string.IsNullOrEmpty(LeaderTimeOutDateData))
+            if (!string.IsNullOrEmpty(ExpiredDateData))
             {
-                string[] datelist = LeaderTimeOutDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string[] datelist = ExpiredDateData.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 UserId in (" + Ids + ")";
+                condition += " and ExpiredDate>='" + start + " 00:00:00' and ExpiredDate<='" + end + " 23:59:59'";
             }
 
 
@@ -153,8 +142,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["LeaderReserve"] = userAccount.LeaderReserve;
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
 
-                var userRankWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == UserId) ?? new UserRankWhite();
-                if (userRankWhite.UpdateDate > DateTime.Now)
+                var ExpiredDate = DateTime.Parse(dic["ExpiredDate"].ToString());
+                if (ExpiredDate > DateTime.Now)
                 {
                     dic["LeaderStatus"] = "未过期";
                 }
@@ -162,7 +151,6 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     dic["LeaderStatus"] = "已过期";
                 }
-                dic["LeaderTimeOutDate"] = userRankWhite.UpdateDate == null ? "": userRankWhite.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 dic.Remove("UserId");
                 //盟主等级
                 int LeaderLevel = int.Parse(dic["LeaderLevel"].ToString());

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

@@ -60,14 +60,14 @@
                     <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="UpateDateData"
+                            <input class="layui-input" type="text" readonly name="LastBuyDateData" id="LastBuyDateData"
                                 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="LeaderTimeOutDateData"
+                            <input class="layui-input" type="text" readonly name="ExpiredDateData" id="ExpiredDateData"
                                 placeholder="" autocomplete="off">
                         </div>
                     </div>

Models/ExportExcels.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ExportExcels
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string FileName { get; set; }
+        public int SysId { get; set; }
+        public string FileUrl { get; set; }
+    }
+}

Models/Leaders.cs

@@ -16,5 +16,7 @@ namespace MySystem.Models
         public string SeoDescription { get; set; }
         public int LeaderLevel { get; set; }
         public int UserId { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public DateTime? LastBuyDate { get; set; }
     }
 }

Models/PosCoupons.cs

@@ -24,5 +24,6 @@ namespace MySystem.Models
         public int HelpProfitStatus { get; set; }
         public ulong HelpProfitFlag { get; set; }
         public int OpId { get; set; }
+        public int OrderId { get; set; }
     }
 }

Models/ProductNorm.cs

@@ -30,5 +30,6 @@ namespace MySystem.Models
         public decimal Price { get; set; }
         public string IdList { get; set; }
         public string ColName { get; set; }
+        public int StartBuyCount { get; set; }
     }
 }

Models/Products.cs

@@ -54,5 +54,10 @@ namespace MySystem.Models
         public string Contents { get; set; }
         public string Details { get; set; }
         public string ProductName { get; set; }
+        public int ProductKind { get; set; }
+        public int BannerSort { get; set; }
+        public string BannerPhoto { get; set; }
+        public ulong IsBanner { get; set; }
+        public int StartBuyCount { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -48,6 +48,7 @@ namespace MySystem.Models
         public virtual DbSet<CouponsForUser> CouponsForUser { get; set; }
         public virtual DbSet<CustomTagSet> CustomTagSet { get; set; }
         public virtual DbSet<ErpCompanys> ErpCompanys { get; set; }
+        public virtual DbSet<ExportExcels> ExportExcels { get; set; }
         public virtual DbSet<FileUpdateInfo> FileUpdateInfo { get; set; }
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
@@ -2731,6 +2732,48 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ExportExcels>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FileName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.FileUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                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)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.SysId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<FileUpdateInfo>(entity =>
             {
                 entity.HasComment("资源文件更新信息");
@@ -4170,6 +4213,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.ExpiredDate).HasColumnType("datetime");
+
+                entity.Property(e => e.LastBuyDate).HasColumnType("datetime");
+
                 entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -7266,8 +7313,6 @@ namespace MySystem.Models
                 entity.HasKey(e => e.BankName)
                     .HasName("PRIMARY");
 
-                entity.HasComment("开户行对照表");
-
                 entity.Property(e => e.BankName)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -7751,8 +7796,6 @@ namespace MySystem.Models
                 entity.HasKey(e => e.OrderNo)
                     .HasName("PRIMARY");
 
-                entity.HasComment("订单号关联表");
-
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -7773,8 +7816,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderProduct>(entity =>
             {
-                entity.HasComment("订单商品");
-
                 entity.HasIndex(e => e.OrderId)
                     .HasName("OrderProductIndex");
 
@@ -7870,8 +7911,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderRefund>(entity =>
             {
-                entity.HasComment("退款申请");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.Amount).HasColumnType("decimal(18,2)");
@@ -7953,8 +7992,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderRefundReason>(entity =>
             {
-                entity.HasComment("退款原因");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -8002,8 +8039,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<Orders>(entity =>
             {
-                entity.HasComment("创客订单");
-
                 entity.HasIndex(e => e.StoreId)
                     .HasName("OrdersStoreIdIndex");
 
@@ -8569,6 +8604,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.OpId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -8782,8 +8819,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<PosMachinesTwo>(entity =>
             {
-                entity.HasComment("机具库");
-
                 entity.HasIndex(e => new { e.PosSn, e.BrandId })
                     .HasName("PosMachinesTwoIndex");
 
@@ -9721,6 +9756,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StartBuyCount).HasColumnType("int(11)");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.Stock).HasColumnType("int(11)");
@@ -9856,10 +9893,17 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BannerPhoto)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BannerSort).HasColumnType("int(11)");
+
                 entity.Property(e => e.BuyCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.ColId)
-                    .HasColumnType("varchar(30)")
+                    .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -9897,6 +9941,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Integral).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.IsBanner)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.IsLimit)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
@@ -9960,6 +10008,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ProductKind).HasColumnType("int(11)");
+
                 entity.Property(e => e.ProductName)
                     .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
@@ -9993,6 +10043,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.SourcePrice).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.StartBuyCount).HasColumnType("int(11)");
+
                 entity.Property(e => e.StartDate).HasColumnType("datetime");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
@@ -14776,8 +14828,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<TradeDaySummary>(entity =>
             {
-                entity.HasComment("交易日汇总");
-
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.TradeDate, e.BrandId, e.QueryCount, e.VipFlag, e.PayType, e.SeoTitle })
                     .HasName("TradeDaySummaryIndex");
 
@@ -14961,7 +15011,8 @@ namespace MySystem.Models
 
             modelBuilder.Entity<TradeRecord>(entity =>
             {
-                entity.HasComment("交易记录");
+                entity.HasIndex(e => new { e.BrandId, e.UserId, e.MerchantId, e.MerNo, e.SnNo, e.CreateDate })
+                    .HasName("TradeRecordIndex");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
@@ -17350,7 +17401,8 @@ namespace MySystem.Models
 
             modelBuilder.Entity<UserSnDelayChange>(entity =>
             {
-                entity.HasComment("创客机具延迟变动明细表");
+                entity.HasIndex(e => e.QueryCount)
+                    .HasName("UserSnDelayChangeIndex");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
@@ -17954,8 +18006,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<Users>(entity =>
             {
-                entity.HasComment("创客");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.AccessToken)
@@ -18137,7 +18187,6 @@ namespace MySystem.Models
 
                 entity.Property(e => e.MakerCode)
                     .HasColumnType("varchar(32)")
-                    .HasComment("创客编号")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 

Startup.cs

@@ -141,6 +141,7 @@ namespace MySystem
             ExcelHelper.Instance.Start();
             OpExcelHelper.Instance.Start();
             SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
+            LeaderTimeoutSendMessageService.Instance.StartEverTime(); //盟主过期消息推送
 
 
         }

wwwroot/layuiadmin/modules_main/Leaders_Admin.js

@@ -58,8 +58,8 @@ layui.config({
         }
     });
 
-    var layUpateDateData = laydate.render({
-        elem: '#UpateDateData',
+    var layLastBuyDateData = laydate.render({
+        elem: '#LastBuyDateData',
         type: 'date',
         range: true,
         trigger: 'click',
@@ -68,26 +68,26 @@ layui.config({
             if (date.year == endDate.year && endDate.month - date.month <= 1) {
                 if (endDate.month - date.month == 1 && endDate.date > date.date) {
                     op = false;
-                    layUpateDateData.hint('日期范围请不要超过1个月');
+                    layLastBuyDateData.hint('日期范围请不要超过1个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layUpateDateData.hint('日期范围请不要超过1个月');
+                layLastBuyDateData.hint('日期范围请不要超过1个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);
             }
             if (op) {
-                $('#UpateDateData').val(value);
+                $('#LastBuyDateData').val(value);
             }
         }
     });
 
-    var layLeaderTimeOutDateData = laydate.render({
-        elem: '#LeaderTimeOutDateData',
+    var layExpiredDateData = laydate.render({
+        elem: '#ExpiredDateData',
         type: 'date',
         range: true,
         trigger: 'click',
@@ -96,20 +96,20 @@ layui.config({
             if (date.year == endDate.year && endDate.month - date.month <= 1) {
                 if (endDate.month - date.month == 1 && endDate.date > date.date) {
                     op = false;
-                    layLeaderTimeOutDateData.hint('日期范围请不要超过1个月');
+                    layExpiredDateData.hint('日期范围请不要超过1个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layLeaderTimeOutDateData.hint('日期范围请不要超过1个月');
+                layExpiredDateData.hint('日期范围请不要超过1个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);
             }
             if (op) {
-                $('#LeaderTimeOutDateData').val(value);
+                $('#ExpiredDateData').val(value);
             }
         }
     });