Merge branch 'dev'

Application/Admin/Controller/ExportController.class.php

@@ -5475,6 +5475,7 @@ if ($key == 'model'){
 
         $xlsCell = array(
             array('pay_order_number','支付订单号'),
+            array('extend','游戏订单号'),
             array('pay_time','充值时间'),
             array('user_account','玩家账号'),
             array('game_name','游戏名称'),
@@ -5538,7 +5539,7 @@ if ($key == 'model'){
             $map['user_nickname'] = array('like',I("user_nickname").'%');
         }
 
-        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,extend";
         $group = "";
         $order = "pay_time DESC";
         for($start = $startTime;$start<$endTime;$start=$start+86400) {
@@ -5554,9 +5555,10 @@ if ($key == 'model'){
 
         foreach($xlsData as $key => $value) {
             foreach ($value as $k => $v) {
-                $xlsData[$key][$k]['pay_way'] = getPayType($value['pay_way']);
+                $xlsData[$key][$k]['pay_way'] = getPayType($v['pay_way']);
             }
         }
+//        dump($xlsData);die();
 
 
         $map['pay_time'] = array('between',array($startTime,$endTime));