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-24 12:21:01 +08:00
parent fc0f6cd725 270714928b
commit 6466b0cab7
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,10 +114,10 @@ class RoomSong extends Model
return ['code' => 0, 'msg' => '请先结束签约后在修改房间类型', 'data' => null]; return ['code' => 0, 'msg' => '请先结束签约后在修改房间类型', 'data' => null];
} }
$res1 = db::name('vs_room')->where('id',$room_id)->where(['label_id'=>2,'is_song'=>3])->find(); // $res1 = db::name('vs_room')->where('id',$room_id)->where(['label_id'=>2,'is_song'=>3])->find();
if($res1){ // if($res1){
return ['code'=>0,'msg'=>'点歌中！请稍后再试！','data'=>null]; // return ['code'=>0,'msg'=>'点歌中！请稍后再试！','data'=>null];
} // }
if($type == 1){//1同意 2拒绝 if($type == 1){//1同意 2拒绝
$res2 = db::name('vs_room')->where('id',$room_id)->field('room_up_pit_type')->find(); $res2 = db::name('vs_room')->where('id',$room_id)->field('room_up_pit_type')->find();
if($res2['room_up_pit_type'] == 2){ if($res2['room_up_pit_type'] == 2){
@@ -376,6 +376,13 @@ class RoomSong extends Model
'nextInfo' => null 'nextInfo' => null
]; ];
model('Chat')->sendMsg(1013,$room_id,$text); model('Chat')->sendMsg(1013,$room_id,$text);
db::name('vs_room_song')->where(['room_id' => $room_id,'times_status' => 1,'status' => 1])->update(['status'=>4]);
if(db::name('vs_room_song')->where(['room_id' => $room_id,'times_status' => 1,'status' => 2])->find()){
db::name('vs_room_song')->where(['room_id' => $room_id,'times_status' => 1,'status' => 2])->update(['status'=>3]);
}
if(db::name('vs_room_song')->where('room_id',$room_id)->where(['times_status'=>1])->find()){
db::name('vs_room_song')->where('room_id',$room_id)->update(['times_status'=>2]);
}
return ['code'=>0,'msg'=>'已经是最后一首歌了','data'=>null]; return ['code'=>0,'msg'=>'已经是最后一首歌了','data'=>null];
} }
$total = db::name('vs_room_song') $total = db::name('vs_room_song')