From 73382d1460568bcf91dbf3a61473087c7b5b8ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 19 Sep 2025 17:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=89=88=E4=B9=8B=E5=90=8Ebug?=
 =?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/GiveGift.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php
index ad7c843..5085fb0 100644
--- a/application/api/model/GiveGift.php
+++ b/application/api/model/GiveGift.php
@@ -389,16 +389,18 @@ class GiveGift extends Model
                         if($gift_box){
                             // 统计相同礼物的数量
                             $giftCount = [];
-                            foreach ($gift_box as $gv) {
+                            foreach ($gift_box as $key=>$gv) {
+                                $gift_info = Db::name('vs_gift')->where(['gid'=>$gv['gift_id']])
+                                    ->field('gid as gift_id,gift_name,gift_price,file_type,base_image,play_image,gift_type,label,is_public_server')->find();
                                 if (isset($giftCount[$gv['gift_id']])) {
                                     $giftCount[$gv['gift_id']]['count']++;
                                 } else {
                                     $giftCount[$gv['gift_id']] = [
-                                        'gift_info' => Db::name('vs_gift')->where(['gid'=>$gv['gift_id']])
-                                            ->field('gid as gift_id,gift_name,gift_price,file_type,base_image,play_image,gift_type,label,is_public_server')->find(),
+                                        'gift_info' => $gift_info,
                                         'count' => 1
                                     ];
                                 }
+                                $gift_box[$key]['gift_name'] = $gift_info['gift_name'];
                             }
 
                             // 构建文字消息内容
@@ -411,14 +413,10 @@ class GiveGift extends Model
 
                             // 推送文字消息 (格式: 张三 送给 李四 趣味礼物 礼物名1 X2，礼物2 X4)
                             $textMessage = $FromUserInfo['nickname'] . ' 送给 ' . $ToUserInfo['nickname'].' 趣味礼物 ' . implode('，', $giftTextList);
-                            foreach ($gift_box as $gv) {
-
-                            }
-                            $box_gift_info =
                             $textData = [
                                 'FromUserInfo' => $FromUserInfo,
                                 'ToUserInfo' => $ToUserInfo,
-                                'GiftInfo' => $gift_box,
+                                'GiftInfos' => array_values($gift_box),
                                 'GiftNum' => $num,
                                 'text' => $textMessage
                             ];