Merge branch 'feature-dgy-取消首台限制' into DuGuYang

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -827,11 +827,11 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
-                        else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0 && (DateTime.Now < DateTime.Parse("2023-05-01 00:00:00") || SysUserName == "admin")) //联动首台无押金机返50
+                        else if ((pos.BrandId == 10 || pos.BrandId == 11) && ActPrize == 0 && (DateTime.Now < DateTime.Parse("2023-05-01 00:00:00") || SysUserName == "admin")) //联动首台无押金机返50
                         {
                             prizes.Add(50);
                         }
-                        else if ((pos.BrandId == 12 || pos.BrandId == 13) && pos.IsFirst == 1 && ActPrize == 0) //盒易付首台无押金机返50
+                        else if ((pos.BrandId == 12 || pos.BrandId == 13) && ActPrize == 0) //盒易付首台无押金机返50
                         {
                             prizes.Add(50);
                         }
@@ -3337,13 +3337,13 @@ namespace MySystem.Areas.Admin.Controllers
             Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
             if (user != null)
             {
-                if (pos.IsFirst == 1 && pos.ActivationState == 1 && pos.BindingTime.Value.AddDays(30) <= DateTime.Now && pos.BindingTime.Value.AddDays(60) > DateTime.Now && pos.CreditTrade >= 10000 && pos.CardType < 100)
+                if (pos.ActivationState == 1 && pos.BindingTime.Value.AddDays(30) <= DateTime.Now && pos.BindingTime.Value.AddDays(60) > DateTime.Now && pos.CreditTrade >= 10000 && pos.CardType < 100)
                 {
                     RedisDbconn.Instance.AddList("LeaderRewardQueue", pos.Id.ToString());
                 }
                 else
                 {
-                    return "操作失败" + pos.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                    return "操作失败" + pos.PosSn + ',' + "不满足发放条件绑定30天到60天交易超过10000元内非营训机" + '\n';
                 }
                 return "操作成功，请稍后查询";
             }
@@ -4037,13 +4037,13 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     if (posInfo.Id > 0)
                     {
-                        if (posInfo.IsFirst == 1 && posInfo.ActivationState == 1 && posInfo.BindingTime.Value.AddDays(30) <= DateTime.Now && posInfo.BindingTime.Value.AddDays(60) > DateTime.Now && posInfo.CreditTrade >= 10000 && posInfo.CardType < 100)
+                        if (posInfo.ActivationState == 1 && posInfo.BindingTime.Value.AddDays(30) <= DateTime.Now && posInfo.BindingTime.Value.AddDays(60) > DateTime.Now && posInfo.CreditTrade >= 10000 && posInfo.CardType < 100)
                         {
                             RedisDbconn.Instance.AddList("LeaderRewardQueue", posInfo.Id.ToString());
                         }
                         else
                         {
-                            return "操作失败" + posInfo.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                            return "操作失败" + posInfo.PosSn + ',' + "不满足发放条件绑定30天到60天交易超过10000元内非营训机" + '\n';
                         }
                     }