Browse Source

Merge branch 'release' into develop

lcl 1 year ago
parent
commit
7183a741fc

+ 33 - 23
AppStart/Helper/RecommandKingHelper.cs

@@ -26,23 +26,32 @@ namespace MySystem
         {
         {
             while (true)
             while (true)
             {
             {
-                Recommend();
-                if(DateTime.Now.Hour > 0 && DateTime.Now.Hour < 9)
+                if(DateTime.Now.Hour > 0 && DateTime.Now.Hour < 6)
                 {
                 {
-                    Thread.Sleep(3600000);
-                }
-                else
-                {
-                    Thread.Sleep(600000);
+                    Recommend();
                 }
                 }
+                Thread.Sleep(600000);
             }
             }
-        }    
+        }
         public void Recommend()
         public void Recommend()
         {
         {
+            string today = DateTime.Now.ToString("yyyy-MM-dd");
+            string checkFlag = function.ReadInstance("/RecommandKing/" + today + ".txt");
+            if(!string.IsNullOrEmpty(checkFlag))
+            {
+                function.WritePage("/RecommandKing/", today + ".txt", DateTime.Now.ToString());
+            }
+            List<int> Historys = new List<int>();
+            Historys.Add(565);
+            Historys.Add(139473);
+            Historys.Add(173790);
+            Historys.Add(174506);
+            string TradeMonth = DateTime.Now.AddMonths(-0).ToString("yyyyMM");
             DateTime check = DateTime.Parse("2023-10-01 00:00:00");
             DateTime check = DateTime.Parse("2023-10-01 00:00:00");
-            DateTime start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
-            string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-            string PreTradeMonth = DateTime.Now.AddMonths(-2).ToString("yyyyMM");
+            DateTime start = DateTime.Parse(DateTime.Now.AddMonths(-0).ToString("yyyy-MM") + "-01 00:00:00");
+            DateTime end = start.AddMonths(1);
+            CustomerSqlConn.op("delete from RecommendDirectUser where TradeMonth='" + TradeMonth + "'", MysqlConn.SqlConnStr);
+            string PreTradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             List<int> ProductIds = new List<int>();
             List<int> ProductIds = new List<int>();
             ProductIds.Add(10);
             ProductIds.Add(10);
             ProductIds.Add(11);
             ProductIds.Add(11);
@@ -70,13 +79,13 @@ namespace MySystem
                 if(ActCount == 0)
                 if(ActCount == 0)
                 {
                 {
                     MpMainModels.WebCMSEntities mpdb = new MpMainModels.WebCMSEntities();
                     MpMainModels.WebCMSEntities mpdb = new MpMainModels.WebCMSEntities();
-                    ActCount += mpdb.MerchantDepositOrder.Count(m => m.UserId == uid && m.CreateDate >= start && m.Status > 0 && m.UserId == uid);
+                    ActCount += mpdb.MerchantDepositOrder.Count(m => m.UserId == uid && m.CreateDate >= start && m.CreateDate < end && m.Status > 0 && m.UserId == uid);
                     mpdb.Dispose();
                     mpdb.Dispose();
                 }
                 }
                 if(ActCount == 0)
                 if(ActCount == 0)
                 {
                 {
                     MpMainModels2.WebCMSEntities mpdb = new MpMainModels2.WebCMSEntities();
                     MpMainModels2.WebCMSEntities mpdb = new MpMainModels2.WebCMSEntities();
-                    ActCount += mpdb.MerchantDepositOrder.Count(m => m.UserId == uid && m.CreateDate >= start && m.Status > 0 && m.UserId == uid);
+                    ActCount += mpdb.MerchantDepositOrder.Count(m => m.UserId == uid && m.CreateDate >= start && m.CreateDate < end && m.Status > 0 && m.UserId == uid);
                     mpdb.Dispose();
                     mpdb.Dispose();
                 }
                 }
                 if(ActCount > 0)
                 if(ActCount > 0)
@@ -89,22 +98,14 @@ namespace MySystem
                         {
                         {
                             string[] ParentNavList = ParentNav.Replace(",,", ",").Trim(',').Split(',');
                             string[] ParentNavList = ParentNav.Replace(",,", ",").Trim(',').Split(',');
                             Array.Reverse(ParentNavList);
                             Array.Reverse(ParentNavList);
+                            bool PassFlag = true;
                             foreach(string UserIdString in ParentNavList)
                             foreach(string UserIdString in ParentNavList)
                             {
                             {
                                 int UserId = int.Parse(UserIdString);
                                 int UserId = int.Parse(UserIdString);
-                                bool PassFlag = true;
                                 //判断是否历史达标创客
                                 //判断是否历史达标创客
                                 if(PassFlag)
                                 if(PassFlag)
                                 {
                                 {
-                                    if(db.RecommendDirectUser.Any(m => m.UserId == UserId && m.TradeMonth != TradeMonth))
-                                    {
-                                        PassFlag = false;
-                                    }
-                                }
-                                //判断上月交易额是否满3000W
-                                if(PassFlag)
-                                {
-                                    if(GetTradeAmt(UserId, PreTradeMonth) >= 30000000)
+                                    if(db.RecommendDirectUser.Any(m => m.UserId == UserId && m.TradeMonth != TradeMonth && m.QueryCount >= 50) || Historys.Contains(UserId))
                                     {
                                     {
                                         PassFlag = false;
                                         PassFlag = false;
                                     }
                                     }
@@ -122,6 +123,15 @@ namespace MySystem
                                         db.SaveChanges();
                                         db.SaveChanges();
                                     }
                                     }
                                     item.QueryCount += 1;
                                     item.QueryCount += 1;
+                                    db.SaveChanges();
+                                }
+                                //判断上月交易额是否满3000W
+                                if(PassFlag)
+                                {
+                                    if(GetTradeAmt(UserId, PreTradeMonth) >= 30000000)
+                                    {
+                                        PassFlag = false;
+                                    }
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 5 - 0
PxcModels/AppBottomNavs.cs

@@ -28,5 +28,10 @@ namespace MySystem.PxcModels
         public string PagPath { get; set; }
         public string PagPath { get; set; }
         public string ScrollerAnimationImages { get; set; }
         public string ScrollerAnimationImages { get; set; }
         public string Style { get; set; }
         public string Style { get; set; }
+        public string StatusBarColor { get; set; }
+        public int IconSize { get; set; }
+        public string PagDefaultIcon { get; set; }
+        public string PagLocalPath { get; set; }
+        public ulong ShowTitle { get; set; }
     }
     }
 }
 }

+ 1 - 1
PxcModels/PosMachinesTwo.cs

@@ -61,9 +61,9 @@ namespace MySystem.PxcModels
         public int RecycStatus { get; set; }
         public int RecycStatus { get; set; }
         public string OutBatchNo { get; set; }
         public string OutBatchNo { get; set; }
         public int WithholdFlag { get; set; }
         public int WithholdFlag { get; set; }
+        public int LastMerchantId { get; set; }
         public int IsSupplement { get; set; }
         public int IsSupplement { get; set; }
         public int IsOpAct { get; set; }
         public int IsOpAct { get; set; }
-        public int LastMerchantId { get; set; }
         public int CardType { get; set; }
         public int CardType { get; set; }
         public decimal DownFee { get; set; }
         public decimal DownFee { get; set; }
         public int FirstFlag { get; set; }
         public int FirstFlag { get; set; }

+ 10 - 0
PxcModels/RecommendOrderCheck.cs

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

+ 12 - 0
PxcModels/UserMoveInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserMoveInfo
+    {
+        public int UserId { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+    }
+}

+ 20 - 0
PxcModels/UserYearEndInCome.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserYearEndInCome
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public decimal InComeByYear { get; set; }
+        public string TradeYear { get; set; }
+        public int UserId { get; set; }
+        public int ParentUserId { get; set; }
+        public string ParentNav { get; set; }
+    }
+}

