From 2db084b7bdd4f81bbbf05036c13b792194fc6cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 14 Oct 2025 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=8C=85=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Redpacket.php | 2 ++
 application/common/model/Redpacket.php   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Redpacket.php b/application/api/controller/Redpacket.php
index cec7746..0315c69 100644
--- a/application/api/controller/Redpacket.php
+++ b/application/api/controller/Redpacket.php
@@ -104,6 +104,8 @@ class Redpacket extends BaseCom
             foreach ($result as &$item) {
                 $item['redpacket_id'] = $item['id'];
                 $item['redpacket_time'] = get_system_config_value('red_packet_time');//展示时间
+                $item['nickname'] = Db::name('user')->where('id', $item['user_id'])->value('nickname');
+                $item['avatar'] = Db::name('user')->where('id', $item['user_id'])->value('avatar');
             }
         }
         return V(1, '获取成功', $result);
diff --git a/application/common/model/Redpacket.php b/application/common/model/Redpacket.php
index 566a4af..ee84ac1 100644
--- a/application/common/model/Redpacket.php
+++ b/application/common/model/Redpacket.php
@@ -100,7 +100,7 @@ class Redpacket extends Model
                 'start_time' => $startTime,
                 'end_time' => $endTime,
                 'createtime' => time(),
-                'remark' => $data['remark'] ?? '大吉大利，红包拿来啦！'
+                'remark' => empty($data['remark']) ?? '大吉大利，红包拿来啦！'
             ];
 
             $redpacketId = $this->insertGetId($redpacketData);