diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 917f0d0..a9ff2e0 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -148,7 +148,7 @@ class RoomPit extends Model } //用户下麦 - public function DownPit($user_id,$room_id,$pit_number) + public function DownPit($user_id,$room_id,$pit_number,$type = 0) { if(!$pit_number){ $pit_number = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->value('pit_number'); @@ -162,6 +162,9 @@ class RoomPit extends Model $pit_text = '签约麦'; }elseif($pit_number == 2){ $pit_text = '师父麦'; + if($type == 0){ + return ['code' => 0, 'msg' => '师父麦位不能下麦', 'data' => null]; + } }elseif ($pit_number == 3 || $pit_number == 4 || $pit_number == 5) { $pit_text = '老板麦'; }elseif($pit_number == 9){ @@ -203,7 +206,7 @@ class RoomPit extends Model } //在签约麦中不能下麦 $room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id, 'sign_type' => 1,'sign_user_id' =>$user_id])->find(); - if($room_sign){ + if($room_sign && $type == 0){ return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null]; } diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php index 7fe3c65..da2a9a4 100644 --- a/application/api/model/Sign.php +++ b/application/api/model/Sign.php @@ -504,7 +504,7 @@ class Sign extends Model if($on_pit_users){ foreach ($on_pit_users as $pit_user){ - model('RoomPit')->DownPit($pit_user['user_id'], $room_id, $pit_user['pit_number']); + model('RoomPit')->DownPit($pit_user['user_id'], $room_id, $pit_user['pit_number'],1); } } }