Merge branch 'feature-dgy-立刷加码奖励' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -220,7 +220,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (pos.BindingTime != null && pos.ActivationTime != null)
                 {
                     TimeSpan ts = pos.ActivationTime.Value - pos.BindingTime.Value;
-                    if (ts.TotalDays <= 30 || SysUserName == "admin")
+                    if (ts.TotalDays <= 30 || SysUserName == "admin" || pos.BrandId == 6)
                     {
                         AddAct(pos.Id);
                     }
@@ -240,7 +240,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (pos.BindingTime != null && pos.ActivationTime != null)
                 {
                     TimeSpan ts = pos.ActivationTime.Value - pos.BindingTime.Value;
-                    if (ts.TotalDays > 30 && SysUserName != "admin")
+                    if (ts.TotalDays > 30 && SysUserName != "admin" && pos.BrandId != 6)
                     {
                         return "机具划拨后已超过30天";
                     }
@@ -942,7 +942,7 @@ namespace MySystem.Areas.Admin.Controllers
                             prizes.Add(50);
                         }
                         //9月1日-9月30日立刷机具刷5000激活时额外奖励30元立刷活动奖
-                        else if (pos.BrandId == 6 && pos.CreditTrade >= 5000M && pos.ActivationTime >= DateTime.Parse("2023-08-31 00:00:00") && pos.ActivationTime < DateTime.Parse("2023-10-01 00:00:00"))
+                        if (pos.BrandId == 6 && pos.CreditTrade >= 5000M && pos.ActivationTime >= DateTime.Parse("2023-08-31 00:00:00") && pos.ActivationTime < DateTime.Parse("2023-10-01 00:00:00"))
                         {
                             prizes.Add(30);
                         }