diff --git a/application/api/controller/BarRoom.php b/application/api/controller/BarRoom.php index 94e2dcad..46440419 100644 --- a/application/api/controller/BarRoom.php +++ b/application/api/controller/BarRoom.php @@ -55,6 +55,9 @@ class BarRoom extends BaseCom $user_id = $this->uid; $type = input('type', 0); if($type == 1){ + if($user_id == $to_user_id){ + return V(0, '不能撩自己'); + } $reslut = model('BarRoom')->liao_ta($room_id,$user_id,$to_user_id); }else{ $reslut = model('BarRoom')->one_key_liao_ta($room_id,$user_id); @@ -95,4 +98,12 @@ class BarRoom extends BaseCom redis_unlocks($key_name); return V($reslut['code'], $reslut['msg'], $reslut['data']); } + + + //小黑屋列表 + public function black_room_list(){ + $room_id = input('room_id', 0); + $reslut = model('BarRoom')->black_room_list($room_id); + return V($reslut['code'], $reslut['msg'], $reslut['data']); + } } \ No newline at end of file diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php index d6ae80f5..19cfce76 100644 --- a/application/api/controller/RoomPit.php +++ b/application/api/controller/RoomPit.php @@ -34,8 +34,7 @@ class RoomPit extends BaseCom return V(0, '请选择礼物', null); } } - - $reslut = model('RoomPit')->apply_pit_bar($this->uid, $room_id,$gift_id,$pit_number); + $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $gift_id, $pit_number); }else{ $reslut = model('RoomPit')->apply_pit($this->uid, $room_id,$pit_number); } diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php index 0319ce01..ee53882d 100644 --- a/application/api/model/BarRoom.php +++ b/application/api/model/BarRoom.php @@ -144,6 +144,9 @@ class BarRoom extends Model $to_user_ids = []; foreach ($room_pit_Users as $key => $value) { + if($user_id == $value){//自己 + continue; + } //调用送礼接口 $to_user_ids[] = $value; } @@ -213,4 +216,12 @@ class BarRoom extends Model return ['code' => 1, 'msg' => '成功', 'data' => null]; } + + + //小黑屋列表 + public function black_room_list($room_id){ + $list = db::name('vs_room_bar_movie')->where(['p_room_id' => $room_id,'status' => 1,'end_time' => ['>',time()]])->select(); + return ['code' => 1, 'msg' => '成功', 'data' => $list]; + } + } \ No newline at end of file diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 0333bf62..0ff44d9b 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -278,7 +278,7 @@ class RoomPit extends Model //申请上麦 - public function apply_pit($user_id,$room_id,$pit_number = 0) + public function apply_pit($user_id,$room_id,$gift_id,$pit_number = 0) { //查询房间状态 $room_info = db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->field('id,room_status,room_up_pit_type,type_id,label_id,step')->find(); @@ -409,6 +409,12 @@ class RoomPit extends Model } return ['code' => 1, 'msg' => '上麦成功', 'data' => null]; }else{ + //上麦成功后设置礼物 + $gift_info = model('api/BarRoom')->join_pit_choose_gift($user_id,$room_id,$gift_id); + if($gift_info['code'] != 1){ + return ['code' => 0, 'msg' => '设置礼物失败', 'data' => null]; + } + $ompit = $this->OnPit($user_id,$room_id,$pit_number);//用户上了这个房间的几号麦位 if($ompit['code'] != 1){ return ['code' => 0, 'msg' => '上麦失败', 'data' => null]; @@ -465,6 +471,12 @@ class RoomPit extends Model return ['code' => 0, 'msg' => '用户已在麦上，请先下麦后再申请', 'data' => null]; } + //上麦成功后设置礼物 + $gift_info = model('api/BarRoom')->join_pit_choose_gift($user_id,$room_id,$gift_id); + if($gift_info['code'] != 1){ + return ['code' => 0, 'msg' => '设置礼物失败', 'data' => null]; + } + //放入等待区 $data = [ 'room_id' => $room_id, @@ -489,67 +501,6 @@ class RoomPit extends Model } - public function apply_pit_bar($user_id,$room_id,$gift_id,$pit_number = 0) - { - //查询房间状态 - $room_info = db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->field('id,room_status,room_up_pit_type,type_id,label_id,step')->find(); - if(!$room_info){ - return ['code' => 0, 'msg' => '房间不存在', 'data' => null]; - } - if($room_info['room_status'] != 1){ - 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_number == 9){ - //检查用户是否是房主或主持 - $is_room_owner =db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->field('id')->find(); - $is_room_host = db::name('vs_room_host')->where(['room_id' => $room_id, 'user_id' => $user_id,'delete_time' => null])->field('id')->find(); - 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]; - } - - if($pit_number){ - //查询麦位是否有用户 - $pit_info = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => $pit_number])->field('id,user_id')->find(); - if($pit_info){ - if($pit_info['user_id']){ - return ['code' => 0, 'msg' => '麦位有人', 'data' => null]; - } - } - }else{ - //查询当前空麦位 - $empty_pit = $this->getRoomNullPitWithout($room_id, [7,8,9,10]); - if (!$empty_pit) { - return ['code' => 0, 'msg' => '没有空麦位', 'data' => null]; - } - } - - //上麦成功后设置礼物 - $gift_info = model('api/BarRoom')->join_pit_choose_gift($user_id,$room_id,$gift_id); - if($gift_info['code'] != 1){ - return ['code' => 0, 'msg' => '设置礼物失败', 'data' => null]; - } - - $ompit = $this->OnPit($user_id,$room_id,$pit_number);//用户上了这个房间的几号麦位 - if($ompit['code'] != 1){ - return ['code' => 0, 'msg' => '上麦失败', 'data' => null]; - } - - return ['code' => 1, 'msg' => '上麦成功', 'data' => null]; - } - - - //申请上麦列表 public function apply_pit_list($userId,$room_id) {