+ 30 - 0
PxcModels/UserYearEndSummary.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserYearEndSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int SeniorShareHolder { get; set; }
+        public int MiddleShareHolder { get; set; }
+        public int JuniorShareHolder { get; set; }
+        public decimal PersonalTradeAmountByYear { get; set; }
+        public int FifteenMillionTradeAmountUserCount { get; set; }
+        public int EightMillionTradeAmountUserCount { get; set; }
+        public int ThreeMillionTradeAmountUserCount { get; set; }
+        public int TeamMerchantActCountByYear { get; set; }
+        public int TeamTotalMakerByYear { get; set; }
+        public int PersonalMakerAddByYear { get; set; }
+        public decimal TeamTradeAmountByYear { get; set; }
+        public string TradeYear { get; set; }
+        public int UserId { get; set; }
+        public int? ParentUserId { get; set; }
+        public string ParentNav { get; set; }
+    }
+}

File diff suppressed because it is too large
+ 194 - 174
PxcModels/WebCMSEntities.cs


+ 5 - 0
ReadModels/AppBottomNavs.cs

@@ -28,5 +28,10 @@ namespace MySystem.ReadModels
         public string PagPath { get; set; }
         public string PagPath { get; set; }
         public string ScrollerAnimationImages { get; set; }
         public string ScrollerAnimationImages { get; set; }
         public string Style { get; set; }
         public string Style { get; set; }
