YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-12-30 16:45:37 +08:00
parent 8538410fec def606d3a0
commit 7b827874e0
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/api/model/Room.php
View File

@@ -1095,6 +1095,22 @@ class Room extends Model
return ['code' => 0, 'msg' => '当前房间类型错误，请联系管理员', 'data' => ''];
}
//记录用户进入房间
$is_join = db::name('vs_room_visitor')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
if (!$is_join) {
db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
}else{
db::name('vs_room_visitor')->where('id', $is_join['id'])->update(['createtime' => time(),'is_online' => 1]);
}
//记录用户最后进入的是哪个房间
db::name('user_data')->where('user_id', $user_id)->update(['room_id' => $room_id]);
//记录用户访问记录
if($user_id != $room['user_id']){
model('api/User')->add_user_visit_log(2,$user_id, $room_id);
}
//给前端定义返回的数据
$room_owner = null;//房间拥有者信息
$cp_users = null;//CP用户信息
@@ -1178,22 +1194,6 @@ class Room extends Model
break;
}
//记录用户进入房间
$is_join = db::name('vs_room_visitor')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
if (!$is_join) {
db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
}else{
db::name('vs_room_visitor')->where('id', $is_join['id'])->update(['createtime' => time(),'is_online' => 1]);
}
//记录用户最后进入的是哪个房间
db::name('user_data')->where('user_id', $user_id)->update(['room_id' => $room_id]);
//记录用户访问记录
if($user_id != $room['user_id']){
model('api/User')->add_user_visit_log(2,$user_id, $room_id);
}
//进入房间保持心跳
$is_xintiao = db::name('vs_room_heartbeat')->where(['user_id' => $user_id, 'room_id' => $room_id])->find();
if($is_xintiao){

1
application/api/model/RoomAuction.php
View File

@@ -508,6 +508,7 @@ class RoomAuction extends Model
'text' => '房间拍卖类型已修改'
];
model('api/Chat')->sendMsg(1027,$room_id,$text);
Cache::rm('room_info_'.$room_id);
return ['code' => 1, 'msg' => '操作成功,','data' => null];
}
}