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

This commit is contained in:
2025-09-22 20:24:42 +08:00
2 changed files with 5 additions and 0 deletions

View File

@@ -684,6 +684,7 @@ class Room extends Model
if (!$is_join) {
db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
}
Db::name('user_data')->where('user_id', $user_id)->update(['room_id' => $room_id]);
$room['is_use_code'] = 0;
$liang = model('api/Decorate')->user_decorate_detail($room['id'],7);

View File

@@ -940,6 +940,10 @@ class Tencent extends Model
} elseif ($action == 'Login') {
Db::name('user')->where('id', $uid)->update(['is_online' => 1, 'updatetime' => time()]);
$room = Db::name('vs_room_visitor')->where('user_id', $uid)->order('id desc')->value('room_id');
if(!$room){
$room = db::name('user_data')->where(['user_id' => $uid])->value('room_id')??0;
db::name('vs_room_visitor')->insert(['room_id' => $room, 'user_id' => $uid, 'createtime' => time()]);
}
$text['text'] = '重新上线!';
$text['user_id'] = $uid;
$text['type'] = 1;