From f91cc2006cf7f281f507001d41a8c9c71cd47123 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 18:00:08 +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.-=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Gift.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/application/api/model/Gift.php b/application/api/model/Gift.php
index 31c6c2e..66ad136 100644
--- a/application/api/model/Gift.php
+++ b/application/api/model/Gift.php
@@ -39,13 +39,13 @@ class Gift extends Model
             $gift_price = get_system_config_value('room_love_auction_cion');
             $where['gift_price'] = ['>',$gift_price];
         }
+        $is_open_blind_box_turntable = 0;
+        if($room_id){
+            $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable');
+        }
         $list = $this->field('gid as gift_id,gift_name,base_image,gift_price')->where($map)->where($where)->order('sort asc, gift_price asc')->select();
-
         if($label==2){
-            $is_open_blind_box_turntable = 0;
-            if($room_id){
-                $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable');
-            }
+            $list_data = [];
             foreach ($list as &$v) {
                 //获取盲盒列表
                 $box_list  = Db::name('vs_gift_bag')->where(['status'=>1])->where(['activities_id'=>["in",[4,5]]])->select();
@@ -60,8 +60,17 @@ class Gift extends Model
                         break;
                     }
                 }
-
             }
+            foreach ($list as $k=>$v) {
+                if($is_open_blind_box_turntable == 1){
+                    $list_data[] = $v;
+                }else{
+                    if(isset($v['activities_id']) && $v['activities_id'] == 4){
+                        $list_data[] = $v;
+                    }
+                }
+            }
+            $list = $list_data;
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }