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-25 12:33:08 +08:00
parent 7d2c35c4c7 8e032deff2
commit 20e68f280d
6 changed files with 149 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2745,7 +2745,6 @@ class Room extends Model
}
}
$data = [];
//1-交友，3、4、8-不要了
if($type == 1 || $type == 3 || $type == 4 || $type == 8){
@@ -2756,6 +2755,7 @@ class Room extends Model
'is_song' => 1
];
}
//拍卖
if($type == 2){
$data = [
@@ -2765,6 +2765,7 @@ class Room extends Model
'is_song' => 1
];
}
//(互娱）
if($type == 7){
$data = [
@@ -2782,6 +2783,7 @@ class Room extends Model
'room_up_pit_type' => 1,
];
}
//签约房
if($type == 10){
$data = [
@@ -2843,6 +2845,7 @@ class Room extends Model
'text' => '房间类型已修改type--'.$type
];
model('Chat')->sendMsg(1012,$room_id,$text);
Cache::rm('room_info_'.$room_id);
return ['code' => 1, 'msg' => '修改成功', 'data' => null];
}

8
application/api/model/RoomPit.php
View File

@@ -294,6 +294,8 @@ class RoomPit extends Model
}
}
//检查是否在坑位上
$pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->field('id,pit_number')->find();
if($pit_number == 9){
//检查用户是否是房主或主持
$is_room_owner =db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->field('id')->find();
@@ -301,15 +303,15 @@ class RoomPit extends Model
if(!$is_room_owner && !$is_room_host){
return ['code' => 0, 'msg' => '没有权限', 'data' => null];
}
if($pit_infos){
return ['code' => 0, 'msg' => '您已在麦上', 'data' => null];
}
}
if($pit_number == 10){
return ['code' => 0, 'msg' => '请等待主持抱麦', 'data' => null];
}
//检查是否在坑位上
$pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->field('id,pit_number')->find();
if($room_info['label_id'] == 5 && $room_info['step'] != 1 && $pit_number < 9){
return ['code' => 0, 'msg' => '互娱房 此阶段不可此操作', 'data' => null];
}

6
application/api/model/RoomSong.php
View File

@@ -140,6 +140,7 @@ class RoomSong extends Model
model('RoomPit')->DownPit($v['user_id'],$room_id,$v['pit_number']);
}
}
Cache::rm('room_info_'.$room_id);
//推送消息
$text = [
'text' => '房间类型变成k歌--2'
@@ -529,6 +530,11 @@ class RoomSong extends Model
if(!$host && $owner != $user_id){
return ['code' => 0, 'msg' => '您没有权限上麦', 'data' => null];
}
//检查是否在坑位上
$pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->field('id,pit_number')->find();
if($pit_infos){
return ['code' => 0, 'msg' => '您已在麦上', 'data' => null];
}
}
$ompit = model('RoomPit')->OnPit($user_id,$room_id,$pit_number);//用户上了这个房间的几号麦位

2
application/api/model/User.php
View File

@@ -867,7 +867,7 @@ class User extends Model
$member_name = db::name('user')->where('id' , $user_id)->value('nickname');
$member_face_url = db::name('user')->where('id' , $user_id)->value('avatar');
model('Tencent')->modify_user_infos($user_id, $member_name, $member_face_url);
Cache::rm('user_base_info_'.$user_id);
return ['code' => 1, 'msg' => '修改成功', 'data' => null];
}
catch(\Exception $e){