Эх сурвалжийг харах

分润和补贴,预设职级要排除当月的

lichunlei 2 жил өмнө
parent
commit
bc35835726

+ 3 - 2
AppStart/Helper/Profit/ProfitHelper.cs

@@ -2203,13 +2203,14 @@ namespace MySystem
                                     Array.Reverse(ParentNavList); //反转顺序
                                     int level = 0;
                                     DateTime now = DateTime.Now;
+                                    DateTime ThisMonth = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
                                     foreach (string UserIdString in ParentNavList)
                                     {
                                         level += 1;
                                         int uid = int.Parse(UserIdString);
                                         Users user = dbnew.Users.FirstOrDefault(m => m.Id == uid) ?? new Users();
                                         int UserLevel = user.UserLevel; //当前会员等级
-                                        UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.UpdateDate > now);
+                                        UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.CreateDate < ThisMonth && m.UpdateDate > now);
                                         if (rank != null)
                                         {
                                             if (rank.Rank > UserLevel)
@@ -2277,7 +2278,7 @@ namespace MySystem
                                                     int subUserLevel = subuser.UserLevel;
                                                     if(subUserLevel < 5)
                                                     {
-                                                        UserRankWhite subrank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == subuser.Id && m.UpdateDate > now);
+                                                        UserRankWhite subrank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == subuser.Id && m.CreateDate < ThisMonth && m.UpdateDate > now);
                                                         if (subrank != null)
                                                         {
                                                             if (subrank.Rank > subUserLevel)

+ 4 - 3
AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -480,6 +480,7 @@ namespace MySystem
                                     Array.Reverse(ParentNavList); //反转顺序
                                     int level = 0;
                                     DateTime now = DateTime.Now;
+                                    DateTime ThisMonth = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
                                     function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":扶持期:" + HelpDirectTradeAmt, "分润监控日志");
                                     if (HelpDirectTradeAmt > 0)
                                     {
@@ -489,7 +490,7 @@ namespace MySystem
                                             int uid = int.Parse(UserIdString);
                                             Users user = dbnew.Users.FirstOrDefault(m => m.Id == uid) ?? new Users();
                                             int UserLevel = user.UserLevel; //当前会员等级
-                                            UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.UpdateDate > now);
+                                            UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.CreateDate < ThisMonth && m.UpdateDate > now);
                                             if (rank != null)
                                             {
                                                 if (rank.Rank > UserLevel)
@@ -550,7 +551,7 @@ namespace MySystem
                                                         int subUserLevel = subuser.UserLevel;
                                                         if (subUserLevel < 5)
                                                         {
-                                                            UserRankWhite subrank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == subuser.Id && m.UpdateDate > now);
+                                                            UserRankWhite subrank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == subuser.Id && m.CreateDate < ThisMonth && m.UpdateDate > now);
                                                             if (subrank != null)
                                                             {
                                                                 if (subrank.Rank > subUserLevel)
@@ -604,7 +605,7 @@ namespace MySystem
                                             int uid = int.Parse(UserIdString);
                                             Users user = dbnew.Users.FirstOrDefault(m => m.Id == uid) ?? new Users();
                                             int UserLevel = user.UserLevel; //当前会员等级
-                                            UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.UpdateDate > now);
+                                            UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.CreateDate < ThisMonth && m.UpdateDate > now);
                                             if (rank != null)
                                             {
                                                 if (rank.Rank > UserLevel)