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

This commit is contained in:
2026-01-03 16:48:21 +08:00

View File

@@ -2295,10 +2295,12 @@ class Room extends Model
$validOnPitUsers = [];
if(!empty($onPitUser)){
foreach ($onPitUser as $k => $v) {
$isOnPit = db::name('vs_room_pit')->where(['user_id' => $v['user_id'],'room_id' => $room_id])->value('pit_number');
if(!$isOnPit){
db::name('vs_room_visitor')->where(['id' => $v['id']])->update(['is_onpit' => 1]);
continue;
if($room_type != 2){//拍卖房出价上麦用户 不在实际麦位上 不做下面的处理
$isOnPit = db::name('vs_room_pit')->where(['user_id' => $v['user_id'],'room_id' => $room_id])->value('pit_number');
if(!$isOnPit){
db::name('vs_room_visitor')->where(['id' => $v['id']])->update(['is_onpit' => 1]);
continue;
}
}
$v['nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname');