From 9cd5c782903158eb543614e76c74ad821938b8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 23 Sep 2025 19:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=BF=AE=E6=94=B9bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/BlindBoxTurntableGift.php | 2 +-
 application/api/model/Level.php                 | 4 ++--
 application/cron/controller/RoomPan.php         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 3e24c7b..dad2f15 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -680,7 +680,7 @@ class BlindBoxTurntableGift extends Model
                 'play_image' => implode(',',$play_image),
                 'gift_name' => implode(',',$gift_names),
             ],
-            'text' => $textMessage
+            'text' => rtrim($textMessage, "\n")
         ];
         //聊天室推送系统消息
         model('Chat')->sendMsg(1005,$room_id,$text);
diff --git a/application/api/model/Level.php b/application/api/model/Level.php
index 49a071d..2dd172b 100644
--- a/application/api/model/Level.php
+++ b/application/api/model/Level.php
@@ -61,7 +61,7 @@ class Level extends Model
         //获取等级
         // 获取用户当前等级
         $currentUserLevel = $user['charm_level'];
-        if($currentUserLevel == 0){
+        if($currentUserLevel == 1){
             $level = Db::name('vs_charm_level')
                 ->where('status', 1)
                 ->order('level', 'asc')
@@ -150,7 +150,7 @@ class Level extends Model
         //获取等级
         // 获取用户当前等级
         $currentUserLevel = $user['wealth_level'];
-        if($currentUserLevel == 0){
+        if($currentUserLevel == 1){
             $level = Db::name('vs_wealth_level')
                 ->where('status', 1)
                 ->order('level', 'asc')
diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php
index cf6b9b6..7f9cced 100644
--- a/application/cron/controller/RoomPan.php
+++ b/application/cron/controller/RoomPan.php
@@ -83,7 +83,7 @@ class RoomPan
                     'play_image' => implode(',',$play_image),
                     'gift_name' => implode(',',$gift_names),
                 ],
-                'text' => $textMessage
+                'text' => rtrim($textMessage, "\n")
             ];
             //聊天室推送系统消息
             model('Chat')->sendMsg(1005,$room_id,$text);