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:
赵钊
2026-01-08 09:18:09 +08:00
parent 24abbba56d 89992325e5
commit b79dc9236c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/api/model/Friend.php
View File

@@ -281,27 +281,20 @@ class Friend extends Model
//退出私密房间
public function outRoom($user_id,$room_id){
public function outRoom($type,$room_id){
//推送给前端消息
$text['text'] = '退出私密小屋';
model('api/Chat')->sendMsg(1055,$room_id,$text);
// //查询在房间的用户
// $users = db::name('vs_room_visitor')->where(['room_id'=>$room_id])->select();
// if($users){
// //退出房间
// foreach ($users as $v){
// //退出房间
// model('Room')->quit_room($v['user_id'], $room_id,$v['user_id']);
// }
// }else{
// model('Room')->quit_room($user_id, $room_id,$user_id);
// }
//注销房间
db::name('vs_room')->where(['id'=>$room_id])->update(['room_status'=>3]);
db::name('vs_room_cp_movie')->where(['room_id'=>$room_id])->update(['status'=>4]);
if($type){//交友、拍卖
db::name('vs_room_cp_movie')->where(['room_id'=>$room_id])->update(['status'=>4]);
}else{//酒吧房私密
db::name('vs_room_bar_movie')->where(['room_id'=>$room_id])->update(['status'=>2]);
}
//删除腾讯群组
model('api/Tencent')->delete_group('room'.$room_id);
return ['code' => 1, 'msg' => '退出成功！', 'data' => null];

7
application/cron/controller/FriendEnd.php
View File

@@ -50,6 +50,13 @@ class FriendEnd
public function clear_room_end()
{
$room_list = db::name('vs_room_cp_movie')->where(['status' => 1,'type'=>1,'time_day' =>['<',time()]])->select();
if(!empty($room_list)){
foreach ($room_list as $room) {
model('api/Friend')->outRoom(1,$room['room_id']);
}
}
//酒吧房私密小屋
$room_list = db::name('vs_room_bar_movie')->where(['status' => 1,'end_time' =>['<',time()]])->select();
if(!empty($room_list)){
foreach ($room_list as $room) {
model('api/Friend')->outRoom(0,$room['room_id']);