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

application/api/model/RoomPit.php

@@ -415,9 +415,48 @@ class RoomPit extends Model
         $list['regular'] = db::name('vs_room_pit_apply')->alias('a')->join('user b','a.user_id = b.id')
             ->where($where)->where('a.type',0)->field('a.user_id,a.rank_value,b.nickname,b.avatar')
             ->order('a.rank_value desc')->select();
+        foreach ($list['regular'] as $k => $v){
+            //查询用户的爵位
+            $jue_wei = model('Nobility')->getUserNobilityInfo($v['user_id']);
+            if($jue_wei['power_list']){
+                foreach ($jue_wei['power_list'] as $k1 => $v1){
+                    if($v1['id'] == 11){
+                        $special = $list['regular'][$k];
+                        unset($list['regular'][$k]);
+                    }
+                }
+            }
+        }
+        //数组重组
+        $list['regular'] = array_values($list['regular']);
+
         $list['special'] = db::name('vs_room_pit_apply')->alias('a')->join('user b','a.user_id = b.id')
             ->where($where)->where('a.type',1)->field('a.user_id,a.rank_value,b.nickname,b.avatar')
             ->order('a.rank_value desc')->select();
+        if(!empty($special)){
+            //把特殊用户放在最前面
+            array_unshift($list['special'],$special);
+        }
+        foreach ($list['special'] as $k => $v){
+            //查询用户的爵位
+            $juewei = model('Nobility')->getUserNobilityInfo($v['user_id']);
+            if($juewei){
+                $v['jue_wei'] = $juewei;
+            }else{
+                $v['jue_wei'] = [
+                    'level' => 0,
+                ];
+            }
+        }
+        //先根据$v['jue_wei'] 下面的level 由大到小排序，再根据$v['rank_value'] 由大到小排序level
+        usort($list['regular'], function($a, $b) {
+            if ($a['jue_wei']['level'] == $b['jue_wei']['level']) {
+                return $b['rank_value'] - $a['rank_value'];
+            }
+            return $b['jue_wei']['level'] - $a['jue_wei']['level'];
+        });
+
+
         $list['gift_info'] = db::name('vs_room_pit_apply_help_gift')->where('room_id',$room_id)->find();
         if($list['gift_info']){
             $list['gift_info']['gift_name'] = db::name('vs_gift')->where('gid',$list['gift_info']['gift_id'])->value('gift_name');