From 25ae12a72c4a368a6be410f6b5808800620e7eb2 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 19 Dec 2019 16:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0extend=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/DownloadController.class.php   |  2 +-
 .../Home/Controller/PlayersController.class.php    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 276ed56b0..d1a6986e1 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/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();
diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php
index b9ebfd106..3cf12243a 100644
--- a/Application/Home/Controller/PlayersController.class.php
+++ b/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'])) {
-                    $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) {
+                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();
@@ -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'];