From 9b5e1bed0eb8be80eeeba02242eb31e88e073aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 22 Nov 2025 14:51:28 +0800
Subject: [PATCH] =?UTF-8?q?CP=20=E7=A9=BA=E9=97=B4=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/UserCp.php   | 1 +
 application/api/model/UserData.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php
index 7bdc1a8..cceab48 100644
--- a/application/api/model/UserCp.php
+++ b/application/api/model/UserCp.php
@@ -155,6 +155,7 @@ class UserCp extends Model
             'from_user_id' => $from_user_id,
             'to_user_id' => $to_user_id,
             'gift_id' => $gift_id,
+            'num' => $num,
             'cp_zone_id' => $cp_zone_id,
             'exp' => $exp,
             'exp_total' => $yuan_exp + $exp,
diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php
index f3006e5..dd7e818 100644
--- a/application/api/model/UserData.php
+++ b/application/api/model/UserData.php
@@ -449,7 +449,7 @@ class UserData extends Model
                 //获取房间用户总数
                 $item['user_count'] = db::name('vs_room_visitor')->where('room_id',$item['room_id'])->count();
                 //房间是否有靓号 7房间靓号
-                $item['room_number'] = model('Decorate')->user_decorate_detail($item['room_id'],7);
+                $item['room_number'] = model('Decorate')->user_decorate_detail($item['room_id'],7)?? $item['room_number'];
 //                $item['hot_value'] = $item['hot_value'] * 10;
             }
             $list = array_values((array)$list);