From 2083ed05ec05ce0f2a677339d009aa4ba7b0c7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 9 Sep 2025 15:37:45 +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.-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/BlindBox.php    | 1 +
 application/api/model/BlindBoxTurntableGift.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php
index d35c0f2..caaaa67 100644
--- a/application/adminapi/controller/BlindBox.php
+++ b/application/adminapi/controller/BlindBox.php
@@ -263,6 +263,7 @@ class BlindBox extends adminApi
                     $periods = $room_pan_detail['periods'];
                 }
             }else{
+                db::name('vs_room_pan')->where(['room_id'=>$room_id,'gift_bag_id'=>$gift_bag_id])->delete();
                 $room_ids = db::name('vs_room')->field('id')->where(['is_open_blind_box_turntable'=>1,'room_status'=>1])->select();
                 $room_ids = array_column($room_ids,'id');
             }
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index b4d53b3..a45f539 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -403,6 +403,7 @@ class BlindBoxTurntableGift extends Model
             ->join('vs_gift d','d.gid = a.gift_id','left')
             ->field('a.gift_id,a.count,a.gift_user_id,b.createtime,c.nickname,d.gift_name as gift_name,d.base_image')
             ->where($where)
+            ->order('b.createtime desc')
             ->page($page,$page_size)
             ->select();
         foreach ($list as &$v){
@@ -426,6 +427,7 @@ class BlindBoxTurntableGift extends Model
             ->join('vs_gift e','e.gid = a.gift_id','left')
             ->field('a.gift_id,a.count,b.user_id,b.createtime,c.nickname,d.name as gift_name,e.base_image')
             ->where($where)
+            ->order('b.createtime desc')
             ->page($page,$page_size)
             ->select();
         foreach ($list as &$v){
@@ -557,9 +559,9 @@ class BlindBoxTurntableGift extends Model
                 //随机获取一个礼物
                 $where = [
                     'a.gift_bag_id' => $gift_bag_id,
+                    'b.room_id' => $room_id,
                     'a.quantity' => ['>',0],
                     'b.remaining_number' => ['>',0],
-                    'b.room_id' => $room_id,
                     'a.weight' => ['<=', $total_draw_times],
                 ];
                 // 使用闭包条件来处理复杂的 weight 逻辑
@@ -758,6 +760,7 @@ class BlindBoxTurntableGift extends Model
             ->join('vs_gift c','c.gid = a.gift_id','left')
             ->field('a.gift_id,a.num as count,b.createtime,c.gift_name as gift_name,c.base_image')
             ->where($where)
+            ->order('b.createtime desc')
             ->page($page,$page_size)
             ->select();
         foreach ($list as &$v){
@@ -782,6 +785,7 @@ class BlindBoxTurntableGift extends Model
             ->join('vs_gift_bag_detail e','e.foreign_id = a.gift_id','left')
             ->field('a.gift_id,a.num as count,b.createtime,c.gift_name,c.base_image,d.nickname')
             ->where($where)
+            ->order('b.createtime desc')
             ->page($page,$page_size)
             ->select();
         foreach ($list as &$v){