Merge branch 'hotfix/changeplayerslog' of wmtx/platform into master

平台内充值订单增加extend是否为空判断显示

Application/Home/Controller/DownloadController.class.php

@@ -1909,7 +1909,7 @@ 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();
-                    if($v['server_id'] != 0) {
+                    if($v['server_id'] != 0 && !empty($v['extend'])) {
                         $serverId1 = $v['server_id'];
                         $gameId = $v['game_id'];
                         $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find();

Application/Home/Controller/PlayersController.class.php

@@ -74,13 +74,7 @@ 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) {
-                if(empty($v['extend'])) {
+                if($v['server_id'] != 0 && !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();
@@ -90,6 +84,12 @@ class PlayersController extends BaseController {
                     $rs[$key]['game_player_id'] = "";
                     $rs[$key]['game_player_name'] = "";
                 }
+                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();
                 
                 $rs[$key]['promote_id']= $promoteInfo['account'];