Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2025-12-11 19:08:12 +08:00

View File

@@ -3325,50 +3325,53 @@ class Room extends Model
if(!$room_ids){ if(!$room_ids){
return 0; return 0;
} }
//在上面获取 一个随义的id
//获取徒弟是否在房间内 return $room_ids[array_rand($room_ids)];
$roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id'); // //获取徒弟是否在房间内
if($roomId){ // $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
//在上面获取 一个随义的id // if($roomId){
return $room_ids[array_rand($room_ids)]; //
}else{ // }else{
return 0; // return 0;
} // }
} }
if($task_id == 22){ if($task_id == 22){
//拍卖 且有人有热度 //点歌 且有人有热度
$room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right') $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
->where(['a.type_id' => 9,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]]) ->where(['a.type_id' => 9,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]])
->column('a.id'); ->column('a.id');
if(!$room_ids){ if(!$room_ids){
return 0; return 0;
} }
//在上面获取 一个随义的id
return $room_ids[array_rand($room_ids)];
//获取徒弟是否在房间内 //获取徒弟是否在房间内
$roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id'); // $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
if($roomId){ // if($roomId){
//在上面获取 一个随义的id //
return $room_ids[array_rand($room_ids)]; // }else{
}else{ // return 0;
return 0; // }
}
} }
if($task_id == 23){ if($task_id == 23){
//拍卖 且有人有热度 //互娱 且有人有热度
$room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right') $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
->where(['a.type_id' => 7,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]]) ->where(['a.type_id' => 7,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]])
->column('a.id'); ->column('a.id');
if(!$room_ids){ if(!$room_ids){
return 0; return 0;
} }
//在上面获取 一个随义的id
return $room_ids[array_rand($room_ids)];
//获取徒弟是否在房间内 //获取徒弟是否在房间内
$roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id'); // $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
if($roomId){ // if($roomId){
//在上面获取 一个随义的id //
return $room_ids[array_rand($room_ids)]; // }else{
}else{ // return 0;
return 0; // }
}
} }
if(in_array($task_id, [7,8,13,14,18,19,20])){ if(in_array($task_id, [7,8,13,14,18,19,20])){
//抽奖 //抽奖