From 2d89e1c6f7e4c6fb07b3a579d1908d35718db586 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 17:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=E7=88=B5?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 384d4bb..57488d5 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -652,6 +652,11 @@ class Room extends Model
                         $value['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room['id'], 'user_id' => $value['user_id']])->value('charm');
                         $value['dress'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 1);
                         $value['user_code'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 6);
+                        $Nobility = model('api/Nobility')->getUserNobilityInfo($value['user_id']);
+                        $value['nobility_info'] = $Nobility;
+                        $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3);
+                        $value['nobility_image'] = $Nobility['play_image'];
+                        $value['nickname_color'] = $Nobility['nick_name_color'];
                     }
                 }
                 $user_pit = db::name('vs_room_pit')->where(['room_id' => $room['id'],'user_id' => $user_id])->find();
@@ -910,7 +915,11 @@ class Room extends Model
         }
         $user_info['is_mute'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 1])->find() ? 1 : 0;
         $user_info['is_mute_pit'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 2])->find() ? 1 : 0;
-        $user_info['nobility_info'] = model('Nobility')->getUserNobilityInfo($user_id);
+        $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
+        $user_info['nobility_info'] = $Nobility;
+        $user_info['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
+        $user_info['nobility_image'] = $Nobility['play_image'];
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];
 
         return $user_info;
     }
@@ -969,6 +978,11 @@ class Room extends Model
                 $value['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $value['user_id']])->value('charm') ?? 0;
                 $value['dress'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 1);
                 $value['user_code'] = model('api/Decorate')->user_decorate_detail($value['user_id'], 6);
+                $Nobility = model('api/Nobility')->getUserNobilityInfo($value['user_id']);
+                $value['nobility_info'] = $Nobility;
+                $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3);
+                $value['nobility_image'] = $Nobility['play_image'];
+                $value['nickname_color'] = $Nobility['nick_name_color'];
             }
         }
         $song_pit_list = db::name('vs_room_pit_simulate')->where(['room_id' => $room_id])->select();
@@ -1068,6 +1082,11 @@ class Room extends Model
                 if($value['user_id'] == $user_id){
                     $user_pit['pit_number'] = 9;
                 }
+                $Nobility = model('api/Nobility')->getUserNobilityInfo($value['user_id']);
+                $value['nobility_info'] = $Nobility;
+                $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3);
+                $value['nobility_image'] = $Nobility['play_image'];
+                $value['nickname_color'] = $Nobility['nick_name_color'];
             }
         }
         return ['auction_list' => $auction_list,'pit_list' => $pit_list,'auction_user' => $auction_user,'user_pit' => $user_pit];
@@ -1862,6 +1881,11 @@ class Room extends Model
                         $value['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room['id'], 'user_id' => $value['user_id']])->value('charm');
                         $value['dress'] = model('Decorate')->user_decorate_detail($value['user_id'], 1);
                         $value['user_code'] = model('Decorate')->user_decorate_detail($value['user_id'], 6);
+                        $Nobility = model('api/Nobility')->getUserNobilityInfo($value['user_id']);
+                        $value['nobility_info'] = $Nobility;
+                        $value['mic_cycle'] = model('api/Decorate')->user_decorate_detail($value['user_id'],3);
+                        $value['nobility_image'] = $Nobility['play_image'];
+                        $value['nickname_color'] = $Nobility['nick_name_color'];
                     }
                 }
                 $user_pit = db::name('vs_room_pit')->where(['room_id' => $room['id'],'user_id' => $user_id])->find();
diff --git a/application/common.php b/application/common.php
index a62c903..b02c8e8 100644
--- a/application/common.php
+++ b/application/common.php
@@ -1138,7 +1138,7 @@ function handelCharge($where,$data){
     if(!$orderModel){
         return 0;
     }
-    if($orderModel['recharge_type'] == 1){//购买爵位
+    if($orderModel['nobility_id'] != 0){//购买爵位
         //修改订单状态
         $res1 = db::name('vs_user_recharge')->where($where)->update([
             'pay_status' => 2,
@@ -1149,7 +1149,7 @@ function handelCharge($where,$data){
         if(!$res1){
             return 0;
         }
-        model('Nobility')->buyNobility($orderModel['user_id'],$orderModel['recharge_type']);
+        model('Nobility')->buyNobility($orderModel['user_id'],$orderModel['nobility_id']);
         return 1;
     }else{//充值
         db::startTrans();