diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1f632a097..276ed56b0 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1909,16 +1909,26 @@ class DownloadController extends BaseController { foreach($data as $key => $v) { $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); $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(); + if($v['server_id'] != 0) { + $serverId1 = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); + $servername = $serverInfo['server_name']; + }else { + $servername = ""; + $v['game_player_id'] = ""; + $v['game_player_name'] = ""; + } $v['promote_id']= $promoteInfo['account']; + if(empty($v['extend'])) { + $v['extend'] = $v['order_id']; + } $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'] = $serverInfo['server_name']; + $csvData['server_name'] = $servername; $csvData['user_id'] = $v['game_player_id']; $csvData['game_player_name'] = $v['game_player_name']; $csvData['price'] = $v['price']; diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 53af22fda..b9ebfd106 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -74,15 +74,26 @@ class PlayersController extends BaseController { $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc') ->page($page, $row)->select(); foreach($rs as $key => $v) { - $rs[$key]['extend'] = encryption($v['extend']); - $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); - $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); - $serverId1 = $v['server_id']; - $gameId = $v['game_id']; - $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); - $rs[$key]['server_name'] = $serverInfo['server_name']; - $rs[$key]['promote_id']= $promoteInfo['account']; - } + if(empty($v['extend'])) { + $v['extend'] = $v['order_id']; + } + $rs[$key]['extend'] = encryption($v['extend']); + $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); + if($v['server_id'] != 0) { + $serverId1 = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); + $rs[$key]['server_name'] = $serverInfo['server_name']; + }else { + $rs[$key]['server_name'] = ""; + $rs[$key]['game_player_id'] = ""; + $rs[$key]['game_player_name'] = ""; + } + + $rs[$key]['promote_id']= $promoteInfo['account']; + + } $count = M('pay_info', 'tab_') ->field('tab_pay_info.id') ->where($map)