diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php index e3ad78ade..2598a165f 100644 --- a/Application/Base/Repository/UserRepository.class.php +++ b/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) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index b1daad232..dac68565b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1855,7 +1855,7 @@ class DownloadController extends BaseController { $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $params['begin_time'] = $begTime; - $params['end_time'] = $endTime; + $params['end_time'] = $endTime -1; if(!empty($map['apply_time'][1])) { $begTime = $map['apply_time'][1][0]; $endTime = $map['apply_time'][1][1]; @@ -2560,23 +2560,23 @@ class DownloadController extends BaseController { } public function dailysummaryExcelInfo($id,$map) { - $xlsName = "每日概况"; - $xlsCell = array( + $xlsName = "每日概况"; + $xlsCell = array( array('day','日期'), - array('role_num','创角数'), - array('user_num','创角用户'), + array('role_num','创角数'), + array('user_num','创角用户'), array('new_user_num','新创角用户'), array('new_device_num','新创角设备'), - array('new_ip_num','新增创角IP'), - array('login_user_num','登陆用户数'), - array('spend_user_num','充值人数'), - array('spend_num','充值次数'), - array('spend_all_amount','充值总额'), - array('spend_cash','现金充值'), - array('spend_generic','通用币充值'), - array('spend_binding','绑定币充值'), - array('spend_discount','折扣币充值'), - array('spend_voucher','代金劵使用'), + array('new_ip_num','新增创角IP'), + array('login_user_num','登陆用户数'), + array('spend_user_num','充值人数'), + array('spend_num','充值次数'), + array('spend_all_amount','充值总额'), + array('spend_cash','现金充值'), + array('spend_generic','通用币充值'), + array('spend_binding','绑定币充值'), + array('spend_discount','折扣币充值'), + array('spend_voucher','代金劵使用'), ); $nowTime = date('Y-m-d'); @@ -2603,7 +2603,7 @@ class DownloadController extends BaseController { if(!empty($map['end_time'])) { $params['end_time'] = $map['end_time']; }else { - $params['begin_time'] = $endTime; + $params['begin_time'] = $endTime - 1; } $params['dayList'] = $map["dayList"]; $summaryData = []; diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index be50a7529..c4d6fa044 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/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') diff --git a/Application/Media/View/default/Index/hezuo.html b/Application/Media/View/default/Index/hezuo.html index 1b4a8e978..54afc010c 100644 --- a/Application/Media/View/default/Index/hezuo.html +++ b/Application/Media/View/default/Index/hezuo.html @@ -8,7 +8,7 @@
-