酒吧房：->相关接口提交-麦位结束脚本提交

application/adminapi/controller/Decorate.php

@@ -62,7 +62,7 @@ class Decorate extends adminApi
             $return_list[$k]['admin_name'] = db::name('admin')->where(['id'=>$v['admin_id']])->value('nickname')??"--";
             $return_list[$k]['ext_value'] = $v['ext_value'] ?? 0;
             $return_list[$k]['price'] = $v['price'] ?? 0;
-
+            $return_list[$k]['special_num'] = $v['special_num'] ?? '';
 
         }
         $return_data = [

application/api/model/BarRoom.php

@@ -58,7 +58,7 @@ class BarRoom extends Model
     }
     //上麦选择礼物
     public function join_pit_choose_gift($user_id,$room_id,$gift_id){
-        $pit_gift = db::name('vs_room_bar_pit_gift')->where(['room_id' => $room_id,'user_id' => $user_id, 'delete_time' => 0])->find();
+        $pit_gift = db::name('vs_room_bar_pit_gift')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
         $pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time');
         $end_time = time()+$pit_time * 60;
         if($pit_gift){
@@ -69,6 +69,7 @@ class BarRoom extends Model
                     'gift_id' => $gift_id,
                     'end_time' => $end_time,
                     'updatetime' => time(),
+                    'delete_time' => 0,
                 ]);
         } else{
             // 执行插入操作

application/cron/controller/PerformPerSecond.php

@@ -51,6 +51,10 @@ class PerformPerSecond
         $this->sign_room_time_end();
         echo "\n";
 
+        echo "酒吧房间时间结束处理：\n";
+        $this->bar_room_time_end();
+        echo "\n";
+
     }
 
 
@@ -366,4 +370,20 @@ class PerformPerSecond
         }
     }
 
+    //酒吧房间时间结束处理
+    public function bar_room_time_end(){
+        $bar_pit_gift = Db::name('vs_room_bar_pit_gift')->where(['end_time'=>['<',time()],'delete_time'=>0])->select();
+        if($bar_pit_gift){
+            foreach ($bar_pit_gift as $value){
+                $re = model('api/RoomPit')->DownPit($value['user_id'],$value['room_id']);
+                if($re['code']==1){
+                    db::name('vs_room_bar_pit_gift')->where('id',$value['id'])->update(['delete_time'=>time()]);
+                    echo "用户".$value['user_id']."房间".$value['room_id']."已下麦\n";
+                }else{
+                    echo $re['msg']."\n";
+                }
+            }
+        }
+        echo "酒吧房间时间结束处理完成\n";
+    }
 }