From 94f87237fe9ce0325a9ef1b9718971b7cc7aa935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 14:40:50 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=88=B5=E4=BD=8D=E6=94=AF=E4=BB=98=20?=
 =?UTF-8?q?=E5=92=8C=E9=98=B2=E8=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Payment.php |  6 ++++++
 application/api/model/Room.php         | 15 +++++++++++++++
 application/api/model/RoomPit.php      |  7 +++++++
 3 files changed, 28 insertions(+)

diff --git a/application/api/controller/Payment.php b/application/api/controller/Payment.php
index 648d2d5..7e8cb53 100644
--- a/application/api/controller/Payment.php
+++ b/application/api/controller/Payment.php
@@ -29,6 +29,12 @@ 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){
             $coin = $money * get_system_config_value('rmb_coin_ratio');
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 51ca245..a7fb14e 100644
--- a/application/api/model/Room.php
+++ b/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();
@@ -2090,6 +2097,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){
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 9ef0a7d..f90796f 100644
--- a/application/api/model/RoomPit.php
+++ b/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();

From bde107a92d63d6d1de4f9b59f29e46d2440cf4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 14:46:54 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=88=B5=E4=BD=8D=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Payment.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Payment.php b/application/api/controller/Payment.php
index 7e8cb53..3283b79 100644
--- a/application/api/controller/Payment.php
+++ b/application/api/controller/Payment.php
@@ -36,7 +36,7 @@ class Payment extends Controller
             }
         }
 
-        if(!$coin){
+        if(!$coin && $nobility_id == 0){
             $coin = $money * get_system_config_value('rmb_coin_ratio');
         }
         if (!$user_id) {
@@ -70,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;

From fb016ed07e949aa2bdb65a76974fc94a077474ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 14:56:54 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=88=91=E7=9A=84=E3=80=81=E7=88=B5?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/User.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/api/model/User.php b/application/api/model/User.php
index 59f55be..66dd01b 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -160,6 +160,8 @@ 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['nobility_image'];
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }

From afc21ca457eb693e97270a2afe11edb317df0f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 15:23:10 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=88=91=E7=9A=84=E3=80=81=E7=88=B5?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 2 +-
 application/api/model/User.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index b54507c..8d37fe6 100644
--- a/application/api/model/Friend.php
+++ b/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);
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 66dd01b..be4f643 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -161,7 +161,7 @@ class User extends Model
         }
         $user_info['can_chat_money'] = $config_money;
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
-        $user_info['nobility_image'] = $Nobility['nobility_image'];
+        $user_info['nobility_image'] = $Nobility['play_image'];
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }

From 8bd1293aa7a7976cfe680014af1d35dd2a779c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 15:52:11 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=86=85=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index a7fb14e..77b766e 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1526,6 +1526,8 @@ class Room extends Model
         $user_info['zhenai'] = $zhenai;
 
         $user_info['guild'] = $guild;
+        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
+        $user_info['nobility_image'] = $Nobility['play_image'];
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }
 

From 2122e11f3cf8c5ec38e35d91770910009f33941a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 16:06:42 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=86=85=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 77b766e..579064e 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1526,7 +1526,7 @@ class Room extends Model
         $user_info['zhenai'] = $zhenai;
 
         $user_info['guild'] = $guild;
-        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
+        $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }

From 73f82b29da7bdbee7851c9b8bd88c0ff46fb2130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 16:13:19 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/User.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/api/model/User.php b/application/api/model/User.php
index be4f643..1644ee4 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -344,6 +344,8 @@ class User extends Model
         }else{
             $user_info['guild'] = '';
         }
+        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
+        $user_info['nobility_image'] = $Nobility['play_image'];
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 

From 150f23308814d72d855df250c1ba6a237004ac63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 16:28:42 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=89=A9=E5=88=97=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=88=B5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/UserZone.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index 279e2a5..9d96eaa 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -658,6 +658,8 @@ 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'];
             }
         }
         return $user_info;

From d102fe5e191024cfbd16c99a44aef4c79d829ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 16:54:45 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=88=B5=E4=BD=8D=20?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php     | 1 +
 application/api/model/User.php     | 2 ++
 application/api/model/UserZone.php | 1 +
 3 files changed, 4 insertions(+)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 579064e..8f86f6c 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1528,6 +1528,7 @@ class Room extends Model
         $user_info['guild'] = $guild;
         $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 1644ee4..0f67289 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -162,6 +162,7 @@ class User extends Model
         $user_info['can_chat_money'] = $config_money;
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
@@ -346,6 +347,7 @@ class User extends Model
         }
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index 9d96eaa..6957598 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -660,6 +660,7 @@ class UserZone extends Model
                 $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['nick_name_color'] = $Nobility['nick_name_color'];
             }
         }
         return $user_info;

From f3c87b6c820440d3870a4221f56017ceb94b2ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 16:56:13 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=88=B5=E4=BD=8D=20?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php     | 2 +-
 application/api/model/User.php     | 4 ++--
 application/api/model/UserZone.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 8f86f6c..384d4bb 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1528,7 +1528,7 @@ class Room extends Model
         $user_info['guild'] = $guild;
         $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 0f67289..719b109 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -162,7 +162,7 @@ class User extends Model
         $user_info['can_chat_money'] = $config_money;
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
@@ -347,7 +347,7 @@ class User extends Model
         }
         $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nick_name_color'] = $Nobility['nick_name_color'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index 6957598..f096d69 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -660,7 +660,7 @@ class UserZone extends Model
                 $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['nick_name_color'] = $Nobility['nick_name_color'];
+                $v['nickname_color'] = $Nobility['nick_name_color'];
             }
         }
         return $user_info;