Merge commit '5c16c44647b5edc44852d40ea0683e41ecbf8a3d' into dev

app/process/CreateTables.php

@@ -359,7 +359,7 @@ class CreateTables
   `server_name` varchar(20) DEFAULT '',
   `role_id` varchar(32) DEFAULT '',
   `role_name` varchar(32) DEFAULT '',
-  `reg_date`  datetime DEFAULT CURRENT_TIMESTAMP COMMENT '注册时间',
+  `reg_date`  datetime DEFAULT NULL COMMENT '注册时间',
   `pay_date`  datetime DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间',
   `sync_date` datetime DEFAULT NULL COMMENT '支付通知时间',
   `sync_data` text COMMENT '支付回调信息',
@@ -373,6 +373,7 @@ class CreateTables
   `model` varchar(32) DEFAULT '' COMMENT '手机型号',
   `system_version` varchar(32) DEFAULT '' COMMENT '系统版本',
   `sdk_version` varchar(32) DEFAULT '' COMMENT 'SDK版本',
+  `app_version` varchar(32) DEFAULT '' COMMENT '游戏版本',
   `product_id` varchar(64) DEFAULT NULL COMMENT '充值商品ID',
   `product_name` varchar(64) DEFAULT NULL COMMENT '充值商品名',
   `package_name` varchar(64) DEFAULT NULL COMMENT '包名',

app/v1/logic/advert/AgentSiteLogic.php

@@ -379,7 +379,7 @@ class AgentSiteLogic extends BaseLogic
         } else if($media_info && ($game['os'] ==3 || $game['os'] ==4)){
             $clickUrl = $media_info['xyxurl'];
             // 小游戏路径参数
-            $wxgamepro ="?media_id=".$siteInfo."&ext_channel=".$media_info['channel_name'].$media_info['appleturl'];
+            $wxgamepro ="?track_id=".$siteInfo."&ext_channel=".$media_info['channel_name'].$media_info['appleturl'];
         }
         $clickUrl = str_replace('__SITE__', $siteInfo, $clickUrl);
 

app/v1/logic/customer/RoleDataLogic.php

@@ -42,7 +42,7 @@ class RoleDataLogic extends BaseLogic
         $data = array_map(function ($item) use ($main_id_arr) {
 
             // 最后登录时间
-            $item['login_time'] = Db::connect('db_origin')->table('agent_reg_' . $item['uid'] % 5)->where('main_id', $main_id_arr[$item['game_id']])->where('uid', $item['uid'])->value('login_time');
+            $item['login_time'] = Db::connect('db_origin')->table('agent_reg_' . $item['uid'] % 10)->where('main_id', $main_id_arr[$item['game_id']])->where('uid', $item['uid'])->value('login_time');
             $item['login_time'] = date('Y-m-d H:i:s', $item['login_time']);
             // 支付记录
             $pay_data = Db::connect('db_game_log')->table('sdk_order_success')->where('game_id', $item['game_id'])->where('uid', $item['uid'])->where('role_id', $item['role_id'])->order('pay_date', 'desc');

app/v1/logic/dataReport/AnalyseLogic.php

@@ -469,14 +469,12 @@ class AnalyseLogic extends BaseLogic
         $totalRow['pay_increase_yestoday'] = $totalRow['pay_total'] - $totalRow['yestoday_pay_total']; // 昨日增长
         $totalRow['pay_increase_week'] = $totalRow['pay_total'] - $totalRow['week_pay_total']; // 7天增长
 
-        foreach ($data as &$row) {
-
+        if($data)foreach ($data as &$row) {
             $row['pay_ratio'] = getPercent($row['pay_total'], $allTotal); // 今日充值占比
             $row['pay_increase_yestoday'] = $row['pay_total'] - $row['yestoday_pay_total']; // 昨日增长
             $row['pay_increase_week'] = $row['pay_total'] - $row['week_pay_total']; // 7天增长
         }
 
-
         return [
             'data' => array_values($data),
             'totalRow' => $totalRow