From 612f48402d402d95827cdc6a39fa150ee4a6fb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 4 Sep 2025 18:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=20=E6=8A=BD?=
 =?UTF-8?q?=E4=B8=AD=E6=8C=87=E5=AE=9A=E7=A4=BC=E7=89=A9=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=87=8F=E5=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/BlindBoxTurntableGift.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 3b1f607..cda8823 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -2,6 +2,7 @@
 
 namespace app\api\model;
 use app\common\controller\Push;
+use think\Cache;
 use think\Model;
 use think\Db;
 use think\Session;
@@ -562,10 +563,19 @@ class BlindBoxTurntableGift extends Model
                         $pan_xlh_num = $pan_xlh_num+1;
                         if($pan_xlh_num <= 1){
                             $add_end_time =  $ext['locking_time']['tow_no_locking_time'] * 60;
+                            Cache::set('selected_gift_id_'.$room_id.$gift_bag_detail['foreign_id'],$add_end_time,$add_end_time);
                         }else{
-                            $add_end_time =  ($ext['locking_time']['tow_no_locking_time']-$ext['locking_time']['next_time']) * 60;
+//                            $add_end_time =  ($ext['locking_time']['tow_no_locking_time']-$ext['locking_time']['next_time']) * 60;
+                            if(Cache::get('selected_gift_id_'.$room_id.$gift_bag_detail['foreign_id'])){
+                                $erci_xlh_num = Cache::get('selected_gift_id_'.$room_id.$gift_bag_detail['foreign_id']);
+                                $add_end_time =  ($erci_xlh_num-$ext['locking_time']['next_time'] *60);
+                                Cache::set('selected_gift_id_'.$room_id.$gift_bag_detail['foreign_id'],$add_end_time,$add_end_time);
+                            }else{
+                                $add_end_time =  ($ext['locking_time']['tow_no_locking_time']-$ext['locking_time']['next_time']) * 60;
+                            }
                         }
                         if($add_end_time <= 30){
+                            Cache::set('selected_gift_id_'.$room_id.$gift_bag_detail['foreign_id'],30,30);
                             $add_end_time = 30;
                         }
                         $end_time = time() +  $add_end_time;