From 952350c4ea8a496e2faceefa990c14a5c3114b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Mon, 15 Sep 2025 14:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=98=E5=9C=B0bug=E4=BF=AE=E6=94=B9-?=
 =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=BD=AC=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Decorate.php    |  2 +-
 application/api/model/BlindBoxTurntableGift.php | 16 +++++++++++-----
 application/cron/controller/RoomPan.php         |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php
index b9fed60..0c1d5d0 100644
--- a/application/adminapi/controller/Decorate.php
+++ b/application/adminapi/controller/Decorate.php
@@ -54,7 +54,7 @@ class Decorate extends adminApi
             $return_list[$k]['type_str'] = model('api/Decorate')->TypeArray[$v['type']];
             $return_list[$k]['base_image'] = $v['base_image'];
             $return_list[$k]['file_type'] = $v['file_type'];
-            $return_list[$k]['file_type_str'] = $v['file_type'] ? "SVGA" : "MP4";
+            $return_list[$k]['file_type_str'] = $v['file_type']==1 ? "SVGA" : "MP4";
             $return_list[$k]['play_image'] = $v['play_image'];
             $return_list[$k]['show_status'] = $v['show_status'];
             $return_list[$k]['is_buy'] = $v['is_buy'];
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index dea2d37..150eb9a 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -291,6 +291,12 @@ class BlindBoxTurntableGift extends Model
                 $gift_bag_detail = $result['gift_bag_detail'];
                 $gift = $result['gift'];
 
+                $pan_data = db::name("vs_room_pan")
+                    ->where(['room_id'=>$room_id,'gift_bag_detail_id'=>$gift_bag_detail['id']])->value("remaining_number");
+                if($pan_data < 1){
+                    db::rollback();
+                    return ['code' => 0, 'msg' => '礼物数量不足', 'data' => null];
+                }
                 // 构造返回数据
                 $result_data = [
                     'user_id' => $user_id,
@@ -345,7 +351,7 @@ class BlindBoxTurntableGift extends Model
 
                 // 减去盲盒包礼物数量
                 $ret = db::name("vs_room_pan")
-                    ->where(['room_id'=>$room_id,'gift_bag_detail_id'=>$gift_bag_detail['id']])
+                    ->where(['room_id'=>$room_id,'gift_bag_detail_id'=>$gift_bag_detail['id'],"remaining_number"=>["<>",0]])
                     ->setDec('remaining_number',1);
 
                 if(!$ret){
@@ -355,10 +361,10 @@ class BlindBoxTurntableGift extends Model
             }
 
             // 处理奖池重置操作
-            if ($should_reset_all_gifts) {
-                // 重置奖池中所有礼物数量
-                $this->reset_gift_pool($room_id, $gift_bag_id, $current_periods);
-            }
+//            if ($should_reset_all_gifts) {
+//                // 重置奖池中所有礼物数量
+//                $this->reset_gift_pool($room_id, $gift_bag_id, $current_periods);
+//            }
 
             // 批量插入盲盒转盘结果记录
             foreach ($gift_user_counts as $user_gift) {
diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php
index 4da9916..26ea560 100644
--- a/application/cron/controller/RoomPan.php
+++ b/application/cron/controller/RoomPan.php
@@ -29,7 +29,7 @@ class RoomPan
      * 盲盒转盘礼物补发
      */
     public function blind_box_turntable_gift_send(){
-        $blind_box_turntable_log = db('vs_blind_box_turntable_results_log')->where(['is_sued'=>0,'createtime'=>['>=',time()-60*30]])->select();
+        $blind_box_turntable_log = db('vs_blind_box_turntable_results_log')->where(['is_sued'=>0,'createtime'=>['>=',time()-60*30]])->limit(50)->select();
         if(empty($blind_box_turntable_log)){
             echo "没有需要发放的礼物 \n";
         }