diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index ba8041d8..8b0e100c 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -624,7 +624,7 @@ class RoomPit extends Model } //同意上麦 - public function agree_pit($user_id,$room_id,$apply_id) + public function agree_pit($user_id,$room_id,$apply_id,$tpe = 0) { if(!$room_id){ return ['code' => 0, 'msg' => '请选择房间', 'data' => null]; @@ -712,11 +712,14 @@ class RoomPit extends Model //结束循环 break; } - //删除他的申请上麦 - $reslut = db::name('vs_room_pit_apply')->where(['user_id' => $value, 'room_id' => $room_id, 'status' => 0])->delete(); - if (!$reslut) { - continue; + if($tpe == 0){ + //删除他的申请上麦 + $reslut = db::name('vs_room_pit_apply')->where(['user_id' => $value, 'room_id' => $room_id, 'status' => 0])->delete(); + if (!$reslut) { + continue; + } } + $ompit = db::name('vs_room_pit_simulate')->insert( [ 'room_id' => $room_id, @@ -1048,6 +1051,14 @@ class RoomPit extends Model if($room_type == 7 && ($pit_number == 7 || $pit_number == 8)){ return ['code' => 0, 'msg' => '互娱房 不能上7、8号麦位', 'data' => null]; } + $room_label = db::name('vs_room')->where(['id' => $room_id])->value('label_id'); + if($room_type == 1 && $room_label == 2){ + $res = model('RoomPit')->agree_pit($user_id, $room_id, $accept_user_id,1); + if($res['code'] == 0){ + return ['code' => 0, 'msg' => $res['msg'], 'data' => null]; + } + return ['code' => 1, 'msg' => '操作成功', 'data' => null]; + } if($room_type == 10){ if($pit_number == 1){ //查询主持邀请列表是否是有数据