MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-09-24 18:22:03 +08:00
parent f78ec648de 1b7f5d70b9
commit 8a60cc55f9
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/api/model/Login.php
View File

@@ -428,6 +428,13 @@ class Login extends Model
model('UserToken')->where('id', $user_info['id'])->update(['token' => 1]); model('UserToken')->where('id', $user_info['id'])->update(['token' => 1]);
$isstatus = model('User')->where('id', $user_info['user_id'])->update(['status' => 0]); $isstatus = model('User')->where('id', $user_info['user_id'])->update(['status' => 0]);
if($isstatus){ if($isstatus){
//查询用户所在房间
$room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select();
if($room_list){
foreach ($room_list as &$value) {
model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']);
}
}
//删除用户 //删除用户
// model('Tencent')->account_delete($user_info['user_id']); // model('Tencent')->account_delete($user_info['user_id']);
model('User')->where('id', $user_info['user_id'])->update(['delete_time' => time()]); model('User')->where('id', $user_info['user_id'])->update(['delete_time' => time()]);
@@ -440,13 +447,7 @@ class Login extends Model
db::name('vs_room')->where('id', $value['id'])->update(['room_status' => 3]); db::name('vs_room')->where('id', $value['id'])->update(['room_status' => 3]);
} }
} }
//查询用户所在房间
$room_list = db::name('vs_room_visitor')->where('user_id', $user_info['user_id'])->select();
if($room_list){
foreach ($room_list as &$value) {
model('Room')->quit_room($user_info['user_id'], $value['room_id'],$user_info['user_id']);
}
}
}else{ }else{
return ['code' => 0, 'msg' => '注销失败', 'data' => null]; return ['code' => 0, 'msg' => '注销失败', 'data' => null];
} }

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

@@ -2524,7 +2524,10 @@ class Room extends Model
if(!$room_id){ if(!$room_id){
$room_id = Db::name('vs_room_visitor')->where('user_id', $user_id)->order('id desc')->value('room_id'); $room_id = Db::name('vs_room_visitor')->where('user_id', $user_id)->order('id desc')->value('room_id');
} }
$room = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->find();
if($room){
return ['code' => 1, 'msg' => '操作成功', 'data' => null];
}
$room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]); $room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]);
if(!$room_info){ if(!$room_info){
return ['code' => 0, 'msg' => '加入房间失败', 'data' => null]; return ['code' => 0, 'msg' => '加入房间失败', 'data' => null];