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-03 17:13:43 +08:00
parent 8fe9e6f2f3 9192b58ff5
commit 5262a62b82
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/api/model/RoomPit.php
View File

@@ -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){
@@ -201,6 +204,12 @@ class RoomPit extends Model
if($step && $step != 1 && $pit_number < 9){
return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];
}
//在签约麦中不能下麦
$room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id, 'sign_type' => 1,'sign_user_id' =>$user_id])->find();
if($room_sign && $type == 0){
return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null];
}
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
@@ -1207,12 +1216,22 @@ class RoomPit extends Model
if($pit_numbers == 2){
return ['code' => 0, 'msg' => '师傅麦 此阶段不可操作', 'data' => null];
}
//在签约麦中不能下麦
$room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id, 'sign_type' => 1,'sign_user_id' =>$user_id])->find();
if($room_sign){
return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null];
}
}
}else{
if($room_type == 10){
if($pit_number == 2){
return ['code' => 0, 'msg' => '师傅麦 此阶段不可操作', 'data' => null];
}
//在签约麦中不能下麦
$room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id, 'sign_type' => 1,'sign_user_id' =>$accept_user_id])->find();
if($room_sign){
return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null];
}
}
$step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step');
if($step && $step != 1 && $pit_number < 9){

2
application/api/model/Sign.php
View File

@@ -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);
}
}
}