Merge remote-tracking branch 'origin/develop' into develop

application/api/model/RoomAuction.php

@@ -131,6 +131,7 @@ class RoomAuction extends Model
         if($ree['code'] != 1){
             return ['code' => $ree['code'], 'msg' => $ree['msg'],'data' => null];
         }
+        $list = null;
         if($auction['status'] == 2){//1未开启 2进行中 3已结束
             //数据写入数据库
             $res = db::name('vs_room_auction_bid_log')->insert([

application/api/model/RoomHourRanking.php

@@ -94,7 +94,7 @@ class RoomHourRanking extends Model
         $is_open_xlh = db::name('vs_hour_ranking_config')->where('id', 1)->value('is_open_xlh');
         // 查询这个时间段内收礼的房间ID集合，并实现分页
         $room_query = Db::name('vs_give_gift')
-            ->where('from', 2)
+            ->where(['from' => 2, 'from_id' => ['>',0]])
             ->whereBetween('createtime', [$start_time, $end_time])
             ->group('from_id')
             ->field('from_id, SUM(total_price) as total_price');
@@ -118,24 +118,28 @@ class RoomHourRanking extends Model
                     ->whereBetween('b.createtime', [$start_time, $end_time])
                     ->find();
 
-                if($profit[$k]) {
+                if(!empty($profit[$k])) {
                     $profit[$k]['total_price'] = $profit[$k]['total_price'] * get_system_config_value('coin_charm_exp');
+
+                    // 查询巡乐会状态
                     if($room_id > 0 && $is_open_xlh == 1){
                         $xlh_status = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id);
-                        $profit[$k]['xlh_status'] = $xlh_status['xlh_status'];
-                    }else{
+                        $profit[$k]['xlh_status'] = $xlh_status['xlh_status'] ?? 0;
+                    } else {
                         $profit[$k]['xlh_status'] = 0;
                     }
-                    //查询房间是否有红包
-                    if($room_id){
-                        $red_pack_status = Db::name('redpacket')->where(['room_id' => $room_id, 'status' => ['<=',1]])->count();
+
+                    // 查询房间红包状态
+                    if($room_id > 0){
+                        $red_pack_status = Db::name('redpacket')->where(['room_id' => $room_id, 'status' => ['<=', 1]])->count();
                         $profit[$k]['redpacket_status'] = $red_pack_status;
-                    }else{
+                    } else {
                         $profit[$k]['redpacket_status'] = 0;
                     }
                 } else {
                     unset($profit[$k]);
                 }
+
             }
         }
 

application/api/model/RoomPit.php

@@ -1255,12 +1255,13 @@ class RoomPit extends Model
                 if(!model('QuanXian')->quan_xian($user_id, $accept_user_id, $room_id)){
                     return ['code' => 0, 'msg' => '您没有权限操作', 'data' => null];
                 }
-            }
-            //获取被踢用户的爵位信息
-            $user_jue_info = model('api/Nobility')->getUserNobilityInfo($accept_user_id);
-            foreach ($user_jue_info['power_list'] as $key => $value){
-                if($value['id'] == 7){
-                    return ['code' => 0, 'msg' => '该用户已是'.$user_jue_info['nobility_name'].'爵位，不能踢', 'data' => null];
+
+                //获取被踢用户的爵位信息
+                $user_jue_info = model('api/Nobility')->getUserNobilityInfo($accept_user_id);
+                foreach ($user_jue_info['power_list'] as $key => $value){
+                    if($value['id'] == 7){
+                        return ['code' => 0, 'msg' => '该用户已是'.$user_jue_info['nobility_name'].'爵位，不能踢', 'data' => null];
+                    }
                 }
             }