分润获取创客职级调整

Entity/SubUser.cs

@@ -9,5 +9,7 @@ namespace MySystem
         public string ParentNav { get; set; }
         public int UserLevel { get; set; }
         public int PreUserLevel { get; set; }
+        public int PreLeaderLevel { get; set; }
+        public int PreOpLevel { get; set; }
     }
 }

Util/HaoDa/ProfitHelper.cs

@@ -242,7 +242,7 @@ namespace MySystem
         {
             while(true)
             {
-                if(DateTime.Now.Day < 10 && DateTime.Now.Hour > 2 && DateTime.Now.Hour < 5)
+                if(DateTime.Now.Day < 10 && DateTime.Now.Hour > 2 && DateTime.Now.Hour < 23)
                 {
                     DoProfit();
                     Thread.Sleep(600000);
@@ -405,7 +405,7 @@ namespace MySystem
                         user = users[curFloor - 1];
                     }
                     SubUser selfUser = GetUser(user.UserId, Month) ?? new SubUser();
-                    int UserLevel = selfUser.PreUserLevel > selfUser.UserLevel ? selfUser.PreUserLevel : selfUser.UserLevel; //当前会员等级
+                    int UserLevel = GetUserLevel(selfUser); //当前会员等级
                     //判断当前创客是否有直推的激活机具，并且在活动时间内
                     if (curLevel == maxLevel)
                     {
@@ -471,10 +471,21 @@ namespace MySystem
                 user.ParentNav = dt.Rows[0]["ParentNav"].ToString();
                 user.UserLevel = int.Parse(dt.Rows[0]["UserLevel"].ToString());
                 user.PreUserLevel = int.Parse(dt.Rows[0]["PreUserLevel"].ToString());
+                user.PreLeaderLevel = int.Parse(dt.Rows[0]["PreLeaderLevel"].ToString());
+                user.PreOpLevel = int.Parse(dt.Rows[0]["PreOpLevel"].ToString());
             }
             return user;
         }
 
+        public int GetUserLevel(SubUser user)
+        {
+            int level = user.UserLevel;
+            if(user.PreUserLevel > level) level = user.PreUserLevel;
+            if(user.PreLeaderLevel > level) level = user.PreLeaderLevel;
+            if(user.PreOpLevel > level) level = user.PreOpLevel;
+            return level;
+        }
+
         public DataTable GetDataTable(string sqlstr)
         {
             DataTable dt = CustomerSqlConn.dtable(sqlstr, Library.ConfigurationManager.AppSettings["KxsStatSqlConnStr"].ToString());