From 53e01f61ada624afef0b18b7b0872860cb7a48a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 9 Jan 2026 19:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Ranking.php | 44 ++++++++-----------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/application/api/model/Ranking.php b/application/api/model/Ranking.php
index e839e825..19f89290 100644
--- a/application/api/model/Ranking.php
+++ b/application/api/model/Ranking.php
@@ -53,7 +53,6 @@ class Ranking extends Model
             });
             $lists = array_slice($lists, 0, 20); // 取前20名
 
-//            var_dump($lists);exit;
             if($lists){
                 $my_ranking = [];
                 foreach ($lists as $key => &$value) {
@@ -69,36 +68,18 @@ class Ranking extends Model
 
                 //自己不在前20名
                 if (!$my_ranking) {
+                    $lists_last_number = $lists[count($lists) - 1]['total'] ?? 0;
                     //获取自己的送礼记录
                     $params['user_id'] = $this->user_id;
-                    $my_ranking_data = model('GiveGiftBases')->getUserStatistics($params);
-var_dump($my_ranking_data);
+                    $my_ranking_datas = model('GiveGiftBases')->getUserStatistics($params);
 
-                    $my_ranking_data = db::name('vs_give_gift')->alias('a')
-                        ->join('user b', 'a.user_id = b.id')
-                        ->field('a.user_id,b.nickname,b.avatar,b.user_code,sum(a.total_price) * 10 as total')
-                        ->where($where)
-                        ->where('a.user_id',$this->user_id)
-                        ->page($this->page, $this->page_limit)
-                        ->select();
-
-                    $lists_last_number = $lists[count($lists) - 1]['total'] ?? 0;
-
-                    if (!isset($my_ranking_data['user_id']) || !$my_ranking_data['user_id']) {
-                        $my_ranking = db::name('user')
-                            ->field('user_code,avatar,nickname,id as user_id,user_code,sex')
-                            ->where('id',$this->user_id)->find();
-                        $my_ranking['icon'][0] = model('UserData')->user_wealth_icon($my_ranking['user_id']);//财富图标
-
-                        $my_ranking['total'] = 0;
-                        $my_ranking['rank'] = -1;
-                        $my_ranking['diff'] = numberFormat($lists_last_number);
-                    } else {
-                        $my_ranking = $my_ranking_data;
-                        $my_ranking['rank'] = -1;
-                        $my_ranking['total'] = numberFormat($my_ranking['total']);
-                        $my_ranking['diff'] = numberFormat($lists_last_number - ($my_ranking_data['total'] ?: 0));
-                    }
+                    $my_ranking['user_id'] = $my_ranking_datas['user_id'];
+                    $my_ranking['total'] = $my_ranking_datas['total_price']??0;
+                    $my_ranking['nickanme'] = db::name('user')->where('id',$value['user_id'])->value('nickname');
+                    $my_ranking['user_code'] = db::name('user')->where('id',$value['user_id'])->value('user_code');
+                    $my_ranking['avatar'] = db::name('user')->where('id',$value['user_id'])->value('avatar');
+                    $my_ranking['rank'] = -1;
+                    $my_ranking['diff'] = numberFormat($lists_last_number - ($my_ranking['total'] ?: 0));
                 }
             }else{
                 $my_ranking = db::name('user')
@@ -110,11 +91,8 @@ var_dump($my_ranking_data);
                 $my_ranking['diff'] = 0;
             }
 
-
-
-
-
-        }else{//2魅力榜
+        //2魅力榜
+        }else{
             $lists = db::name('vs_give_gift')->alias('a')
                 ->join('user b', 'a.gift_user = b.id')
                 ->field('a.gift_user as user_id,b.nickname,b.avatar,b.user_code,sum(a.total_price) * 10 as total')