lcl 1 жил өмнө
parent
commit
8a865fccbe

+ 17 - 6
AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -515,7 +515,7 @@ namespace MySystem
                                             level += 1;
                                             level += 1;
                                             int uid = int.Parse(UserIdString);
                                             int uid = int.Parse(UserIdString);
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                            int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                            int UserLevel = GetUserLevel(user); //当前会员等级
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             {
                                             {
                                                 break;
                                                 break;
@@ -588,7 +588,7 @@ namespace MySystem
                                             level += 1;
                                             level += 1;
                                             int uid = int.Parse(UserIdString);
                                             int uid = int.Parse(UserIdString);
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                            int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                            int UserLevel = GetUserLevel(user); //当前会员等级
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             {
                                             {
                                                 break;
                                                 break;
@@ -653,7 +653,7 @@ namespace MySystem
                                             level += 1;
                                             level += 1;
                                             int uid = int.Parse(UserIdString);
                                             int uid = int.Parse(UserIdString);
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
                                             SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                            int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                            int UserLevel = GetUserLevel(user); //当前会员等级
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                             {
                                             {
                                                 break;
                                                 break;
@@ -768,7 +768,7 @@ namespace MySystem
                                         level += 1;
                                         level += 1;
                                         int uid = int.Parse(UserIdString);
                                         int uid = int.Parse(UserIdString);
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                        int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                        int UserLevel = GetUserLevel(user); //当前会员等级
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         {
                                         {
                                             break;
                                             break;
@@ -895,7 +895,7 @@ namespace MySystem
                                         level += 1;
                                         level += 1;
                                         int uid = int.Parse(UserIdString);
                                         int uid = int.Parse(UserIdString);
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                        int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                        int UserLevel = GetUserLevel(user); //当前会员等级
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         {
                                         {
                                             break;
                                             break;
@@ -963,7 +963,7 @@ namespace MySystem
                                         level += 1;
                                         level += 1;
                                         int uid = int.Parse(UserIdString);
                                         int uid = int.Parse(UserIdString);
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
                                         SubUser user = GetUser(uid, Month) ?? new SubUser();
-                                        int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                        int UserLevel = GetUserLevel(user); //当前会员等级
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
                                         {
                                         {
                                             break;
                                             break;
@@ -1044,10 +1044,21 @@ namespace MySystem
                 user.ParentNav = dt.Rows[0]["ParentNav"].ToString();
                 user.ParentNav = dt.Rows[0]["ParentNav"].ToString();
                 user.UserLevel = int.Parse(dt.Rows[0]["UserLevel"].ToString());
                 user.UserLevel = int.Parse(dt.Rows[0]["UserLevel"].ToString());
                 user.PreUserLevel = int.Parse(dt.Rows[0]["PreUserLevel"].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;
             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)
         public DataTable GetDataTable(string sqlstr)
         {
         {
             DataTable dt = CustomerSqlConn.dtable(sqlstr, Library.ConfigurationManager.AppSettings["MainSqlConnStr"].ToString());
             DataTable dt = CustomerSqlConn.dtable(sqlstr, Library.ConfigurationManager.AppSettings["MainSqlConnStr"].ToString());

+ 2 - 0
AppStart/Tables/SubUser.cs

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