From 92a45314d88e4d747d9c32f4845f9db086c18c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sat, 30 Aug 2025 16:26:39 +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.-=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/model/BlindBoxTurntableGift.php       | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index d891872..5ce5d9e 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -592,7 +592,9 @@ class BlindBoxTurntableGift extends Model
                     'user_id' => $user_id,
                     'gift_id'=>$gift_bag_detail['foreign_id'],
                     'gift_price'=>$gift['gift_price'],
-                    'is_public_screen'=>$gift['is_public_screen'],
+                    'gift_name'=>$gift['gift_name'],
+                    'gift_base_image'=>$gift['base_image'],
+
                 ];
             }
             $reslut_data = [];
@@ -602,12 +604,15 @@ class BlindBoxTurntableGift extends Model
                     $reslut_data[$gift_id] = [
                         'gift_id' => $gift_id,
                         'gift_price'=>$value['gift_price'],
+                        'gift_name'=>$value['gift_name'],
+                        'gift_base_image'=>$value['gift_base_image'],
                         'count' => 1
                     ];
                 }else {
                     $reslut_data[$gift_id]['count']++;
                 }
             }
+            $result_list = [];
             foreach ($reslut_data as $key => $value) {
                 //处理礼包发放记录表
                 $data = [];
@@ -626,6 +631,13 @@ class BlindBoxTurntableGift extends Model
                     db::rollback();
                     return ['code' => 0, 'msg' => '失败,', 'data' => []];
                 }
+                $result_list[]=[
+                    'gift_id'=>$value['gift_id'],
+                    'gift_name'=>$value['gift_name'],
+                    'gift_base_image' =>$value['gift_base_image'],
+                    'gift_price'=>$value['gift_price'],
+                    'count'=>$value['count'],
+                ];
             }
             // 添加活动记录
             $reslut = Db::name('vs_activities_receive')->insert([
@@ -654,7 +666,11 @@ class BlindBoxTurntableGift extends Model
             //聊天室推送系统消息
             model('Chat')->sendMsg(1057,$room_id,$text);
         }
-        return ['code' => 1, 'msg' => '成功', 'data' => $result_data];
+        //返回结果排序
+        usort($result_list, function($a, $b) {
+            return $b['gift_price'] <=> $a['gift_price'];
+        });
+        return ['code' => 1, 'msg' => '成功', 'data' => $result_list];
     }
 
     /*