From b3a1df90880c503b987ecd7498a8d2928d4cf846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 26 Sep 2025 17:06:48 +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/adminapi/controller/Decorate.php  |  4 ++-
 .../api/controller/BlindBoxTurntable.php      | 11 ++++++
 .../api/model/BlindBoxTurntableGift.php       | 36 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php
index 0c1d5d0..a036065 100644
--- a/application/adminapi/controller/Decorate.php
+++ b/application/adminapi/controller/Decorate.php
@@ -327,6 +327,7 @@ class Decorate extends adminApi
         $type = input('type', '');
         $where = [];
         if($user_id!=""){
+            $user_id = db::name('user')->where('user_code', $user_id)->value('id');
             $where['user_id'] = $user_id;
         }
         if($did!=""){
@@ -340,7 +341,8 @@ class Decorate extends adminApi
         $return_list = [];
         foreach ($lists as $k=>$v){
             $return_list[$k]['id'] = $v['udid'];
-            $return_list[$k]['user_name'] = $v['user_id']."-".db::name('user')->where(['id'=>$v['user_id']])->value('nickname');
+            $user_data = db::name('user')->where(['id'=>$v['user_id']])->find();
+            $return_list[$k]['user_name'] = $user_data['user_code']."-".db::name('user')->where(['id'=>$v['user_id']])->value('nickname');
             $return_list[$k]['type'] = model('api/Decorate')->TypeArray[$v['type']];
             if($v['type'] >= 6){
                 $return_list[$k]['name'] = $v['special_num'];
diff --git a/application/api/controller/BlindBoxTurntable.php b/application/api/controller/BlindBoxTurntable.php
index 109eff0..d37b54f 100644
--- a/application/api/controller/BlindBoxTurntable.php
+++ b/application/api/controller/BlindBoxTurntable.php
@@ -116,4 +116,15 @@ class BlindBoxTurntable extends BaseCom
         $reslut = model('BlindBoxTurntableGift')->xlh_ranking($room_id,$page,$page_size);
         return v($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+    /*
+     * 巡乐会榜单 (以期数显示)
+     */
+    public function get_xlh_ranking(){
+        $page = input('page',1);
+        $page_size = input('page_size',12);
+        $room_id = input('room_id',0);
+        $reslut = model('BlindBoxTurntableGift')->xlh_ranking_list($room_id,$page,$page_size);
+        return v($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
 }
\ No newline at end of file
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 0580107..2f6122b 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -1182,4 +1182,40 @@ class BlindBoxTurntableGift extends Model
             'end_time'=>$xlh_data['end_time'] ?? 0,
         ];
     }
+
+    /*
+     * 巡乐会榜单
+     *
+     */
+    public function xlh_ranking_list($room_id,$page=1,$page_size=12){
+        $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();
+        $list = [];
+        foreach ($pan_xlh as $key=>$value){
+            $list[$key]['periods'] = "第".$value['periods']."期";
+            if(!empty($value['user_id'])){
+                $list[$key]['nickname'] = db::name('user')->where(['id'=>$value['user_id']])->value('nickname');
+            }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();
+                $list[$key]['gift_name'] = 'x '.$value['num'].' '.$gift_data['gift_name'];
+                $list[$key]['base_image'] = $gift_data['base_image']??"";
+            }else{
+                $gift_data = db::name('vs_gift')->field('gift_name,base_image')->where(['gid'=>$xlh_ext['locking_condition']['locking_gift_id']])->find();
+                $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']);
+        }
+        return [
+            'code' => 1,
+            'msg' => '成功',
+            'data' => $list
+        ];
+    }
+
 }