diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 496a4f44..862dda4c 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -245,7 +245,7 @@ class RoomPit extends Model if(!$pit_info){ return ['code' => 0, 'msg' => '该用户已不在'.$pit_text, 'data' => null]; } - $down = $this->where(['id' => $pit_info['id'] ])->update(['user_id' => 0, 'before_pit_number' => 0]); + $down = $this->where(['id' => $pit_info['id'] ])->update(['user_id' => 0, 'before_pit_number' => 0,'end_time' => 0]); if(!$down){ return ['code' => 0, 'msg' => '下麦失败', 'data' => null]; } diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php index 767323be..aa3306a9 100644 --- a/application/cron/controller/PerformPerSecond.php +++ b/application/cron/controller/PerformPerSecond.php @@ -372,12 +372,12 @@ class PerformPerSecond //酒吧房间时间结束处理 public function bar_room_time_end(){ - $bar_pit_gift = Db::name('vs_room_bar_pit_gift')->where(['end_time'=>['<',time()],'delete_time'=>0])->select(); + $bar_pit_gift = Db::name('vs_room_pit')->where(['end_time'=>['<',time()]])->where(['end_time'=>['<>',0]])->select(); if($bar_pit_gift){ foreach ($bar_pit_gift as $value){ - $re = model('api/RoomPit')->DownPit($value['user_id'],$value['room_id']); + $re = model('api/RoomPit')->DownPit($value['user_id'],$value['room_id'],$value['pit_number']); if($re['code']==1){ - db::name('vs_room_bar_pit_gift')->where('id',$value['id'])->update(['delete_time'=>time()]); +// db::name('vs_room_bar_pit_gift')->where('id',$value['id'])->update(['delete_time'=>time()]); echo "用户".$value['user_id']."房间".$value['room_id']."已下麦\n"; }else{ echo $re['msg']."\n";