|
@@ -328,7 +328,7 @@ namespace MySystem
|
|
}
|
|
}
|
|
//判断激活条件并激活
|
|
//判断激活条件并激活
|
|
DateTime TransferTime = pos.TransferTime == null ? DateTime.Now : pos.TransferTime.Value;
|
|
DateTime TransferTime = pos.TransferTime == null ? DateTime.Now : pos.TransferTime.Value;
|
|
- if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && TransferTime.AddMinutes(-30) < pos.BindingTime && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
|
|
|
|
+ if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && TransferTime.AddMinutes(-30) < pos.BindingTime)
|
|
// if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && TransferTime < pos.BindingTime && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
// if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && TransferTime < pos.BindingTime && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
{
|
|
{
|
|
pos.ActivationState = 1;
|
|
pos.ActivationState = 1;
|
|
@@ -348,18 +348,18 @@ namespace MySystem
|
|
|
|
|
|
//发放开机奖励
|
|
//发放开机奖励
|
|
function.WriteLog("首台" + pos.IsFirst, "开机奖励在激活中监控");
|
|
function.WriteLog("首台" + pos.IsFirst, "开机奖励在激活中监控");
|
|
- if(pos.IsFirst == 1)
|
|
|
|
|
|
+ if(pos.IsFirst == 1 && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
|
|
RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//发放大盟主奖励
|
|
//发放大盟主奖励
|
|
- if(pos.LeaderUserId > 0 && pos.IsFirst == 1 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate > now))
|
|
|
|
|
|
+ if(pos.LeaderUserId > 0 && pos.IsFirst == 1 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate > now) && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
|
|
RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
|
|
}
|
|
}
|
|
//发放运营中心奖励
|
|
//发放运营中心奖励
|
|
- if(pos.IsFirst == 1)
|
|
|
|
|
|
+ if(pos.IsFirst == 1 && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
|
|
{
|
|
{
|
|
RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
|
|
RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
|
|
}
|
|
}
|