数据查询与显示

app/process/CreateTables.php

@@ -238,6 +238,7 @@ class CreateTables
   `imei` varchar(64) DEFAULT '' COMMENT 'imei/idfa',
   `oaid` varchar(128) DEFAULT '' COMMENT 'oaid/cid',
   `ip` varchar(128) NOT NULL DEFAULT '',
+  `ip_location` varchar(128) NOT NULL DEFAULT '',
   `vt` tinyint(4) NOT NULL DEFAULT '1' COMMENT '0:模拟器1:真机2:未知',
   `brand` varchar(32) DEFAULT '' COMMENT '品牌',
   `model` varchar(32) DEFAULT '' COMMENT '机型',

app/v1/logic/dataReport/AnalyseLogic.php

@@ -79,7 +79,7 @@ class AnalyseLogic extends BaseLogic
         $params = $this->searchByAuth($params);
         $regDate = $params['tdate'];
         $params['tdate'] = [$params['tdate'], $params['tdate']];
-        $field = "SUM(role_create_user) AS role_create_user, tdate,game_id,thour";
+        $field = "SUM(reg_total) AS reg_total, tdate,game_id,thour";
 
         // 将$regDate转化为年月格式，如202509
         $ym = date('Ym', strtotime($regDate));
@@ -92,8 +92,8 @@ class AnalyseLogic extends BaseLogic
         foreach ($baseData as &$row) {
             $game_id = $row['game_id'];
             $thour = $row['thour'];
-            $data[$game_id]['h' . $thour] = $row['role_create_user'];
-            $data[$game_id]['total'] = !empty($data[$game_id]['total']) ? $data[$game_id]['total'] + $row['role_create_user'] : $row['role_create_user'];
+            $data[$game_id]['h' . $thour] = $row['reg_total'];
+            $data[$game_id]['total'] = !empty($data[$game_id]['total']) ? $data[$game_id]['total'] + $row['reg_total'] : $row['reg_total'];
             $data[$game_id]['game_id'] = $game_id;
         }
 
@@ -136,7 +136,6 @@ class AnalyseLogic extends BaseLogic
         $baseData = $this->generateUnionList('base_total_day', $yearRange, $whereRaw, $baseField, 'game_id,tdate');
         $baseData = array_column($baseData, null, 'tdate');
 
-
         // 2. 查询每天的活跃数，根据注册时间，游戏，留存天数
         $activeWhereSql = str_replace("tdate", "reg_date", $whereRaw);
         if (!empty($params['days'])) {
@@ -427,14 +426,17 @@ class AnalyseLogic extends BaseLogic
         // 计算今日，所有游戏总充值
         $totalRow = [
             'game_id' => '合计',
+            'yestoday_pay_total' => 0,
+            'pay_total' => 0,
+            'week_pay_total' => 0,
         ];
 
         $allTotal = 0;
         $data = [];
         foreach ($baseData as &$row) {
+            $gameId = $row['game_id'];
             // 查询日期数据
             if ($row['tdate'] == $tdate) {
-                $gameId = $row['game_id'];
                 $data[$gameId]['game_id'] = $gameId;
                 $data[$gameId]['login_total'] = $row['login_total']; // DAU
                 $data[$gameId]['pay_total'] = $row['pay_total'] ?? 0; // 今日充值
@@ -449,18 +451,17 @@ class AnalyseLogic extends BaseLogic
                 $totalRow['login_total'] = !empty($totalRow['login_total']) ? $totalRow['login_total'] + $row['login_total'] : $row['login_total']; // 今日登陆人数
             }
             // 查询昨天数据
+            $data[$gameId]['yestoday_pay_total'] = 0;
             if ($row['tdate'] == $ldate) {
-                $gameId = $row['game_id'];
                 $data[$gameId]['yestoday_pay_total'] = $row['pay_total'] ?? 0; // 昨日充值
                 $totalRow['yestoday_pay_total'] = !empty($totalRow['yestoday_pay_total']) ? $totalRow['yestoday_pay_total'] + $row['pay_total'] : $row['pay_total']; // 昨日充值
-
             }
+
             // 查询7天前数据
+            $data[$gameId]['week_pay_total'] = 0;
             if ($row['tdate'] == $wdate) {
-                $gameId = $row['game_id'];
                 $data[$gameId]['week_pay_total'] = $row['pay_total'] ?? 0; // 7天前充值
                 $totalRow['week_pay_total'] = !empty($totalRow['week_pay_total']) ? $totalRow['week_pay_total'] + $row['pay_total'] : $row['pay_total']; // 7天前充值
-
             }
         }
 

app/v1/logic/dataReport/ChannelAnalysisLogic.php

@@ -555,9 +555,6 @@ class ChannelAnalysisLogic extends BaseLogic
             $params['media_id'] = $mediaData[0]['id'] ?? 0;
         }
 
-        if (empty($params['agent_id'])) {
-            $params['agent_id'] = 0;
-        }
         $groupBy = 'auth_id,media_id,agent_id,site_id';
         $whereRaw = $this->getCommonWhereRaw($params);
 
@@ -599,7 +596,6 @@ class ChannelAnalysisLogic extends BaseLogic
 
         $regPayData = array_column($regPayData, null, 'site_id');
 
-
         // 拼装数据
         foreach ($baseTotalDayData as $key => &$row) {
 
@@ -685,9 +681,6 @@ class ChannelAnalysisLogic extends BaseLogic
             $params['media_id'] = $mediaData[0]['id'] ?? 0;
         }
 
-        if (empty($params['agent_id'])) {
-            $params['agent_id'] = 0;
-        }
         $whereRaw = $this->getCommonWhereRaw($params);
 
         // 1. 消耗表. 获取消耗金额