完成

AppStart/Helper/AlipayPayBack2Service.cs

@@ -1158,19 +1158,24 @@ namespace MySystem
 
         public void AddLeader(WebCMSEntities db, int UserId, int LeaderLevel)
         {
+            int Month = LeaderLevel == 1 ? 6 : 12;
             Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId);
             if(leader == null)
             {
                 db.Leaders.Add(new Leaders()
                 {
+                    Id = UserId,
                     CreateDate = DateTime.Now, //设置时间
                     UserId = UserId, //用户
                     LeaderLevel = LeaderLevel,
+                    ExpiredDate = DateTime.Now.AddMonths(Month),
                 });
             }
             else
             {
                 leader.LeaderLevel = LeaderLevel;
+                leader.LastBuyDate = DateTime.Now;
+                leader.ExpiredDate = DateTime.Now.AddMonths(Month);
             }
             db.SaveChanges();
         }

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -29,6 +29,7 @@ namespace MySystem
                 {
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
+                    DateTime now = DateTime.Now;
                     DateTime start = DateTime.Now.AddDays(-10);
                     int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
                     IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate);
@@ -351,7 +352,7 @@ namespace MySystem
                                                 }
                                             }
                                             //发放大盟主奖励
-                                            if(pos.LeaderUserId > 0)
+                                            if(pos.LeaderUserId > 0 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate < now))
                                             {
                                                 RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
                                             }

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

@@ -4152,6 +4152,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)");
@@ -8447,6 +8451,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)
@@ -9589,6 +9595,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)");
@@ -9718,6 +9726,13 @@ 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)
@@ -9759,6 +9774,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'");
@@ -9822,6 +9841,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")
@@ -9855,6 +9876,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)");
@@ -17039,6 +17062,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<UserSnDelayChange>(entity =>
             {
+                entity.HasIndex(e => e.QueryCount)
+                    .HasName("UserSnDelayChangeIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActivityRuleId).HasColumnType("int(11)");

PxcModels/Leaders.cs

@@ -16,5 +16,7 @@ namespace MySystem.PxcModels
         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; }
     }
 }

PxcModels/PosCoupons.cs

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

PxcModels/ProductNorm.cs

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

PxcModels/Products.cs

@@ -54,5 +54,10 @@ namespace MySystem.PxcModels
         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; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -4152,6 +4152,10 @@ namespace MySystem.PxcModels
 
                 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)");
@@ -8447,6 +8451,8 @@ namespace MySystem.PxcModels
 
                 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)
@@ -9589,6 +9595,8 @@ namespace MySystem.PxcModels
 
                 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)");
@@ -9718,6 +9726,13 @@ namespace MySystem.PxcModels
             {
                 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)
@@ -9759,6 +9774,10 @@ namespace MySystem.PxcModels
 
                 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'");
@@ -9822,6 +9841,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ProductKind).HasColumnType("int(11)");
+
                 entity.Property(e => e.ProductName)
                     .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
@@ -9855,6 +9876,8 @@ namespace MySystem.PxcModels
 
                 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)");
@@ -17039,6 +17062,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<UserSnDelayChange>(entity =>
             {
+                entity.HasIndex(e => e.QueryCount)
+                    .HasName("UserSnDelayChangeIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActivityRuleId).HasColumnType("int(11)");