|
|
@@ -592,7 +592,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
public void AddAct(int posid = 0)
|
|
|
{
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
- PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.ActivationState == 1 && !string.IsNullOrEmpty(m.SeoKeyword) && m.Id == posid);
|
|
|
+ PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.ActivationState == 1 && m.Id == posid);
|
|
|
if (pos != null)
|
|
|
{
|
|
|
PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
|
@@ -651,7 +651,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
prizes.Add(50);
|
|
|
}
|
|
|
- else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0) //联动首台无押金机返50
|
|
|
+ else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0 && DateTime.Now < DateTime.Parse("2023-05-01 00:00:00")) //联动首台无押金机返50
|
|
|
{
|
|
|
prizes.Add(50);
|
|
|
}
|