|
@@ -474,10 +474,10 @@ namespace MySystem
|
|
|
{
|
|
|
TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
|
|
|
}
|
|
|
- // if((pos.BrandId == 10 || pos.BrandId == 11) && DateTime.Now < DateTime.Parse("2023-05-01 00:00:00")) //首台无押金机返50
|
|
|
- // {
|
|
|
+ if(pos.BindingTime.Value.AddDays(30) >= pos.ActivationTime)
|
|
|
+ {
|
|
|
doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 30);
|
|
|
- // }
|
|
|
+ }
|
|
|
PosMachinesTwo edit = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
|
|
|
if(edit != null)
|
|
|
{
|
|
@@ -568,7 +568,10 @@ namespace MySystem
|
|
|
TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
|
|
|
}
|
|
|
//首台无押金机返50
|
|
|
- doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 30);
|
|
|
+ if(pos.BindingTime.Value.AddDays(30) >= pos.ActivationTime)
|
|
|
+ {
|
|
|
+ doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 30);
|
|
|
+ }
|
|
|
PosMachinesTwo item = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
|
|
|
if(item != null)
|
|
|
{
|
|
@@ -613,7 +616,10 @@ namespace MySystem
|
|
|
TopUserId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
|
|
|
}
|
|
|
//首台无押金机返50
|
|
|
- doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 30);
|
|
|
+ if(pos.BindingTime.Value.AddDays(30) >= pos.ActivationTime)
|
|
|
+ {
|
|
|
+ doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 30);
|
|
|
+ }
|
|
|
function.WriteLog("ActPrize:30", "实时处理来客吧0押激活奖励");
|
|
|
PosMachinesTwo item = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
|
|
|
if(item != null)
|