From 15018b6c9123ae3ef2a6b34050520c8e7c10e9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 29 Aug 2025 14:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4.-=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/BlindBox.php    | 2 ++
 application/api/model/BlindBoxTurntableGift.php | 4 ++--
 application/api/model/GiveGift.php              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php
index 46ce76e..ca301bb 100644
--- a/application/adminapi/controller/BlindBox.php
+++ b/application/adminapi/controller/BlindBox.php
@@ -134,6 +134,7 @@ class BlindBox extends adminApi
         $gift_bag_id = input('gift_bag_id', '');
         $quantity = input('quantity', 0);
         $weight = input('weight', 0);
+        $is_world_show = input('is_world_show', 0);
         if(empty($gift_id)){
             return V(0,"请选择礼物");
         }
@@ -157,6 +158,7 @@ class BlindBox extends adminApi
         $data['remaining_number'] = $quantity;
         $data['createtime'] = time();
         $data['weight'] = $weight;
+        $data['is_world_show'] = $is_world_show;
 
         $res = db::name($this->table)->insert($data);
         if($res){
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index cd4555d..5893b16 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -167,10 +167,10 @@ class BlindBoxTurntableGift extends Model
                 $FromUserInfoNickname = db::name('user')->where(['id'=>$user_id])->value('nickname');
                 $ToUserInfoNickname = db::name('user')->where(['id'=>$value['gift_user_id']])->value('nickname');
                 $gift_name = db::name('vs_gift')->where(['id'=>$value['gift_id']])->value('gift_name');
-                $text = $FromUserInfoNickname . ' 送给 ' . $ToUserInfoNickname.' 盲盒转盘礼物得到 ' .$gift_name.' x ' .$value['count'];
+                $text_str = $FromUserInfoNickname . ' 送给 ' . $ToUserInfoNickname.' 盲盒转盘礼物得到 ' .$gift_name.' x ' .$value['count'];
                 $text = [
                     'xlh_data' => $xlh,
-                    'text' => $text
+                    'text' => $text_str
                 ];
                 //聊天室推送系统消息
                 model('Chat')->sendMsg(1056,$room_id,$text);
diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php
index 4ba0394..70ecfbf 100644
--- a/application/api/model/GiveGift.php
+++ b/application/api/model/GiveGift.php
@@ -545,7 +545,7 @@ class GiveGift extends Model
                     }else{
                         if($gift_info['is_public_server'] == 1){
                             //推送礼物横幅
-                            $push = new Push(UID, $from_id);
+                            $push = new Push($uid, $from_id);
                             $room_name = Db::name('vs_room')->where(['id' => $from_id, 'apply_status' => 2])->value('room_name');
                             $text = $FromUserInfo['nickname'] . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $gift_info['gift_name'] . 'X' . $num;
                             $text_list_new = [