Преглед изворни кода

数据迁移添加更新时间

DuGuYang пре 2 година
родитељ
комит
66e9fc0f70

+ 2 - 0
Areas/Admin/Controllers/BsServer/BaseController.cs

@@ -171,11 +171,13 @@ namespace MySystem.Areas.Admin.Controllers
                     var info = db.UserMoveInfo.FirstOrDefault(m => m.UserId == UserId) ?? new Models.UserMoveInfo();
                     if (!string.IsNullOrEmpty(PayPwd)) info.PayPwd = PayPwd;
                     if (!string.IsNullOrEmpty(LoginPwd)) info.LoginPwd = LoginPwd;
+                    info.UpdateTime = DateTime.Now;
                 }
                 else
                 {
                     Models.UserMoveInfo query = db.UserMoveInfo.Add(new Models.UserMoveInfo()
                     {
+                        UpdateTime = DateTime.Now,
                         UserId = UserId,
                         PayPwd = PayPwd,
                         LoginPwd = LoginPwd

+ 4 - 4
Models/CustomQuerySub.cs

@@ -17,11 +17,11 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
-        public string AdminNames { get; set; }
-        public string Title { get; set; }
-        public string SqlContent { get; set; }
-        public int ParentId { get; set; }
         public string Alias { get; set; }
         public int Kind { get; set; }
+        public int ParentId { get; set; }
+        public string SqlContent { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
     }
 }

+ 20 - 0
Models/ProfitRewardExport.cs

@@ -39,5 +39,25 @@ namespace MySystem.Models
         public decimal ProfitCreditTradeAmt { get; set; }
         public decimal ProfitCreditTradeProfit2 { get; set; }
         public decimal ProfitCreditTradeAmt2 { get; set; }
+        public decimal ProfitCreditTradeProfit2Before { get; set; }
+        public decimal ProfitCreditTradeAmt2Before { get; set; }
+        public decimal ProfitCreditTradeProfitBefore { get; set; }
+        public decimal ProfitCreditTradeAmtBefore { get; set; }
+        public decimal DebitTradeProfitBefore { get; set; }
+        public decimal DebitTradeAmtBefore { get; set; }
+        public decimal NotHelpCreditTradeProfitBefore { get; set; }
+        public decimal NotHelpCreditTradeAmtBefore { get; set; }
+        public decimal HelpCreditTradeProfitBefore { get; set; }
+        public decimal HelpCreditTradeAmtBefore { get; set; }
+        public decimal NonQrCreditTradeProfitBefore { get; set; }
+        public decimal NonQrCreditTradeAmtBefore { get; set; }
+        public decimal QrCreditTradeProfitBefore { get; set; }
+        public decimal QrCreditTradeAmtBefore { get; set; }
+        public decimal CreditTradeProfitBefore { get; set; }
+        public decimal CreditTradeAmtBefore { get; set; }
+        public int BeforeRank { get; set; }
+        public int LeaderRank { get; set; }
+        public int OperateRank { get; set; }
+        public int MaxRank { get; set; }
     }
 }

+ 10 - 0
Models/RecommendOrderCheck.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class RecommendOrderCheck
+    {
+        public int OrderId { get; set; }
+    }
+}

+ 1 - 0
Models/UserMoveInfo.cs

@@ -8,5 +8,6 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public string PayPwd { get; set; }
         public string LoginPwd { get; set; }
+        public DateTime? UpdateTime { get; set; }
     }
 }

+ 23 - 0
Models/UserRankWhiteBefore.cs

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

+ 168 - 38
Models/WebCMSEntities.cs

@@ -185,6 +185,7 @@ namespace MySystem.Models
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
         public virtual DbSet<PullnewSummary> PullnewSummary { get; set; }
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { get; set; }
+        public virtual DbSet<RecommendOrderCheck> RecommendOrderCheck { get; set; }
         public virtual DbSet<RecommendTradeSummary> RecommendTradeSummary { get; set; }
         public virtual DbSet<RecycMachineOrder> RecycMachineOrder { get; set; }
         public virtual DbSet<RecycMachineOrderPos> RecycMachineOrderPos { get; set; }
@@ -284,6 +285,7 @@ namespace MySystem.Models
         public virtual DbSet<UserProfitSubsidySummary> UserProfitSubsidySummary { get; set; }
         public virtual DbSet<UserRank> UserRank { get; set; }
         public virtual DbSet<UserRankWhite> UserRankWhite { get; set; }
+        public virtual DbSet<UserRankWhiteBefore> UserRankWhiteBefore { get; set; }
         public virtual DbSet<UserRebateDetail> UserRebateDetail { get; set; }
         public virtual DbSet<UserSnActInfo> UserSnActInfo { get; set; }
         public virtual DbSet<UserSnDelayChange> UserSnDelayChange { get; set; }
@@ -2716,6 +2718,10 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ExcuteFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否执行");
+
                 entity.Property(e => e.QueryCount)
                     .HasColumnType("int(11)")
                     .HasComment("点击量");
@@ -2768,15 +2774,11 @@ namespace MySystem.Models
                 entity.Property(e => e.Version)
                     .HasColumnType("int(11)")
                     .HasComment("版本号");
