动态打赏

application/api/controller/RoomPit.php

@@ -30,7 +30,9 @@ class RoomPit extends BaseCom
         }elseif($room_type == 11){
             //9麦位，10麦位 不做$gift_id校验
             if($pit_number != 9 && $pit_number != 10){
-                if($gift_id == 0){
+                //有麦位就是换麦
+                $pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $this->uid])->value('pit_number')??0;
+                if($gift_id == 0 && $pit_infos == 0){
                     return V(0, '请选择礼物', null);
                 }
             }

application/api/model/RoomPit.php

@@ -56,6 +56,7 @@ class RoomPit extends Model
         if($roomtype == 11 && ($pit_number != 9 || $pit_number != 10)){
             $pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time') ?? 5;
             $text['end_time'] = time()+$pit_time * 60;
+            $text['had_custom_gift'] = db::name('vs_user_custom_gift')->where(['user_id' => $user_id,'gift_remark_name' => ['<>','']])->find()?1:0;
         }else{
             $text['end_time'] = 0;
         }
@@ -1009,7 +1010,7 @@ class RoomPit extends Model
                     return ['code' => 0, 'msg' => '此类型房间  不能上7、8号麦位', 'data' => null];
                 }
             }
-            if($room_type == 11){
+            if($room_type == 11 && $pit_number != 10){
                 $text['text'] = '邀请你上麦';
                 $text['user_id'] = $accept_user_id;
                 $text['pit_number'] = $pit_number;