diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 1b4ba9afa..695c1c244 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -1188,6 +1188,9 @@ class DownloadController extends BaseController {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
+            if(empty($gameId1)) {
+                $gameId1 = [-100];
+            }
             $map['game_id'] = ['in', $gameId1];
         }
         empty(I('server_id')) || $map['tab_pay_info.server_id'] = I('server_id');
@@ -1196,13 +1199,14 @@ class DownloadController extends BaseController {
         empty(I('extend')) || $map['tab_pay_info.extend'] = I('extend');
         empty(I('user_id')) || $map['tab_pay_info.game_player_id'] = I('user_id');
         if (!empty($begTime) && !empty($endTime)) {
-            $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) - 1]];
+            $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) +24*3600- 1]];
         }else if (empty($begTime) && !empty($endTime)) {
-            $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime)];
+            $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime) + 24*3600];
         }else if (!empty($begTime) && empty($endTime)) {
-            $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime)];
+            $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime) + 24*3600];
         }
 
+
         $conditions = json_encode($map,TRUE);           
          $addtime = time();
          $data = [
@@ -1381,6 +1385,9 @@ class DownloadController extends BaseController {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
+            if(empty($gameId1)) {
+                $gameId1 = [-100];
+            }
             $map['game_id'] = ['in', $gameId1];
             $subMap['game_id'] = ['in', $gameId1];
         }
@@ -1503,6 +1510,9 @@ class DownloadController extends BaseController {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
+            if(empty($gameId1)) {
+                $gameId1 = [-100];
+            }
             $map['game_id'] = ['in', $gameId1];
         }
         if ($serverId > 0) {
@@ -1602,6 +1612,9 @@ class DownloadController extends BaseController {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
+            if(empty($gameId1)) { 
+                $gameId1 = [-100];
+            }
             $map['game_id'] = ['in', $gameId1];
         }
         if ($serverId != 0) {
@@ -1895,14 +1908,17 @@ class DownloadController extends BaseController {
                     ->limit(($i-1)*$perSize  ,$perSize)->select();
                 foreach($data as $key => $v) {
                     $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
-                    $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find();
-                    $v['promote_id']= $promoteInfo['nickname']; 
+                    $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find();
+                    $serverId = $v['server_id'];
+                    $gameId = $v['game_id'];
+                    $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find();
+                    $v['promote_id']= $promoteInfo['account']; 
                     $csvData['extend'] = $this->encryption($v['extend']);
                     $csvData['create_time'] = $v['create_time'];
                     $csvData['user_account'] = $v['user_account'];
                     $csvData['game_name'] = $v['game_name'];
                     $csvData['promote_id'] = $v['promote_id'];
-                    $csvData['server_name'] = $v['server_name'];
+                    $csvData['server_name'] = $serverInfo['server_name'];
                     $csvData['user_id'] = $v['game_player_id'];
                     $csvData['game_player_name'] = $v['game_player_name'];
                     $csvData['price'] = $v['price'];
@@ -3162,7 +3178,7 @@ class DownloadController extends BaseController {
        unset($map['costbegin']);
        unset($map['costend']);
        $nowTime = strtotime(date('Y-m-d 00:00:00', time()));
-       $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
+       $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
         if ($costBegin != '' || $costEnd != '') {
             $having = '';
             if ($costBegin != '' && $costEnd != '') {
@@ -3180,35 +3196,43 @@ class DownloadController extends BaseController {
             $map['_string'] = 'ui.role_id in (' . $subQuery . ')';
         }
         $secondDay = 24*3600 + 1;
-        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]];
+        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
         unset($map['begintime']);
         unset($map['endtime']);
         //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
-       
-        $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
-        $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
-        $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
-        $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id';
-        $fieldLR = M('login_daily_record', 'tab_')->alias('lr')
-            ->field("count(*) as count")
-            ->where($loginRecordMap)
-            ->buildSql();
-        $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count';
-        $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
-        ->field($field)
-        ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
-        ->where($map)
-        ->group('uc.role_id,uc.server_id,uc.game_id')
-        ->buildSql();
+
+         $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
+         $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
+
+         $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
+         $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id';
+         $fieldLR = M('login_daily_record', 'tab_')->alias('lr')
+             ->field("count(*) as count")
+             ->where($loginRecordMap)
+             ->buildSql();
+         $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count';
+         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
+             ->field($field)
+             ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+             ->where($map)
+             ->group('uc.role_id,uc.server_id,uc.game_id')
+             ->buildSql();
         $roles = M()->alias('record')
             ->table($subQuery)
             ->select();
-        $total = [];
-        $total = M('user_play_data_count', 'tab_')->alias('uc')
-            ->field($fieldUC)
-            ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
-            ->where($map)
-            ->find();
+         $totalQuery = M('user_play_data_count', 'tab_')->alias('uc')
+             ->field($fieldUC)
+             ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id')
+             ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id')
+             ->where($map)
+             ->buildSql();
+         $total = M()->alias('totals')
+             ->table($totalQuery)
+             ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today')
+             ->find();
+         $userIds = array_column($roles, 'user_id');
+         $userIds = $userIds ?? [-1];
+         $users = M('user', 'tab_')->where(array('id' => ['in', $userIds]))->getField('id, account', true);
         $csvFileName = $xlsName.'.csv';
         //设置好告诉浏览器要下载excel文件的headers
         header('Content-Description: File Transfer');
@@ -3231,6 +3255,9 @@ class DownloadController extends BaseController {
                 ->limit(($i-1)*$perSize  ,$perSize)
                 ->select();
             foreach($data as $key => $value) {
+                if (empty($value['user_account']) ) {
+                    $value['user_account'] = $users[$value['user_id']] ?? '';
+                }
                 $csvData['user_account'] = empty($value['user_account']) ? '--' : encryption($value['user_account']);
                 $csvData['game_name'] = empty($value['game_name']) ? '--' :$value['game_name'];
                 $csvData['server_name'] = empty($value['server_name']) ? '--' :$value['server_name'];