arpu吸怪

Application/Admin/Controller/StatController.class.php

@@ -789,20 +789,23 @@ AND UNIX_TIMESTAMP(
 
         // 新增用户
 
-        /* M('user', 'tab_')
+        $userMap = $conditions;
+        if (isset($userMap['promote_id'])) {
+            $userMap['tab_user.promote_id'] = $userMap['promote_id'];
+            unset($userMap['promote_id']);
+        }
+        $newUsers = M('user', 'tab_')
             ->field('count(*) count, FROM_UNIXTIME(register_time, "%Y-%m-%d") date')
-            ->where([
+            ->join('tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id', 'left')
-                'game_id' => ['in', $gameIdRows], 
+            ->where(array_merge($userMap, ['register_time' => ['between', [$startTime, $endTime]]]))
-                'register_time' => ['between', [$startTime, $endTime]]
-            ])
             ->group('date')
-            ->select(); */
+            ->select();
 
-        $newUsers = M('user_play', 'tab_')
+        /* $newUsers = M('user_play', 'tab_')
             ->field('count(DISTINCT user_id) count, FROM_UNIXTIME(create_time, "%Y-%m-%d") date')
             ->where(array_merge($conditions, ['create_time' => ['between', [$startTime, $endTime]]]))
             ->group('date')
-            ->select();
+            ->select(); */
         $newUsers = index_by_column('date', $newUsers);
 
         // 活跃用户

Application/Admin/View/RechargeSum/summation.html

@@ -120,7 +120,7 @@
                     <th>渠道来源</th>
                     <?php endif;?>
                     <th>游戏名称</th>
-                    <th>新增人数</th>
+                    <th>新增账号</th>
                     <th>活跃人数</th>
                     <th>新增玩家付费</th>
                     <th>本日累计付费</th>

Application/Admin/View/Stat/userarpu.html

@@ -151,7 +151,7 @@
                     <tr>
                         <th ><a class="paixu" data-order='date'><if condition="$order eq 4 and  $orderType eq 'date'">日期▲<elseif condition="$order eq 3 and $orderType eq 'date'"/>日期▼<else />日期<img src="__IMG__/up-down.png" width="13px"></if></a></th>
                         
-                        <th ><a class="paixu" data-order='new_user'><if condition="$order eq 4 and  $orderType eq 'new_user'">新增玩家▲<elseif condition="$order eq 3 and $orderType eq 'new_user'"/>新增玩家▼<else />新增玩家<img src="__IMG__/up-down.png" width="13px"></if></a></th>
+                        <th ><a class="paixu" data-order='new_user'><if condition="$order eq 4 and  $orderType eq 'new_user'">新增账号▲<elseif condition="$order eq 3 and $orderType eq 'new_user'"/>新增账号▼<else />新增账号<img src="__IMG__/up-down.png" width="13px"></if></a></th>
 
                         <th ><a class="paixu" data-order='login_user'><if condition="$order eq 4 and  $orderType eq 'login_user'">活跃玩家▲<elseif condition="$order eq 3 and $orderType eq 'login_user'"/>活跃玩家▼<else />活跃玩家<img src="__IMG__/up-down.png" width="13px"></if></a></th>