+        public string StatusBarColor { get; set; }
+        public int IconSize { get; set; }
+        public string PagDefaultIcon { get; set; }
+        public string PagLocalPath { get; set; }
+        public ulong ShowTitle { get; set; }
     }
     }
 }
 }

+ 10 - 0
ReadModels/RecommendOrderCheck.cs

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

+ 12 - 0
ReadModels/UserMoveInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class UserMoveInfo
+    {
+        public int UserId { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+    }
+}

+ 20 - 0
ReadModels/UserYearEndInCome.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class UserYearEndInCome
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public decimal InComeByYear { get; set; }
+        public string TradeYear { get; set; }
+        public int UserId { get; set; }
+        public int ParentUserId { get; set; }
+        public string ParentNav { get; set; }
+    }
+}

+ 2 - 0
ReadModels/UserYearEndSummary.cs

@@ -24,5 +24,7 @@ namespace MySystem.ReadModels
         public decimal TeamTradeAmountByYear { get; set; }
         public decimal TeamTradeAmountByYear { get; set; }
         public string TradeYear { get; set; }
         public string TradeYear { get; set; }
         public int UserId { get; set; }
         public int UserId { get; set; }
+        public int? ParentUserId { get; set; }
+        public string ParentNav { get; set; }
     }
     }
 }
 }

+ 131 - 1
ReadModels/WebCMSEntities.cs

@@ -184,6 +184,7 @@ namespace MySystem.ReadModels
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
         public virtual DbSet<PullnewSummary> PullnewSummary { get; set; }
         public virtual DbSet<PullnewSummary> PullnewSummary { get; set; }
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { 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<RecommendTradeSummary> RecommendTradeSummary { get; set; }
         public virtual DbSet<RecycMachineOrder> RecycMachineOrder { get; set; }
         public virtual DbSet<RecycMachineOrder> RecycMachineOrder { get; set; }
         public virtual DbSet<RecycMachineOrderPos> RecycMachineOrderPos { get; set; }
         public virtual DbSet<RecycMachineOrderPos> RecycMachineOrderPos { get; set; }
@@ -276,6 +277,7 @@ namespace MySystem.ReadModels
         public virtual DbSet<UserLoginRecord> UserLoginRecord { get; set; }
         public virtual DbSet<UserLoginRecord> UserLoginRecord { get; set; }
         public virtual DbSet<UserMachineData> UserMachineData { get; set; }
         public virtual DbSet<UserMachineData> UserMachineData { get; set; }
         public virtual DbSet<UserMallLargeSn> UserMallLargeSn { get; set; }
         public virtual DbSet<UserMallLargeSn> UserMallLargeSn { get; set; }
+        public virtual DbSet<UserMoveInfo> UserMoveInfo { get; set; }
         public virtual DbSet<UserOfflineSignInRecords> UserOfflineSignInRecords { get; set; }
         public virtual DbSet<UserOfflineSignInRecords> UserOfflineSignInRecords { get; set; }
         public virtual DbSet<UserProfit> UserProfit { get; set; }
         public virtual DbSet<UserProfit> UserProfit { get; set; }
         public virtual DbSet<UserProfitSet> UserProfitSet { get; set; }
         public virtual DbSet<UserProfitSet> UserProfitSet { get; set; }
@@ -291,6 +293,7 @@ namespace MySystem.ReadModels
         public virtual DbSet<UserSwapWhite> UserSwapWhite { get; set; }
         public virtual DbSet<UserSwapWhite> UserSwapWhite { get; set; }
         public virtual DbSet<UserTradeDaySummary> UserTradeDaySummary { get; set; }
         public virtual DbSet<UserTradeDaySummary> UserTradeDaySummary { get; set; }
         public virtual DbSet<UserTradeMonthSummary> UserTradeMonthSummary { get; set; }
         public virtual DbSet<UserTradeMonthSummary> UserTradeMonthSummary { get; set; }
+        public virtual DbSet<UserYearEndInCome> UserYearEndInCome { get; set; }
         public virtual DbSet<UserYearEndSummary> UserYearEndSummary { get; set; }
         public virtual DbSet<UserYearEndSummary> UserYearEndSummary { get; set; }
         public virtual DbSet<Users> Users { get; set; }
         public virtual DbSet<Users> Users { get; set; }
 
 
@@ -298,7 +301,7 @@ namespace MySystem.ReadModels
         {
         {
             if (!optionsBuilder.IsConfigured)
             if (!optionsBuilder.IsConfigured)
             {
             {
-                optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
+                optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["ReadSqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
             }
             }
         }
         }
 
 
@@ -960,6 +963,10 @@ namespace MySystem.ReadModels
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
                     .HasCollation("utf8_general_ci");
 
 
+                entity.Property(e => e.IconSize)
+                    .HasColumnType("int(11)")
+                    .HasComment("图标尺寸");
+
                 entity.Property(e => e.NoPageHint)
                 entity.Property(e => e.NoPageHint)
                     .HasColumnType("varchar(50)")
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
@@ -975,6 +982,18 @@ namespace MySystem.ReadModels
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
                     .HasCollation("utf8_general_ci");
 
 
+                entity.Property(e => e.PagDefaultIcon)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("pag默认图标")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PagLocalPath)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("pag文件路径")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.PagPath)
                 entity.Property(e => e.PagPath)
                     .HasColumnType("varchar(200)")
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
@@ -1017,10 +1036,21 @@ namespace MySystem.ReadModels
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
                     .HasCollation("utf8_general_ci");
 
 