-
-                entity.Property(e => e.ExcuteFlag)
-                    .HasColumnType("int(11)")
-                    .HasComment("是否执行");
             });
 
             modelBuilder.Entity<CustomQuerySub>(entity =>
             {
-                entity.HasComment("自定义查询子项");
+                entity.HasComment("自定义操作子项");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
@@ -2786,19 +2788,28 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.CreateDate)
-                    .HasColumnType("datetime")
-                    .HasComment("创建时间");
+                entity.Property(e => e.Alias)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("别名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.CreateMan)
                     .HasColumnType("varchar(50)")
-                    .HasComment("创建人")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.QueryCount)
+                entity.Property(e => e.Kind)
                     .HasColumnType("int(11)")
-                    .HasComment("点击量");
+                    .HasComment("类型");
+
+                entity.Property(e => e.ParentId)
+                    .HasColumnType("int(11)")
+                    .HasComment("父级Id");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
@@ -2815,9 +2826,7 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.Sort)
-                    .HasColumnType("int(11)")
-                    .HasComment("排序序号");
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
 
                 entity.Property(e => e.SqlContent)
                     .HasColumnType("mediumtext")
@@ -2825,9 +2834,7 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.Status)
-                    .HasColumnType("int(11)")
-                    .HasComment("状态");
+                entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.Title)
                     .HasColumnType("varchar(50)")
@@ -2835,33 +2842,14 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.UpdateDate)
-                    .HasColumnType("datetime")
-                    .HasComment("更新时间");
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)
                     .HasColumnType("varchar(50)")
-                    .HasComment("更新人")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.Version)
-                    .HasColumnType("int(11)")
-                    .HasComment("版本号");
-
-                entity.Property(e => e.ParentId)
-                    .HasColumnType("int(11)")
-                    .HasComment("类型");
-
-                entity.Property(e => e.Kind)
-                    .HasColumnType("int(11)")
-                    .HasComment("父级Id");
-
-                entity.Property(e => e.Alias)
-                    .HasColumnType("varchar(50)")
-                    .HasComment("别名")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<CustomTagSet>(entity =>
@@ -12328,6 +12316,10 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BeforeRank)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客存量预设职级");
+
                 entity.Property(e => e.BrandName)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -12342,12 +12334,28 @@ namespace MySystem.Models
 
                 entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.CreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量贷记卡交易额");
+
                 entity.Property(e => e.CreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.CreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量贷记卡分润");
+
                 entity.Property(e => e.DebitTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DebitTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量借记卡交易额");
+
                 entity.Property(e => e.DebitTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DebitTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量借记卡分润");
+
                 entity.Property(e => e.DirectFlag)
                     .HasColumnType("varchar(10)")
                     .HasCharSet("utf8")
@@ -12355,37 +12363,97 @@ namespace MySystem.Models
 
                 entity.Property(e => e.HelpCreditTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.HelpCreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付扶持期贷记卡交易额");
+
                 entity.Property(e => e.HelpCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.HelpCreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付扶持期贷记卡分润");
+
+                entity.Property(e => e.LeaderRank)
+                    .HasColumnType("int(11)")
+                    .HasComment("盟主预设职级");
+
                 entity.Property(e => e.MakerCode)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MaxRank)
+                    .HasColumnType("int(11)")
+                    .HasComment("最大职级");
+
                 entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.NonQrCreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付贷记卡交易额");
+
                 entity.Property(e => e.NonQrCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.NonQrCreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付贷记卡分润");
+
                 entity.Property(e => e.NotHelpCreditTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.NotHelpCreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付稳定期贷记卡交易额");
+
                 entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.NotHelpCreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付稳定期贷记卡分润");
+
+                entity.Property(e => e.OperateRank)
+                    .HasColumnType("int(11)")
+                    .HasComment("运营中心预设职级");
+
                 entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.ProfitCreditTradeAmt2)
                     .HasColumnType("decimal(18,2)")
                     .HasComment("非云闪付盈利期2贷记卡交易额");
 
+                entity.Property(e => e.ProfitCreditTradeAmt2Before)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付盈利期2贷记卡交易额");
+
+                entity.Property(e => e.ProfitCreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付盈利期贷记卡交易额");
+
                 entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.ProfitCreditTradeProfit2)
                     .HasColumnType("decimal(18,2)")
                     .HasComment("非云闪付盈利期2贷记卡分润");
 
+                entity.Property(e => e.ProfitCreditTradeProfit2Before)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付盈利期2贷记卡分润");
+
+                entity.Property(e => e.ProfitCreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量非云闪付盈利期贷记卡分润");
+
                 entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.QrCreditTradeAmtBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量云闪付贷记卡交易额");
+
                 entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.QrCreditTradeProfitBefore)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("存量云闪付贷记卡分润");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.Rank).HasColumnType("int(11)");
@@ -13244,6 +13312,18 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<RecommendOrderCheck>(entity =>
+            {
+                entity.HasKey(e => e.OrderId)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("推荐王订单");
+
+                entity.Property(e => e.OrderId)
+                    .HasColumnType("int(11)")
+                    .HasComment("订单Id");
+            });
+
             modelBuilder.Entity<RecommendTradeSummary>(entity =>
             {
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.PosSn })
@@ -19455,6 +19535,10 @@ namespace MySystem.Models
                     .HasComment("支付密码")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
             });
 
             modelBuilder.Entity<UserOfflineSignInRecords>(entity =>
@@ -19827,6 +19911,52 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserRankWhiteBefore>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Rank).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.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<UserRebateDetail>(entity =>
             {
                 entity.HasComment("返利明细表");