推广平台->数据管理->每日概况|数据汇总--更新

Application/Base/Repository/UserRepository.class.php

@@ -135,7 +135,7 @@ class UserRepository
         $conditions = $this->getDayGroupConditions($params);
         $subQuery = M('login_daily_record', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
             ->where($conditions)
-            ->group('game_id')
+            ->group('day,game_id')
             ->buildSql();
         $items = M()->field('*,sum(count) as count')
             ->table($subQuery)
@@ -301,7 +301,7 @@ class UserRepository
 
         $subQuery = M('user_play_info', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
             ->where($conditions)
-            ->group('game_id')
+            ->group('day,game_id')
             ->buildSql();
         $items = M()->field('*,sum(count) as count')
             ->table($subQuery)
@@ -358,7 +358,7 @@ class UserRepository
             ->count();
         $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
             ->where($conditions)
-            ->group('game_id')
+            ->group('day,game_id')
             ->buildSql();
         $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
             ->table($subQuery)
@@ -427,7 +427,7 @@ class UserRepository
             ->count();
         $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT create_device_number) as count')
             ->where($conditions)
-            ->group('game_id')
+            ->group('day,game_id')
             ->buildSql();
         $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
             ->table($subQuery)
@@ -496,7 +496,7 @@ class UserRepository
             ->count();
         $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT create_ip) as count')
             ->where($conditions)
-            ->group('game_id')
+            ->group('day,game_id')
             ->buildSql();
         $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
             ->table($subQuery)

Application/Home/Controller/QueryController.class.php

@@ -1066,7 +1066,7 @@ class QueryController extends BaseController
             $params['server_id'] = $serverId;
         }
         $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime;
+        $params['end_time'] = $endTime - 1;
 
         $summaryData = [];
         $dayList = $this->getDayList($begTime, $endTime);
@@ -1227,7 +1227,7 @@ class QueryController extends BaseController
         }
 
         $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime;
+        $params['end_time'] = $endTime - 1;
 
         $data = M('Apply', 'tab_')->alias('a')
             ->field('a.game_id,a.game_name,a.sdk_version')