+                entity.Property(e => e.ShowTitle)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("是否显示标题");
+
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
 
+                entity.Property(e => e.StatusBarColor)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("状态栏底色")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Style)
                 entity.Property(e => e.Style)
                     .HasColumnType("varchar(30)")
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
                     .HasCharSet("utf8")
@@ -13027,6 +13057,18 @@ namespace MySystem.ReadModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
                 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 =>
             modelBuilder.Entity<RecommendTradeSummary>(entity =>
             {
             {
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.PosSn })
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.PosSn })
@@ -19260,6 +19302,30 @@ namespace MySystem.ReadModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
             });
 
 
+            modelBuilder.Entity<UserMoveInfo>(entity =>
+            {
+                entity.HasKey(e => e.UserId)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("创客迁移字段表");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.LoginPwd)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("登录密码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PayPwd)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("支付密码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<UserOfflineSignInRecords>(entity =>
             modelBuilder.Entity<UserOfflineSignInRecords>(entity =>
             {
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -20422,6 +20488,63 @@ namespace MySystem.ReadModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
             });
 
 
+            modelBuilder.Entity<UserYearEndInCome>(entity =>
+            {
+                entity.HasComment("创客年终总结");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.InComeByYear)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("年度团队交易额");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("longtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级创客Id");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TradeYear)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("统计年份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<UserYearEndSummary>(entity =>
             modelBuilder.Entity<UserYearEndSummary>(entity =>
             {
             {
                 entity.HasComment("创客年终总结");
                 entity.HasComment("创客年终总结");
@@ -20451,6 +20574,13 @@ namespace MySystem.ReadModels
                     .HasColumnType("int(11)")
                     .HasColumnType("int(11)")
                     .HasComment("团队新增中级股东");
                     .HasComment("团队新增中级股东");
 
 
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("longtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PersonalMakerAddByYear)
                 entity.Property(e => e.PersonalMakerAddByYear)
                     .HasColumnType("int(11)")
                     .HasColumnType("int(11)")
                     .HasComment("年度个人新增团队成员");
                     .HasComment("年度个人新增团队成员");

+ 56 - 56
Startup.cs

@@ -166,68 +166,68 @@ namespace MySystem
             }
             }
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             {
             {
-                SycnSpBindService.Instance.Start(); //同步SP绑定数据
-                SycnSpBindService.Instance.StartSim(); //同步SP广电卡绑定数据
-                SycnSpMerchantService.Instance.Start(); //同步SP商户数据
-                SycnSpActiveService.Instance.Start(); //同步SP激活数据
-                SycnSpTradeService.Instance.Start(); //同步SP交易数据
-                SycnSpTradeService.Instance.StartTradeStatus(); //恢复原始交易没有统计上的数据
-                SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
-                SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-                SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据
+                // SycnSpBindService.Instance.Start(); //同步SP绑定数据
+                // SycnSpBindService.Instance.StartSim(); //同步SP广电卡绑定数据
+                // SycnSpMerchantService.Instance.Start(); //同步SP商户数据
+                // SycnSpActiveService.Instance.Start(); //同步SP激活数据
+                // SycnSpTradeService.Instance.Start(); //同步SP交易数据
+                // SycnSpTradeService.Instance.StartTradeStatus(); //恢复原始交易没有统计上的数据
+                // SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
+                // SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
+                // SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据
 
 
-                StatService.Instance.StartActiveReward(); //实时处理激活奖励
-                StatService.Instance.StartActiveReward1(); //实时处理0押激活奖励
-                StatService.Instance.StartActiveReward2(); //实时处理盒易付0押激活奖励
-                StatService.Instance.StartActiveReward15(); //实时处理来客吧0押激活奖励
-                StatService.Instance.StartSimActive(); //实时广电卡激活奖励
-                StatService.Instance.StartOpenReward(); //实时获取开机奖励
-                LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-                OperatePrizeService.Instance.Start(); //运营中心奖励发奖
-                ActRewardService.Instance.Start(); //发放激活奖励
-                HelpProfitPreMerchantHelper.Instance.Start(); //助利宝每天增加指定数量商机
-                AddActService.Instance.Start(); //划拨后检查机具激活状态,并自动补录
-                PrePosRingService.Instance.Start(); //预发未申请提醒
-                PrePosWithholdService.Instance.Start(); //预发机过期未申请提交到预扣款
-                PrePosWithholdService.Instance.StartPre(); //预发机申请成功,处理预扣款
-                SycnMerchantTradeService.Instance.Start(); //同步商户交易额
+                // StatService.Instance.StartActiveReward(); //实时处理激活奖励
+                // StatService.Instance.StartActiveReward1(); //实时处理0押激活奖励
+                // StatService.Instance.StartActiveReward2(); //实时处理盒易付0押激活奖励
+                // StatService.Instance.StartActiveReward15(); //实时处理来客吧0押激活奖励
+                // StatService.Instance.StartSimActive(); //实时广电卡激活奖励
+                // StatService.Instance.StartOpenReward(); //实时获取开机奖励
+                // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+                // OperatePrizeService.Instance.Start(); //运营中心奖励发奖
+                // ActRewardService.Instance.Start(); //发放激活奖励
+                // HelpProfitPreMerchantHelper.Instance.Start(); //助利宝每天增加指定数量商机
+                // AddActService.Instance.Start(); //划拨后检查机具激活状态,并自动补录
+                // PrePosRingService.Instance.Start(); //预发未申请提醒
+                // PrePosWithholdService.Instance.Start(); //预发机过期未申请提交到预扣款
+                // PrePosWithholdService.Instance.StartPre(); //预发机申请成功,处理预扣款
+                // SycnMerchantTradeService.Instance.Start(); //同步商户交易额
 
 
-                MessageCenterService.Instance.Start(); // 消息队列
-                LeaderTimeoutSendMessageService.Instance.Start(); //盟主过期消息提醒
+                // MessageCenterService.Instance.Start(); // 消息队列
+                // LeaderTimeoutSendMessageService.Instance.Start(); //盟主过期消息提醒
 
 
-                AlipayPayBack2Service.Instance.Start(); //支付宝回调处理
-                PosCouponPrizeService.Instance.Start(); //购券奖励队列
-                OperateAddService.Instance.Start(); //购买运营中心队列
-                BalancePayBackService.Instance.Start(); //余额支付队列
-                ReservePayBackService.Instance.Start(); //储备金支付队列
-                OrderRefundService.Instance.Start(); //商城订单退款
+                // AlipayPayBack2Service.Instance.Start(); //支付宝回调处理
+                // PosCouponPrizeService.Instance.Start(); //购券奖励队列
+                // OperateAddService.Instance.Start(); //购买运营中心队列
+                // BalancePayBackService.Instance.Start(); //余额支付队列
+                // ReservePayBackService.Instance.Start(); //储备金支付队列
+                // OrderRefundService.Instance.Start(); //商城订单退款
 
 
-                StatService.Instance.Start(); //每日重置交易额
-                StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
-                DepositReturnStatService.Instance.Start(); //每月1号统计达标商户(退押需要的)
-                DepositReturnStatService.Instance.StartEverTime(); //统计单个商户达标数据(退押需要的)
-                AutoOpOrderService.Instance.StartOrderCancel(); //自动取消超时订单(15分钟)
-                OperateStockService.Instance.Start(); //运营中心库存实时更新
-                ResetSmallStoreHelper.Instance.Start(); //每月重置小分仓额度
-                ResetSmallStoreHelper.Instance.Listen(); //监听每月1号重置小分仓额度
-                OperateService.Instance.Start(); //运营中心每天统计一次发货量、库存
-                TimeOutPosChargeService.Instance.StartDoChargeAmount(); //实时监听待扣款记录,并扣费
-                InstallmentDeductionService.Instance.Start(); //分期扣款(每月20号执行)
-                LeaderAmountMonthChangeQueue.Instance.Start(); //每月一号记录上月盟主储蓄金和可提现余额
-                LeaderCompPrizeHelper.Instance.Start(); //领导人达标奖
-                ResetPosFirstFlagAndIsExecuteService.Instance.Start(); //每月1号计算商户首台机具标记
+                // StatService.Instance.Start(); //每日重置交易额
+                // StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
+                // DepositReturnStatService.Instance.Start(); //每月1号统计达标商户(退押需要的)
+                // DepositReturnStatService.Instance.StartEverTime(); //统计单个商户达标数据(退押需要的)
+                // AutoOpOrderService.Instance.StartOrderCancel(); //自动取消超时订单(15分钟)
+                // OperateStockService.Instance.Start(); //运营中心库存实时更新
+                // ResetSmallStoreHelper.Instance.Start(); //每月重置小分仓额度
+                // ResetSmallStoreHelper.Instance.Listen(); //监听每月1号重置小分仓额度
+                // OperateService.Instance.Start(); //运营中心每天统计一次发货量、库存
+                // TimeOutPosChargeService.Instance.StartDoChargeAmount(); //实时监听待扣款记录,并扣费
+                // InstallmentDeductionService.Instance.Start(); //分期扣款(每月20号执行)
+                // LeaderAmountMonthChangeQueue.Instance.Start(); //每月一号记录上月盟主储蓄金和可提现余额
+                // LeaderCompPrizeHelper.Instance.Start(); //领导人达标奖
+                // ResetPosFirstFlagAndIsExecuteService.Instance.Start(); //每月1号计算商户首台机具标记
 
 
-                ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-                RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
-                StoreApplyHelper.Instance.StartEverTime(); //分仓临时额度变更
-                PreStoreApplyHelper.Instance.StartEverTime(); //小分仓临时额度变更
-                OperateAmountService.Instance.Start(); //运营中心额度变更
-                LeaderApplyCouponsHelper.Instance.Start(); //盟主储蓄金申请机具券打标记
-                DepositReturnService.Instance.Start(); //退押金到支付宝余额
-                StoreApplyHelper.Instance.ResetStoreReserve(); //重置分仓额度
-                AddPosCouponPrizeHelper.Instance.Start(); //补机具券奖励
+                // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+                // RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
+                // StoreApplyHelper.Instance.StartEverTime(); //分仓临时额度变更
+                // PreStoreApplyHelper.Instance.StartEverTime(); //小分仓临时额度变更
+                // OperateAmountService.Instance.Start(); //运营中心额度变更
+                // LeaderApplyCouponsHelper.Instance.Start(); //盟主储蓄金申请机具券打标记
+                // DepositReturnService.Instance.Start(); //退押金到支付宝余额
+                // StoreApplyHelper.Instance.ResetStoreReserve(); //重置分仓额度
+                // AddPosCouponPrizeHelper.Instance.Start(); //补机具券奖励
 
 
-                // RecommandKingHelper.Instance.Start();
+                RecommandKingHelper.Instance.Start();
             }
             }
 
 
 
 

Some files were not shown because too many files changed in this diff