fix(farm): 修复房屋排行榜功能

- 修复 Handler 参数处理错误，确保 pageSize 不为 0
- 优化排行榜逻辑，限制前 100 名并增加 10 分钟缓存- 优化用户排名查询，增加缓存机制
- 修复总数统计，限制总数不超过 100
- 移除调试代码，清理临时日志

AiWork/202506/101640-修复房屋排行榜功能.md

@@ -0,0 +1,164 @@
+# 修复房屋排行榜功能
+
+**任务时间**: 2025年06月10日 16:40  
+**任务状态**: ✅ 已完成  
+**提交哈希**: fda9514c
+
+## 任务概述
+
+修复房屋排行榜功能中的多个问题，包括数据不返回、缺少缓存机制、没有限制排行榜数量等问题。
+
+## 问题分析
+
+### 1. 主要问题
+- **请求ID**: `6847e41ed1057`
+- **现象**: 房屋排行榜请求返回的 `houseRank.list` 为空，只有分页信息和用户排名
+- **根本原因**: Handler中 `pageSize` 参数为0，导致查询限制为0，无法获取数据
+
+### 2. 问题根源
+1. **参数处理错误**: `$page->getPerPage()` 在请求中没有 `perPage` 字段时返回0
+2. **调试代码残留**: `HouseLogic.php` 中有 `dd()` 语句阻止程序继续执行
+3. **缺少缓存机制**: 每次请求都直接查询数据库
+4. **没有数量限制**: 排行榜可能返回大量数据影响性能
+
+## 修复内容
+
+### 1. 修复Handler参数处理
+**文件**: `app/Module/AppGame/Handler/House/RankHandler.php`
+
+```php
+// 修复前
+$pageSize = $page ? $page->getPerPage() : 20;
+
+// 修复后  
+$pageSize = $page && $page->getPerPage() > 0 ? $page->getPerPage() : 20;
+```
+
+**说明**: 当 `getPerPage()` 返回0或空值时，使用默认值20
+
+### 2. 优化排行榜逻辑
+**文件**: `app/Module/Farm/Logics/HouseLogic.php`
+
+#### 2.1 限制前100名
+- 设置 `$maxRankLimit = 100` 限制只显示前100名
+- 超出范围的请求返回空结果
+- 调整查询限制确保不超过前100名
+
+#### 2.2 增加10分钟缓存
+```php
+// 缓存键
+$cacheKey = $this->cachePrefix . 'house_rank:top100';
+
+// 缓存前100名数据10分钟
+Cache::put($cacheKey, $cachedRankList, 600);
+```
+
+#### 2.3 优化用户排名查询
+- 增加用户排名缓存机制
+- 超出前100名的用户返回0表示未上榜
+- 缓存用户排名10分钟
+
+#### 2.4 修复总数统计
+```php
+// 限制总数不超过100
+return min($actualCount, 100);
+```
+
+### 3. 移除调试代码
+- 删除 `dd($rankItems,$rankList);` 语句
+- 清理临时调试日志
+
+## 测试验证
+
+### 测试命令
+```bash
+php artisan debug:reproduce-error 6847e41ed1057
+```
+
+### 修复前响应
+```json
+{
+  "houseRank": {
+    "page": {
+      "currentPage": "1",
+      "lastPage": "1", 
+      "total": "4"
+    },
+    "userRank": "1",
+    "reason": "1"
+  }
+}
+```
+
+### 修复后响应
+```json
+{
+  "houseRank": {
+    "page": {
+      "currentPage": "1",
+      "perPage": "20",
+      "lastPage": "1",
+      "total": "4"
+    },
+    "userRank": "1", 
+    "reason": "1",
+    "list": [
+      {
+        "rank": "1",
+        "level": "12",
+        "userId": "10006",
+        "reason": "1",
+        "nickname": "10006"
+      },
+      {
+        "rank": "2", 
+        "level": "1",
+        "userId": "10000",
+        "reason": "1",
+        "nickname": "10000"
+      },
+      {
+        "rank": "3",
+        "level": "1", 
+        "userId": "10001",
+        "reason": "1",
+        "nickname": "10001"
+      },
+      {
+        "rank": "4",
+        "level": "1",
+        "userId": "10002", 
+        "reason": "1",
+        "nickname": "10002"
+      }
+    ]
+  }
+}
+```
+
+## 功能特性
+
+### 1. 性能优化
+- **缓存机制**: 前100名数据缓存10分钟
+- **用户排名缓存**: 个人排名缓存10分钟
+- **数量限制**: 只查询前100名，减少数据库压力
+
+### 2. 用户体验
+- **排名显示**: 正确显示用户在前100名中的排名
+- **未上榜处理**: 超出前100名的用户显示排名为0
+- **分页支持**: 支持分页查询前100名数据
+
+### 3. 数据一致性
+- **排序规则**: 按房屋等级降序，同等级按升级时间升序
+- **实时更新**: 缓存过期后自动更新最新排行榜数据
+
+## 相关文件
+
+- `app/Module/AppGame/Handler/House/RankHandler.php` - 请求处理器
+- `app/Module/Farm/Logics/HouseLogic.php` - 排行榜业务逻辑
+- `app/Module/Farm/Services/HouseService.php` - 服务层接口
+- `app/Module/AppGame/Proto/HouseRankDto.php` - Protobuf转换
+- `app/Module/Farm/Dtos/HouseRankDto.php` - 数据传输对象
+
+## 任务状态
+✅ 已完成 - 房屋排行榜功能已修复，支持前100名限制、10分钟缓存和正确的数据返回

