小时榜礼物配置

application/adminapi/controller/RoomHourRanking.php

@@ -56,12 +56,17 @@ class RoomHourRanking
     //房间小时榜配置修改
     public function room_hour_ranking_config_edit()
     {
-        $data = input('post.');
+        $id = input('id');
         $data['is_open_red_pack'] = 0;//暂时不开启
+        $data['is_public_server'] = input('is_public_server');
+        $data['broadcast_times'] = input('broadcast_times');
+        $data['is_open_xlh'] = input('is_open_xlh');
+        $data['min_price'] = input('min_price');
+//        $data['introd'] = input('introd');
         $data['createtime'] = time();
         $data['updatetime'] = time();
 
-        $res = db::name('vs_hour_ranking_config')->insert($data);
+        $res = db::name('vs_hour_ranking_config')->where('id', $id)->update($data);
         if ($res) {
             return V(1, "成功");
         } else {
@@ -101,4 +106,62 @@ class RoomHourRanking
         ];
         return V(1,"成功", $list);
     }
+
+
+    //添加核心配置
+    public function add_core_config()
+    {
+        $data['is_public_server'] = input('is_public_server');
+        $data['createtime'] = time();
+        $data['updatetime'] = time();
+
+
+        $res = db::name('vs_hour_ranking_config')->insert($data);
+    }
+
+    //核心配置列表
+    public function core_config_list()
+    {
+        $list = db::name('vs_hour_ranking_gift_config')
+            ->group('time_id')
+            ->select();
+        var_dump($list);
+
+        if($list){
+            $lis = $this->time_period_correspondence()['data'];
+            foreach ($list as $k => $v){
+                $list[$k]['time_id'] = $lis[$v['time_id']] ;
+                $list[$k]['time_id']['index'] = $k + 1;
+                $list[$k]['time_id']['content'] = $k + 1;
+
+            }
+        }
+
+
+        return V(1,"成功", $list);
+    }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

application/api/model/Room.php

@@ -1302,10 +1302,18 @@ class Room extends Model
         $room_user = db::name('vs_room_visitor')->where(['room_id' => $room_id])->select();
         if($room_user){
             foreach ($room_user as $vv){
-                if(Db::name('user')->where('id', $vv['user_id'])->value('is_online') == 0){
+                if(($label_type['data']['type_id'] == 1 || $label_type['data']['type_id'] == 8) && $label_type['data']['label_id'] == 1){
+                    //不做处理
+                }else{
+                    //查询是否有切后台的操作
+                    $bg_room = db::name('vs_user_in_room_bg')->where(['room_id' => $room_id,'user_id' => $vv['user_id']])->find();
+
+                    if(Db::name('user')->where('id', $vv['user_id'])->value('is_online') == 0 && !$bg_room){
                         model('Room')->quit_room($vv['user_id'], $room_id,$vv['user_id'],2);
                     }
                 }
+
+            }
         }
 
         $list = db::name('vs_room_visitor')->alias('a')

application/api/model/Tencent.php

@@ -925,14 +925,15 @@ class Tencent extends Model
 
             if($quit_room) {
                 foreach ($quit_room as $v){
-                    $room_type = db::name('vs_room')->where(['id' => $v['room_id'],'room_status' => 1])->field('step,type_id')->find();
+                    $room_type = db::name('vs_room')->where(['id' => $v['room_id'],'room_status' => 1])->field('step,type_id,label_id')->find();
                     if(isset($room_type)  && ($room_type['type_id'] == 7 && ($room_type['step'] == 2 ||$room_type['step'] == 3)) || $room_type == 2){
                         $text['text'] = '掉线！';
                         $text['user_id'] = $uid;
                         $text['type'] = 2;
                         model('Chat')->sendMsg(1058,$v['room_id'],$text);
-                    }elseif(isset($room_type)  && ($room_type['type_id'] == 1||$room_type['type_id'] == 8) && $room_type['type_id'] == 1){
+                    }elseif(isset($room_type)  && ($room_type['type_id'] == 1||$room_type['type_id'] == 8) && $room_type['label_id'] == 1){
-                        return true;
+                        Db::name('user')->where('id', $uid)->update(['is_online' => 1, 'updatetime' => time()]);
+//                        return true;
                     }else
                     {
                         //查询是否有切后台的操作