1

app/process/dataReport/CreateTables.php → app/process/CreateTables.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\process\dataReport;
+namespace app\process;
 use support\think\Db;
 use Workerman\Crontab\Crontab;
 
@@ -176,34 +176,18 @@ class CreateTables
   KEY `active` (`active`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;";
 
-    protected string $game_active_day = "CREATE TABLE IF NOT EXISTS `game_active_day_{{YEAR}}` (
+    protected string $sdk_active_info = "CREATE TABLE IF NOT EXISTS `sdk_active_log_{{MONTH}}` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tdate` date NOT NULL,
   `game_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '游戏ID',
   `media_id` int(11) NOT NULL DEFAULT '0' COMMENT '媒体ID',
   `agent_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '渠道ID',
   `site_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '广告位ID',
   `auth_id` int(10) NOT NULL DEFAULT '0' COMMENT '负责人ID',
-  `reg_date` date NOT NULL COMMENT '日期',
-  `days` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '活跃天数（0当天登陆）',
-  `active_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '活跃数',
-  PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE KEY `select_index` (`reg_date`, `days`,`agent_id`,`site_id`,`game_id`) USING BTREE,
-  KEY `reg_date` (`reg_date`) USING BTREE,
-  KEY `agent_id` (`agent_id`) USING BTREE,
-  KEY `site_id` (`site_id`) USING BTREE,
-  KEY `media_id` (`media_id`) USING BTREE,
-  KEY `auth_id` (`auth_id`) USING BTREE,
-  KEY `game_id` (`game_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='活跃表';";
-
-    protected string $sdk_active_info = "CREATE TABLE IF NOT EXISTS `sdk_active_info_{{MONTH}}` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `tdate` date NOT NULL,
   `user_name` varchar(50) NOT NULL,
   `uid` int(11) NOT NULL DEFAULT '0',
-  `agent_id` int(11) NOT NULL DEFAULT '0',
-  `site_id` int(11) NOT NULL DEFAULT '0',
-  `game_id` int(11) NOT NULL DEFAULT '0',
+  `login_time` int(10) unsigned NOT NULL,
+  `reg_time` int(10) unsigned NOT NULL,
   `active` int(11) NOT NULL DEFAULT '0' COMMENT '（登录减注册的天数）',
   PRIMARY KEY (`id`),
   UNIQUE KEY `tdate_2` (`game_id`,`tdate`,`uid`),
@@ -216,6 +200,26 @@ class CreateTables
   KEY `active` (`active`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户活跃表';";
 
+    protected string $game_active_day = "CREATE TABLE IF NOT EXISTS `game_active_day_{{YEAR}}` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `game_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '游戏ID',
+  `media_id` int(11) NOT NULL DEFAULT '0' COMMENT '媒体ID',
+  `agent_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '渠道ID',
+  `site_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '广告位ID',
+  `auth_id` int(10) NOT NULL DEFAULT '0' COMMENT '负责人ID',
+  `reg_date` date NOT NULL COMMENT '日期',
+  `days` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '活跃天数（0当天登陆）',
+  `active_total` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '活跃数',
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `select_index` (`reg_date`, `days`,`agent_id`,`site_id`,`game_id`) USING BTREE,
+  KEY `reg_date` (`reg_date`) USING BTREE,
+  KEY `agent_id` (`agent_id`) USING BTREE,
+  KEY `site_id` (`site_id`) USING BTREE,
+  KEY `media_id` (`media_id`) USING BTREE,
+  KEY `auth_id` (`auth_id`) USING BTREE,
+  KEY `game_id` (`game_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='活跃表';";
+
 
     protected string $sdk_reg_log = "CREATE TABLE IF NOT EXISTS `sdk_reg_log_{{MONTH}}` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -231,15 +235,13 @@ class CreateTables
   `oaid` varchar(128) DEFAULT '' COMMENT 'oaid/cid',
   `ip` varchar(128) NOT NULL DEFAULT '',
   `vt` tinyint(4) NOT NULL DEFAULT '1' COMMENT '0:模拟器1:真机2:未知',
-  `cpu` varchar(32) DEFAULT '' COMMENT 'cpu',
   `brand` varchar(32) DEFAULT '' COMMENT '品牌',
   `model` varchar(32) DEFAULT '' COMMENT '机型',
   `system_version` varchar(32) DEFAULT '' COMMENT '系统版本',
   `sdk_version` varchar(32) DEFAULT '' COMMENT 'sdk版本',
-  `packname` varchar(64) DEFAULT '' COMMENT '包名',
-  `os` varchar(10) NOT NULL DEFAULT 'android',
+  `package_name` varchar(64) DEFAULT '' COMMENT '包名',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `user_name` (`user_name`),
+  KEY `user_name` (`user_name`),
   KEY `imei` (`imei`),
   KEY `reg_time` (`reg_time`),
   KEY `agent_id` (`agent_id`),
@@ -266,7 +268,7 @@ class CreateTables
   `model` varchar(32) DEFAULT '' COMMENT '机型',
   `system_version` varchar(32) DEFAULT '' COMMENT '系统版本',
   `sdk_version` varchar(32) DEFAULT '' COMMENT 'sdk版本',
-  `packname` varchar(64) DEFAULT '' COMMENT '包名',
+  `package_name` varchar(64) DEFAULT '' COMMENT '包名',
   PRIMARY KEY (`id`),
   KEY `user_name` (`user_name`),
   KEY `agent_id` (`agent_id`),
@@ -309,7 +311,7 @@ class CreateTables
   `tradeid` varchar(60) DEFAULT '' COMMENT '交易流水号',
   `cp_orderid` varchar(60) NOT NULL COMMENT '研发订单号',
   `ext` varchar(200) DEFAULT NULL COMMENT 'CP扩展参数',
-  `pay_channel` smallint(6) NOT NULL,
+  `pay_channel_id` smallint(6) NOT NULL COMMENT '支付渠道ID',
   `money` float NOT NULL COMMENT '面额(元)',
   `paid_amount` float unsigned NOT NULL COMMENT '净额(元)',
   `game_id` int(11) NOT NULL DEFAULT '0',
@@ -319,26 +321,27 @@ class CreateTables
   `site_id` int(11) NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL,
   `user_name` varchar(30) NOT NULL,
-  `user_ip` varchar(128) NOT NULL DEFAULT '' COMMENT '用户IP',
+  `ip` varchar(128) NOT NULL DEFAULT '' COMMENT '用户IP',
   `server_id` int(11) NOT NULL,
   `server_name` varchar(20) DEFAULT '',
   `role_id` varchar(32) DEFAULT '',
   `role_name` varchar(32) DEFAULT '',
-  `payname` varchar(50) DEFAULT '',
-  `pay_date` datetime NOT NULL COMMENT '支付时间',
+  `pay_date`  datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
   `sync_date` datetime DEFAULT NULL COMMENT '支付通知时间',
   `sync_data` text COMMENT '支付回调信息',
-  `sync_result` varchar(200) DEFAULT '' COMMENT '第三方支付返回值',
+  `sync_result` text COMMENT '第三方支付返回值',
   `sync_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '支付回调状态 0未支付, 1已支付, 2异常回调',
   `send_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '发货状态 0未发货, 1已发货',
   `other_data` varchar(1000) DEFAULT '' COMMENT '其他数据',
   `imei` varchar(64) DEFAULT '' COMMENT 'imei/idfa',
   `oaid` varchar(128) DEFAULT '' COMMENT 'oaid/cid',
+  `brand` varchar(32) DEFAULT '' COMMENT '品牌',
   `model` varchar(32) DEFAULT '' COMMENT '手机型号',
   `system_version` varchar(32) DEFAULT '' COMMENT '系统版本',
   `sdk_version` varchar(32) DEFAULT '' COMMENT 'SDK版本',
   `product_id` varchar(64) DEFAULT NULL COMMENT '充值商品ID',
   `product_name` varchar(64) DEFAULT NULL COMMENT '充值商品名',
+  `package_name` varchar(64) DEFAULT NULL COMMENT '包名',
   PRIMARY KEY (`id`),
   UNIQUE KEY `orderid` (`orderid`),
   KEY `uid` (`uid`),

app/v1/logic/tool/BasicLoginTotalLogic.php

@@ -81,7 +81,7 @@ class BasicLoginTotalLogic
 
     protected function loginTotalByGame()
     {
-        $table = "sdk_active_info_" . date('Ym', strtotime($this->date));
+        $table = "sdk_active_log_" . date('Ym', strtotime($this->date));
         $filed = "{$this->group}, count(distinct uid) as login_count";
 
         $where = [

app/v1/logic/tool/GameTotalMonthLogic.php

@@ -89,7 +89,7 @@ class GameTotalMonthLogic
 
     protected function loginMonth()
     {
-        $tb = "sdk_active_info_" . date('Ym', strtotime($this->month)); // 按天去重
+        $tb = "sdk_active_log_" . date('Ym', strtotime($this->month)); // 按天去重
         $filed = "{$this->group}, count(distinct uid) as login_total";
 
         $result = Db::connect('db_game_log')->table($tb)->field($filed)->group($this->group)->select();

config/process.php

@@ -60,7 +60,7 @@ return [
         ]
     ],
     'create_tables' => [
-        'handler' => \app\process\dataReport\CreateTables::class,
+        'handler' => \app\process\CreateTables::class,
     ],
     'game_active' => [
         'handler' => \app\process\dataReport\GameActive::class,