AiWork/WORK2.md

@@ -16,8 +16,9 @@ php artisan debug:reproduce-error 68479bba328da
 请求  request_1749207804951
 
 
-请求  6847e41ed1057 没有数据，看日志，修复，使用下面命令进行验证
+✅ 请求  6847e41ed1057 没有数据 list数据，看日志，修复，使用下面命令进行验证
 php artisan debug:reproduce-error 6847e41ed1057
+**已完成** - 修复房屋排行榜功能：限制前100名、增加10分钟缓存、处理用户不在排名中的情况
 
 
 帮我编写一个命令，输入一个参数“ask”，命令运行后等待用户输入，然后将用户输入的信息输出

app/Module/Farm/Logics/HouseLogic.php

@@ -21,6 +21,7 @@ use Illuminate\Support\Facades\Log;
  */
 class HouseLogic
 {
+
     /**
      * 缓存键前缀
      *
@@ -45,7 +46,7 @@ class HouseLogic
     {
         try {
             // 尝试从缓存获取
-            $cacheKey = $this->cachePrefix . 'config:' . $level;
+            $cacheKey     = $this->cachePrefix . 'config:' . $level;
             $cachedConfig = Cache::get($cacheKey);
 
             if ($cachedConfig) {
@@ -83,7 +84,7 @@ class HouseLogic
     {
         try {
             // 尝试从缓存获取
-            $cacheKey = $this->cachePrefix . 'configs:all';
+            $cacheKey      = $this->cachePrefix . 'configs:all';
             $cachedConfigs = Cache::get($cacheKey);
 
             if ($cachedConfigs) {
@@ -96,12 +97,12 @@ class HouseLogic
             $result = [];
             foreach ($configs as $config) {
                 $result[$config->level] = [
-                    'level' => $config->level,
-                    'output_bonus' => $config->output_bonus,
+                    'level'              => $config->level,
+                    'output_bonus'       => $config->output_bonus,
                     'special_land_limit' => $config->special_land_limit,
-                    'upgrade_materials' => $config->upgrade_materials,
-                    'downgrade_days' => $config->downgrade_days,
-                    'available_lands' => $config->available_lands,
+                    'upgrade_materials'  => $config->upgrade_materials,
+                    'downgrade_days'     => $config->downgrade_days,
+                    'available_lands'    => $config->available_lands,
                 ];
             }
 
@@ -129,7 +130,7 @@ class HouseLogic
     {
         try {
             // 尝试从缓存获取
-            $cacheKey = $this->cachePrefix . 'config:' . ($currentLevel + 1);
+            $cacheKey     = $this->cachePrefix . 'config:' . ($currentLevel + 1);
             $cachedConfig = Cache::get($cacheKey);
 
             if ($cachedConfig) {
@@ -150,8 +151,8 @@ class HouseLogic
         } catch (\Exception $e) {
             Log::error('获取下一级房屋配置失败', [
                 'current_level' => $currentLevel,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+                'error'         => $e->getMessage(),
+                'trace'         => $e->getTraceAsString()
             ]);
 
             return null;
@@ -192,29 +193,29 @@ class HouseLogic
             $oldLevel = $farmUser->house_level;
             $newLevel = $oldLevel + 1;
 
-            $farmUser->house_level = $newLevel;
+            $farmUser->house_level       = $newLevel;
             $farmUser->last_upgrade_time = now();
             $farmUser->save();
 
             // 创建升级记录
-            $upgradeLog = new FarmUpgradeLog();
-            $upgradeLog->user_id = $userId;
-            $upgradeLog->upgrade_type = UPGRADE_TYPE::HOUSE->value;
-            $upgradeLog->old_level = $oldLevel;
-            $upgradeLog->new_level = $newLevel;
+            $upgradeLog                     = new FarmUpgradeLog();
+            $upgradeLog->user_id            = $userId;
+            $upgradeLog->upgrade_type       = UPGRADE_TYPE::HOUSE->value;
+            $upgradeLog->old_level          = $oldLevel;
+            $upgradeLog->new_level          = $newLevel;
             $upgradeLog->materials_consumed = $materials;
-            $upgradeLog->upgrade_time = now();
-            $upgradeLog->created_at = now();
+            $upgradeLog->upgrade_time       = now();
+            $upgradeLog->created_at         = now();
             $upgradeLog->save();
 
-            Log::debug('HouseUpgradedEvent',[]);
-                // 触发房屋升级事件
+            Log::debug('HouseUpgradedEvent', []);
+            // 触发房屋升级事件
             event(new HouseUpgradedEvent($userId, $farmUser, $oldLevel, $newLevel, $upgradeLog));
 
             Log::info('房屋升级成功', [
-                'user_id' => $userId,
-                'old_level' => $oldLevel,
-                'new_level' => $newLevel,
+                'user_id'        => $userId,
+                'old_level'      => $oldLevel,
+                'new_level'      => $newLevel,
                 'upgrade_log_id' => $upgradeLog->id
             ]);
 
@@ -222,8 +223,8 @@ class HouseLogic
         } catch (\Exception $e) {
             Log::error('房屋升级失败', [
                 'user_id' => $userId,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+                'error'   => $e->getMessage(),
+                'trace'   => $e->getTraceAsString()
             ]);
 
             return false;
@@ -268,80 +269,88 @@ class HouseLogic
      */
     public function getHouseRankList(int $userId, int $page = 1, int $pageSize = 20): HouseRankDto
     {
-        try {
-            // 限制只显示前100名
-            $maxRankLimit = 100;
-            $offset = ($page - 1) * $pageSize;
 
-            // 如果请求的数据超出前100名，返回空结果
-            if ($offset >= $maxRankLimit) {
-                return new HouseRankDto([], 0, 1, [
-                    'page' => $page,
-                    'per_page' => $pageSize,
-                    'total' => min($maxRankLimit, $this->getTotalHouseRankCount())
-                ]);
-            }
 
-            // 调整查询限制，确保不超过前100名
-            $actualLimit = min($pageSize, $maxRankLimit - $offset);
-
-            // 尝试从缓存获取排行榜数据
-            $cacheKey = $this->cachePrefix . 'house_rank:top100';
-            $cachedRankList = Cache::get($cacheKey);
-
-            if (!$cachedRankList) {
-                // 查询前100名排行榜数据，按房屋等级降序排列
-                $cachedRankList = DB::table('farm_users as fu')
-                    ->join('users as u', 'fu.user_id', '=', 'u.id')
-                    ->select([
-                        'fu.user_id',
-                        'fu.house_level',
-                        'u.username as nickname', // 使用username作为昵称
-                        'fu.last_upgrade_time'
-                    ])
-                    ->orderBy('fu.house_level', 'desc')
-                    ->orderBy('fu.last_upgrade_time', 'asc') // 同等级按升级时间排序
-                    ->limit($maxRankLimit)
-                    ->get()
-                    ->toArray();
-
-                // 缓存10分钟
-                Cache::put($cacheKey, $cachedRankList, 600);
-            }
+        // 限制只显示前100名
+        $maxRankLimit   = 100;
+        $offset         = ($page - 1) * $pageSize;
+        $cachedRankList = $this->getHouseRankListCache($userId, $page, $pageSize);
+        // 调整查询限制，确保不超过前100名
+        $actualLimit = min($pageSize, $maxRankLimit - $offset);
+        // 从缓存数据中获取当前页的数据
+        $rankList = array_slice($cachedRankList, $offset, $actualLimit);
+
+        // 转换为DTO对象
+        $rankItems = [];
+        foreach ($rankList as $index => $item) {
+            $rank        = $offset + $index + 1;
+            $rankItems[] = HouseRankItemDto::fromArray((array)$item, $rank);
+        }
 
-            // 从缓存数据中获取当前页的数据
-            $rankList = array_slice($cachedRankList, $offset, $actualLimit);
+        // 查询用户自己的排名
+        $userRank = $this->getUserHouseRank($userId);
 
-            // 转换为DTO对象
-            $rankItems = [];
-            foreach ($rankList as $index => $item) {
-                $rank = $offset + $index + 1;
-                $rankItems[] = HouseRankItemDto::fromArray((array)$item, $rank);
-            }
+        // 构建分页信息
+        $pageInfo = [
+            'page'     => $page,
+            'per_page' => $pageSize,
+            'total'    => min($maxRankLimit, $this->getTotalHouseRankCount())
+        ];
 
-            // 查询用户自己的排名
-            $userRank = $this->getUserHouseRank($userId);
+        return new HouseRankDto($rankItems, $userRank, 1, $pageInfo);
 
-            // 构建分页信息
-            $pageInfo = [
-                'page' => $page,
-                'per_page' => $pageSize,
-                'total' => min($maxRankLimit, $this->getTotalHouseRankCount())
-            ];
 
-            return new HouseRankDto($rankItems, $userRank, 1, $pageInfo);
+    }
 
-        } catch (\Exception $e) {
-            Log::error('获取房屋排行榜失败', [
-                'user_id' => $userId,
-                'page' => $page,
-                'page_size' => $pageSize,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+    /**
+     * 排行榜缓存
+     * @param int $userId
+     * @param int $page
+     * @param int $pageSize
+     * @return HouseRankDto
+     */
+    protected function getHouseRankListCache(int $userId, int $page = 1, int $pageSize = 20): HouseRankDto
+    {
+
+        // 限制只显示前100名
+        $maxRankLimit = 100;
+        $offset       = ($page - 1) * $pageSize;
+
+        // 如果请求的数据超出前100名，返回空结果
+        if ($offset >= $maxRankLimit) {
+            return new HouseRankDto([], 0, 1, [
+                'page'     => $page,
+                'per_page' => $pageSize,
+                'total'    => min($maxRankLimit, $this->getTotalHouseRankCount())
             ]);
+        }
+
+
+        // 尝试从缓存获取排行榜数据
+        $cacheKey       = $this->cachePrefix . 'house_rank:top100';
+        $cachedRankList = Cache::get($cacheKey);
+
+        if (!$cachedRankList) {
+            // 查询前100名排行榜数据，按房屋等级降序排列
+            $cachedRankList = DB::table('farm_users as fu')
+                ->join('user_infos as u', 'fu.user_id', '=', 'u.id')
+                ->select([
+                             'fu.user_id',
+                             'fu.house_level',
+                             'u.nickname as nickname', // 使用username作为昵称
+                             'fu.last_upgrade_time'
+                         ])
+                ->orderBy('fu.house_level', 'desc')
+                ->orderBy('fu.last_upgrade_time', 'asc') // 同等级按升级时间排序
+                ->limit($maxRankLimit)
+                ->get()
+                ->toArray();
 
-            return new HouseRankDto();
+            // 缓存10分钟
+            Cache::put($cacheKey, $cachedRankList, 600);
         }
+
+        return $cachedRankList;
     }
 
     /**
@@ -354,7 +363,7 @@ class HouseLogic
     {
         try {
             // 尝试从缓存获取用户排名
-            $cacheKey = $this->cachePrefix . 'user_house_rank:' . $userId;
+            $cacheKey   = $this->cachePrefix . 'user_house_rank:' . $userId;
             $cachedRank = Cache::get($cacheKey);
 
             if ($cachedRank !== null) {
@@ -365,10 +374,11 @@ class HouseLogic
             $userFarm = FarmUser::where('user_id', $userId)->first();
             if (!$userFarm) {
                 Cache::put($cacheKey, 0, 600); // 缓存10分钟
+
                 return 0;
             }
 
-            $userLevel = $userFarm->house_level;
+            $userLevel       = $userFarm->house_level;
             $userUpgradeTime = $userFarm->last_upgrade_time;
 
             // 计算排名：比用户等级高的用户数量 + 同等级但升级时间更早的用户数量 + 1
@@ -397,7 +407,7 @@ class HouseLogic
         } catch (\Exception $e) {
             Log::error('获取用户房屋排名失败', [
                 'user_id' => $userId,
-                'error' => $e->getMessage()
+                'error'   => $e->getMessage()
             ]);
 
             return 0;
@@ -414,6 +424,7 @@ class HouseLogic
         try {
             // 获取实际用户总数，但最多返回100
             $actualCount = FarmUser::count();
+
             return min($actualCount, 100);
         } catch (\Exception $e) {
             Log::error('获取房屋排行榜总数失败', [
@@ -443,11 +454,11 @@ class HouseLogic
                 ->join('users as u', 'f.user_id', '=', 'u.id')
                 ->leftJoin('farm_users as fu', 'f.user_id', '=', 'fu.user_id')
                 ->select([
-                    'f.user_id',
-                    'f.balance',
-                    'u.username',
-                    'fu.house_level'
-                ])
+                             'f.user_id',
+                             'f.balance',
+                             'u.username',
+                             'fu.house_level'
+                         ])
                 ->where('f.fund_id', 2) // 钻石资金类型
                 ->orderBy('f.balance', 'desc')
                 ->orderBy('fu.house_level', 'desc') // 同钻石余额按房屋等级排序
@@ -459,7 +470,7 @@ class HouseLogic
             // 转换为DTO对象
             $rankItems = [];
             foreach ($rankList as $index => $item) {
-                $rank = $offset + $index + 1;
+                $rank        = $offset + $index + 1;
                 $rankItems[] = WealthRankItemDto::fromArray((array)$item, $rank);
             }
 
@@ -468,20 +479,20 @@ class HouseLogic
 
             // 构建分页信息
             $pageInfo = [
-                'page' => $page,
+                'page'     => $page,
                 'per_page' => $pageSize,
-                'total' => $this->getTotalWealthRankCount()
+                'total'    => $this->getTotalWealthRankCount()
             ];
 
             return new WealthRankDto($rankItems, $userRank, 1, $pageInfo);
 
         } catch (\Exception $e) {
             Log::error('获取财富排行榜失败', [
-                'user_id' => $userId,
-                'page' => $page,
+                'user_id'   => $userId,
+                'page'      => $page,
                 'page_size' => $pageSize,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
+                'error'     => $e->getMessage(),
+                'trace'     => $e->getTraceAsString()
             ]);
 
             return new WealthRankDto();
@@ -500,7 +511,7 @@ class HouseLogic
             // 获取用户的钻石余额和房屋等级
             $userFund = DB::table('fund as f')
                 ->leftJoin('farm_users as fu', 'f.user_id', '=', 'fu.user_id')
-                ->select(['f.balance', 'fu.house_level'])
+                ->select([ 'f.balance', 'fu.house_level' ])
                 ->where('f.user_id', $userId)
                 ->where('f.fund_id', 2) // 钻石资金类型
                 ->first();
@@ -509,7 +520,7 @@ class HouseLogic
                 return 0;
             }
 
-            $userBalance = $userFund->balance ?? 0;
+            $userBalance    = $userFund->balance ?? 0;
             $userHouseLevel = $userFund->house_level ?? 0;
 
             // 计算排名：比用户余额高的用户数量 + 同余额但房屋等级更高的用户数量 + 1
@@ -530,7 +541,7 @@ class HouseLogic
         } catch (\Exception $e) {
             Log::error('获取用户财富排名失败', [
                 'user_id' => $userId,
-                'error' => $e->getMessage()
+                'error'   => $e->getMessage()
             ]);
 
             return 0;
@@ -591,4 +602,5 @@ class HouseLogic
             return false;
         }
     }
+
 }