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

application/api/controller/Payment.php

@@ -29,8 +29,14 @@ class Payment extends Controller
         $type_params = input('type_params', 0);
         $type_id = input('type_id', 0);
         $nobility_id = input('nobility_id', 0);//'0-购买金币（充值），其他是爵位id'
+        if($nobility_id != 0){
+            $nobility = model('Nobility')->buyNobilityPrice($user_id,$nobility_id);
+            if($nobility['code'] == 0 || $nobility['data']['price'] != $money){
+                return V(0, '网络错误，请重新操作！',  null);
+            }
+        }
 
-        if(!$coin){
+        if(!$coin && $nobility_id == 0){
             $coin = $money * get_system_config_value('rmb_coin_ratio');
         }
         if (!$user_id) {
@@ -64,7 +70,7 @@ class Payment extends Controller
         $data['user_id'] = $user_id;
         $data['pay_type'] = $type;
         $data['createtime'] = time();
-        $data['remarke'] = '充值到app用户'.($user_code ?? "") ."余额！";
+        $data['remarke'] = $nobility_id == 0 ? '充值到app用户'.($user_code ?? "") ."余额！" :'购买爵位';
         $data['type_params'] = $type_params;
         $data['type_id'] = $type_id;
         $data['nobility_id'] = $nobility_id;

application/api/model/Friend.php

@@ -155,7 +155,7 @@ class Friend extends Model
     public function createRelation($user_id,$room_id,$friend_id,$user1_id,$user2_id,$friending_config_id){
 
         if (!$user1_id || !$user2_id || !$friend_id || !$room_id) {
-            return ['code' => 0, 'msg' => '参数有误！', 'data' => null];
+            return ['code' => 0, 'msg' => '参数有误！！', 'data' => null];
         }
 
         $user1 = min($user1_id, $user2_id);

application/api/model/Room.php

@@ -1087,6 +1087,13 @@ class Room extends Model
                 return ['code' => 0, 'msg' => '您没有权限操作', 'data' => null];
             }
         }
+        //获取被踢用户的爵位信息
+        $user_jue_info = model('api/Nobility')->getUserNobilityInfo($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];
+            }
+        }
 
         //记录用户退出房
         db::name('vs_room_visitor')->where(['room_id' => $room_id, 'user_id' => $user_id])->delete();
@@ -1519,6 +1526,9 @@ class Room extends Model
         $user_info['zhenai'] = $zhenai;
 
         $user_info['guild'] = $guild;
+        $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image
+        $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }
 
@@ -2090,6 +2100,14 @@ class Room extends Model
         }
         $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
         if($is_mute == 1){//1-禁言，
+            //获取被踢用户的爵位信息
+            $user_jue_info = model('api/Nobility')->getUserNobilityInfo($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];
+                }
+            }
+
             $da = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 1])->find();
             $is_mute_pit = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 2])->find()?1:0;
             if($da){

application/api/model/RoomPit.php

@@ -944,6 +944,13 @@ class RoomPit extends Model
                     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];
+                }
+            }
 
             if(!$pit_number || $pit_number == 888){
                 $roomInfo = db::name('vs_room')->where('id',$room_id)->field('label_id,type_id')->find();

application/api/model/User.php

@@ -160,6 +160,9 @@ class User extends Model
             $user_info['is_can_chat'] = 1;
         }
         $user_info['can_chat_money'] = $config_money;
+        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
+        $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
@@ -342,6 +345,9 @@ class User extends Model
         }else{
             $user_info['guild'] = '';
         }
+        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
+        $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 

application/api/model/UserZone.php

@@ -658,6 +658,9 @@ class UserZone extends Model
                 //用户等级标
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
+                $Nobility = model('Nobility')->getUserNobilityInfo($v['user_id']);//nobility_image
+                $v['nobility_image'] = $Nobility['play_image'];
+                $v['nickname_color'] = $Nobility['nick_name_color'];
             }
         }
         return $user_info;