盟主反可提现金额不用判断过期

AppStart/Helper/AlipayPayBack2Service.cs

@@ -335,8 +335,8 @@ namespace MySystem
             while(LeaderUserId > 0)
             {
                 level += 1;
-                // Users user = db.Users.FirstOrDefault(m => m.Id == LeaderUserId);
-                UserRankItem user = PosCouponPrizeService.Instance.GetUserLevel(db, LeaderUserId);
+                Users user = db.Users.FirstOrDefault(m => m.Id == LeaderUserId);
+                // UserRankItem user = PosCouponPrizeService.Instance.GetUserLevel(db, LeaderUserId);
                 if(user.Id > 0)
                 {
                     decimal TotalPrice = 10000;

AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -125,13 +125,16 @@ namespace MySystem
                                 OperateAmountChange(opdb, parentUser.Id, GetWithdrawMoney(parentUser) * order.BuyCount, 1, 2, "商城购机", true);
                             }
                         }
-                        else if(parentUser.LeaderLevel > 0 && CheckLeaderReserve(db, order.BuyCount, parentUser.Id))
+                        else if(parentUser.AgoLeaderLevel > 0 && CheckLeaderReserve(db, order.BuyCount, parentUser.Id))
                         {
                             //购机奖
-                            decimal CurBuyPrize = GetBuyPrize(parentUser);
-                            decimal GetPrize = CurBuyPrize - BuyPrize;
-                            if(GetPrize > 0) OpAccount(db, order.Id, parentUser.Id, CurBuyPrize - BuyPrize, order.BuyCount, 118);
-                            BuyPrize = CurBuyPrize;
+                            if(parentUser.LeaderLevel > 0)
+                            {
+                                decimal CurBuyPrize = GetBuyPrize(parentUser);
+                                decimal GetPrize = CurBuyPrize - BuyPrize;
+                                if(GetPrize > 0) OpAccount(db, order.Id, parentUser.Id, CurBuyPrize - BuyPrize, order.BuyCount, 118);
+                                BuyPrize = CurBuyPrize;
+                            }
 
                             if(!BackAccountFlag)
                             {
@@ -173,9 +176,16 @@ namespace MySystem
             DateTime now = DateTime.Now;
             Users user = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1 && m.Status > -1) ?? new Users();
             UserRankWhite userWhite = db.UserRankWhite.FirstOrDefault(m => m.Id == UserId && m.UpdateDate > now) ?? new UserRankWhite();
-            Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId && m.ExpiredDate > now) ?? new Leaders();
+            Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Leaders();
             dic.UserLevel = userWhite.Rank > user.UserLevel ? userWhite.Rank : user.UserLevel;
-            dic.LeaderLevel = leader.LeaderLevel;
+            if(leader.ExpiredDate > now)
+            {
+                dic.LeaderLevel = leader.LeaderLevel;
+            }
+            else
+            {
+                dic.AgoLeaderLevel = leader.LeaderLevel;
+            }
             dic.OperateLevel = user.UserType;
             dic.UserType = user.UserType;
             dic.MerchantType = user.MerchantType;

AppStart/Helper/PosCouponPrize/UserRankItem.cs

@@ -14,6 +14,7 @@ namespace MySystem
         public int UserType { set; get; }
         public int UserLevel { set; get; }
         public int LeaderLevel { set; get; }
+        public int AgoLeaderLevel { set; get; }
         public int OperateLevel { set; get; }
         public int Id { set; get; }
         public int ParentUserId { set; get; }