From a09b6af359f01c258db04dfc7eb1f128da636a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Fri, 26 Sep 2025 17:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=A6=9C?= =?UTF-8?q?=E5=8D=95=20=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/BlindBoxTurntableGift.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index 2f6122b..ceded44 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -1191,7 +1191,10 @@ class BlindBoxTurntableGift extends Model $gift_bag_id = 13; $xlh_box = db::name('vs_gift_bag')->where('id',$gift_bag_id)->find(); $xlh_ext = json_decode($xlh_box['ext'],true); - $pan_xlh = db::name('vs_room_pan_xlh')->where(['room_id'=>$room_id])->select(); + $pan_xlh = db::name('vs_room_pan_xlh')->where(['room_id'=>$room_id]) + ->order('id desc') + ->page($page,$page_size) + ->select(); $list = []; foreach ($pan_xlh as $key=>$value){ $list[$key]['periods'] = "第".$value['periods']."期"; @@ -1200,8 +1203,8 @@ class BlindBoxTurntableGift extends Model }else{ $list[$key]['nickname'] = "无"; } - if(!empty($value['locking_gift_id'])){ - $gift_data = db::name('vs_gift')->field('gift_name,base_image')->where(['gid'=>$value['locking_gift_id']])->find(); + if(!empty($value['gift_id'])){ + $gift_data = db::name('vs_gift')->field('gift_name,base_image')->where(['gid'=>$value['gift_id']])->find(); $list[$key]['gift_name'] = 'x '.$value['num'].' '.$gift_data['gift_name']; $list[$key]['base_image'] = $gift_data['base_image']??""; }else{ @@ -1209,7 +1212,7 @@ class BlindBoxTurntableGift extends Model $list[$key]['gift_name'] = 'x 0 '.$gift_data['gift_name']; $list[$key]['base_image'] = $gift_data['base_image']??""; } - $list[$key]['createtime'] = date('Y-m-d H:i:s',$value['send_time']); + $list[$key]['createtime'] = $value['send_time'] ? date('Y-m-d H:i:s',$value['send_time']) : '' ; } return [ 'code' => 1,