|
@@ -303,6 +303,11 @@ class ModelActivitynew
|
|
|
public function cronToActDump($now){
|
|
|
//定时排期上线活动
|
|
|
$ts = intval(strtotime(date('YmdHi',$now)));
|
|
|
+ $nowNew=time();
|
|
|
+ if($ts+60<$nowNew){
|
|
|
+ $ts = intval(strtotime(date('YmdHi',$nowNew)));
|
|
|
+ $res['resetTs']=["task_ts"=>$ts,"now"=>$nowNew];
|
|
|
+ }
|
|
|
$res['ts'] =$ts;
|
|
|
$w = " where end_time={$ts}";
|
|
|
$outOnlineList =$this->getActivityList($w);
|
|
@@ -318,10 +323,10 @@ class ModelActivitynew
|
|
|
}
|
|
|
}
|
|
|
if(IS_DEBUF){//强制下线不在活动期内,却又在线的活动
|
|
|
- $nowNew=time();
|
|
|
- if($ts+60<$nowNew){
|
|
|
- $ts = intval(strtotime(date('YmdHi',$nowNew)));
|
|
|
- $res['resetTs']=["task_ts"=>$ts,"now"=>$nowNew];
|
|
|
+ $nowNew2=time();
|
|
|
+ if($ts+60<$nowNew2){
|
|
|
+ $ts = intval(strtotime(date('YmdHi',$nowNew2)));
|
|
|
+ $res['resetTs2']=["task_ts"=>$ts,"now"=>$nowNew2];
|
|
|
}
|
|
|
$w2 = " where is_online=1 and (end_time<{$ts} or start_time>{$ts})";
|
|
|
$needOutAct = $this->getActivityList($w2);
|