Przeglądaj źródła

Merge branch 'master' of e.coding.net:g-ueau9359/kku/kku_laravel

* 'master' of e.coding.net:g-ueau9359/kku/kku_laravel:
  refactor(Game): 移除日志收集命令中的冗余代码- 删除了 CollectUserLogsCommand 类中多个未使用的私有方法- 清理了冗余的代码结构,简化了命令逻辑- 保留了核心的日志收集功能,提高了代码的可读性和维护性
AI Assistant 6 miesięcy temu
rodzic
commit
d57475ebb5
1 zmienionych plików z 10 dodań i 49 usunięć
  1. 10 49
      app/Module/AppGame/Handler/Promotion/InfoHandler.php

+ 10 - 49
app/Module/AppGame/Handler/Promotion/InfoHandler.php

@@ -66,10 +66,10 @@ class InfoHandler extends BaseHandler
 
             // 获取推广关系统计
             $referralStats = UrsReferralService::getReferralStats($ursUserId);
-            
+
             // 获取今日统计数据
             $todayStats = $this->getTodayStats($ursUserId);
-            
+
             // 获取活跃用户统计
             $activeStats = $this->getActiveStats($ursUserId);
 
@@ -109,7 +109,7 @@ class InfoHandler extends BaseHandler
                 'error' => $e->getMessage(),
                 'trace' => $e->getTraceAsString()
             ]);
-            
+
             // 发生错误时返回空数据
             return $this->setEmptyResponse($response);
         }
@@ -172,10 +172,10 @@ class InfoHandler extends BaseHandler
     {
         try {
             $teamMembers = UrsReferralService::getTeamMembers($ursUserId);
-            
+
             $directNewCount = 0;
             $teamNewCount = 0;
-            
+
             // 统计今日新增的直推用户
             if (!empty($teamMembers[1])) {
                 foreach ($teamMembers[1] as $directMember) {
@@ -183,7 +183,7 @@ class InfoHandler extends BaseHandler
                     if ($farmUserId) {
                         // 检查用户映射创建时间是否为今日
                         $mapping = UrsUserMappingService::getMappingDetail($directMember);
-                        if ($mapping && $mapping->mappingTime && 
+                        if ($mapping && $mapping->mappingTime &&
                             Carbon::parse($mapping->mappingTime)->isToday()) {
                             $directNewCount++;
                             $teamNewCount++;
@@ -191,7 +191,7 @@ class InfoHandler extends BaseHandler
                     }
                 }
             }
-            
+
             // 统计今日新增的间推和三推用户
             foreach ([2, 3] as $level) {
                 if (!empty($teamMembers[$level])) {
@@ -199,7 +199,7 @@ class InfoHandler extends BaseHandler
                         $farmUserId = UrsUserMappingService::getFarmUserId($member);
                         if ($farmUserId) {
                             $mapping = UrsUserMappingService::getMappingDetail($member);
-                            if ($mapping && $mapping->mappingTime && 
+                            if ($mapping && $mapping->mappingTime &&
                                 Carbon::parse($mapping->mappingTime)->isToday()) {
                                 $teamNewCount++;
                             }
@@ -207,12 +207,12 @@ class InfoHandler extends BaseHandler
                     }
                 }
             }
-            
+
             return [
                 'direct_new_count' => $directNewCount,
                 'team_new_count' => $teamNewCount
             ];
-            
+
         } catch (\Exception $e) {
             Log::error('获取今日统计数据失败', [
                 'urs_user_id' => $ursUserId,
@@ -375,46 +375,7 @@ class InfoHandler extends BaseHandler
                 REWARD_SOURCE_TYPE::URSPROMOTION_LEVEL->value,
             ];
 
-            // 1. 从奖励日志表中统计物品奖励
-            $rewardQuery = GameRewardLog::where('user_id', $farmUserId)
-                ->whereIn('source_type', $ursPromotionSourceTypes);
-
-            if ($startDate) {
-                $rewardQuery->where('created_at', '>=', $startDate);
-            }
-            if ($endDate) {
-                $rewardQuery->where('created_at', '<=', $endDate);
-            }
-
-            $rewardLogs = $rewardQuery->get();
 
-            foreach ($rewardLogs as $log) {
-                $stats['total_count']++;
-
-                // 解析奖励物品
-                $rewardItems = is_array($log->reward_items) ? $log->reward_items : (json_decode($log->reward_items, true) ?? []);
-
-                foreach ($rewardItems as $item) {
-                    $itemId = $item['target_id'] ?? 0;
-                    $quantity = $item['quantity'] ?? 1;
-
-                    if ($itemId > 0) {
-                        // 累加相同物品的数量
-                        if (isset($stats['items'][$itemId])) {
-                            $stats['items'][$itemId] += $quantity;
-                        } else {
-                            $stats['items'][$itemId] = $quantity;
-                        }
-                    }
-                }
-
-                // 按来源类型统计
-                $sourceType = $log->source_type;
-                if (!isset($stats['by_source_type'][$sourceType])) {
-                    $stats['by_source_type'][$sourceType] = ['amount' => 0, 'count' => 0];
-                }
-                $stats['by_source_type'][$sourceType]['count']++;
-            }
 
             // 1.1. 从物品交易日志表中统计URS推广奖励(补充查询)
             $itemQuery = \App\Module\GameItems\Models\ItemTransactionLog::where('user_id', $farmUserId)