建表

app/process/CreateTables.php

@@ -263,6 +263,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 '机型',
@@ -288,6 +289,7 @@ class CreateTables
   `site_id` int(10) unsigned NOT NULL DEFAULT '1000' COMMENT '广告位id',
   `auth_id` int(11) NOT NULL DEFAULT '0' COMMENT '负责人ID',
   `ip` varchar(128) NOT NULL DEFAULT '',
+  `ip_location` varchar(128) NOT NULL DEFAULT '',
   `login_time` int(10) unsigned NOT NULL,
   `reg_time` int(10) unsigned NOT NULL,
   `imei` varchar(64) DEFAULT '' COMMENT 'imei/idfa',

app/v1/logic/dataReport/AnalyseLogic.php

@@ -332,14 +332,14 @@ class AnalyseLogic extends BaseLogic
         echo $whereSql;
         // 基础汇总信息
         $field = "
-      SUM(login_total) AS login_total,  -- 登陆总数
-      SUM(reg_total) AS reg_total, -- 注册总数
-      SUM(pay_total) AS pay_total, -- 付费总数
-      SUM(pay_num) AS pay_num, -- 付费人数
-      SUM(reg_login_total) AS reg_login_total, -- 注册登陆总数
-      SUM(reg_pay_num) AS reg_pay_num, -- 注册付费数
-      SUM(reg_pay_total) AS reg_pay_total, -- 注册付费金额
-      SUM(old_login_total) AS old_login_total, -- 老用户登陆总数
+      SUM(login_total) AS login_total,  
+      SUM(reg_total) AS reg_total, 
+      SUM(pay_total) AS pay_total, 
+      SUM(pay_num) AS pay_num, 
+      SUM(reg_login_total) AS reg_login_total, 
+      SUM(reg_pay_num) AS reg_pay_num, 
+      SUM(reg_pay_total) AS reg_pay_total, 
+      SUM(old_login_total) AS old_login_total, 
       tdate";
         $baseData = $this->generateYearUnionList('base_total_day_', $where['reg_date'], $whereSql, $field, 'tdate');
 
@@ -414,14 +414,14 @@ class AnalyseLogic extends BaseLogic
         $whereSql = $this->generateWhereSql($params);
         // 基础汇总信息
         $field = "
-      SUM(login_total) AS login_total,  -- 登陆总数
-      SUM(reg_total) AS reg_total, -- 注册总数
-      SUM(pay_total) AS pay_total, -- 付费总数
-      SUM(pay_num) AS pay_num, -- 付费人数
-      SUM(reg_login_total) AS reg_login_total, -- 注册登陆总数
-      SUM(reg_pay_num) AS reg_pay_num, -- 注册付费数
-      SUM(reg_pay_total) AS reg_pay_total, -- 注册付费金额
-      SUM(old_login_total) AS old_login_total, -- 老用户登陆总数
+      SUM(login_total) AS login_total,
+      SUM(reg_total) AS reg_total,
+      SUM(pay_total) AS pay_total,
+      SUM(pay_num) AS pay_num,
+      SUM(reg_login_total) AS reg_login_total,
+      SUM(reg_pay_num) AS reg_pay_num,
+      SUM(reg_pay_total) AS reg_pay_total,
+      SUM(old_login_total) AS old_login_total,
       date_format(`tdate`, '%Y-%m') AS mdate";
         $baseData = $this->generateYearUnionList('base_total_day_', $where['reg_date'], $whereSql, $field, 'mdate');
 
@@ -502,9 +502,9 @@ class AnalyseLogic extends BaseLogic
 
 
         $field = "
-      SUM(pay_total) AS pay_total, -- 付费金额
-      SUM(pay_num) AS pay_num, -- 付费人数
-      SUM(login_total) AS login_total, -- 登陆总数
+      SUM(pay_total) AS pay_total, 
+      SUM(pay_num) AS pay_num, 
+      SUM(login_total) AS login_total, 
       game_id,
       tdate";
 
@@ -615,8 +615,8 @@ class AnalyseLogic extends BaseLogic
         // 1. 根据注册时间，获取注册付费人数
         $payData = Db::connect('db_game_log')->query("
         SELECT 
-          SUBSTRING(reg_date,1,10) as dimension,  -- 注册日期
-          COUNT(DISTINCT uid) as pay_num  -- 注册付费人数
+          SUBSTRING(reg_date,1,10) as dimension, 
+          COUNT(DISTINCT uid) as pay_num 
         FROM sdk_order_success
           WHERE {$whereRaw} AND reg_date BETWEEN '{$params['reg_date'][0]} 00:00:00' AND '{$params['reg_date'][1]} 23:59:59'
             GROUP BY 
@@ -631,10 +631,10 @@ class AnalyseLogic extends BaseLogic
         foreach ($tableNames as $tableName) {
             $sqlArr[] = "
           SELECT  
-            CONCAT(FROM_UNIXTIME(reg_time, '%Y-%m-%d'), '|', TIMESTAMPDIFF(DAY, FROM_UNIXTIME(reg_time), FROM_UNIXTIME(login_time))) AS dimension, -- 注册日期|留存天数
-            FROM_UNIXTIME(reg_time, '%Y-%m-%d') AS reg_date, -- 注册日期
-            TIMESTAMPDIFF(DAY, FROM_UNIXTIME(reg_time), FROM_UNIXTIME(login_time)) AS day_num, -- 留存天数
-            COUNT(DISTINCT a.user_name) AS remain_num -- 留存人数
+            CONCAT(FROM_UNIXTIME(reg_time, '%Y-%m-%d'), '|', TIMESTAMPDIFF(DAY, FROM_UNIXTIME(reg_time), FROM_UNIXTIME(login_time))) AS dimension,
+            FROM_UNIXTIME(reg_time, '%Y-%m-%d') AS reg_date,
+            TIMESTAMPDIFF(DAY, FROM_UNIXTIME(reg_time), FROM_UNIXTIME(login_time)) AS day_num,
+            COUNT(DISTINCT a.user_name) AS remain_num
           FROM {$tableName} AS a
             INNER JOIN (
               SELECT 
@@ -725,9 +725,9 @@ class AnalyseLogic extends BaseLogic
             $data2Res = [];
 
             $field = "
-          SUM(reg_total) as reg, -- 注册人数
-          SUM(old_login_total) as login, -- 老用户登陆人数
-          SUM(pay_total) as pay, -- 付费金额
+          SUM(reg_total) as reg,
+          SUM(old_login_total) as login,
+          SUM(pay_total) as pay,
           tdate
         ";
 
@@ -852,10 +852,10 @@ class AnalyseLogic extends BaseLogic
             $data2Res = [];
 
             $field = "
-          SUM(reg_total) as reg, -- 注册人数
-          SUM(old_login_total) as login, -- 老用户登陆人数
-          SUM(pay_total) as pay, -- 付费金额
-          SUM(cost) as cost, -- 消耗金额
+          SUM(reg_total) as reg,
+          SUM(old_login_total) as login,
+          SUM(pay_total) as pay,
+          SUM(cost) as cost,
           thour
         ";