酒吧房 抱麦后选择礼物在上麦 传参 type = 2 直接上麦不做排麦处理
This commit is contained in:
@@ -39,7 +39,8 @@ class RoomPit extends BaseCom
|
||||
return V(0, '请选择礼物', null);
|
||||
}
|
||||
}
|
||||
$reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number,$gift_id);
|
||||
$type = input('type', 0);//2-抱麦后的上麦
|
||||
$reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number,$gift_id,$type);
|
||||
}else{
|
||||
$reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number);
|
||||
}
|
||||
|
||||
@@ -279,7 +279,7 @@ class RoomPit extends Model
|
||||
|
||||
|
||||
//申请上麦
|
||||
public function apply_pit($user_id,$room_id,$pit_number = 0,$gift_id = 0)
|
||||
public function apply_pit($user_id,$room_id,$pit_number = 0,$gift_id = 0,$type = 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();
|
||||
@@ -337,7 +337,7 @@ class RoomPit extends Model
|
||||
}
|
||||
|
||||
//自由麦
|
||||
if($room_info['room_up_pit_type'] == 2){
|
||||
if($room_info['room_up_pit_type'] == 2 || $type == 2){
|
||||
if($pit_number > 0){
|
||||
if($room_info['label_id'] == 5 || $room_info['label_id'] == 8){//互娱||酒吧
|
||||
if($pit_number == 7 || $pit_number == 8){
|
||||
|
||||
Reference in New Issue
Block a user