修改

Application/Admin/Controller/ExportController.class.php

@@ -1131,6 +1131,17 @@ class ExportController extends Controller
                     unset($_REQUEST['pay_game_status']);
                 }
 
+                $marketAdminId = I('market_admin_id', 0);
+                if ($marketAdminId) {
+                    $map['market_admin_id'] = $marketAdminId;
+                }
+
+                $isMarketAdmin = isMarketAdmin();
+                if ($isMarketAdmin) {
+                    $userAuth = session('user_auth');
+                    $map['market_admin_id'] = $userAuth['uid'];
+                }
+
 //        $promoteRoot = getPowerPromoteIds();
 //        $data_empower_type = session('user_auth')['data_empower_type'];
 //
@@ -1178,7 +1189,7 @@ class ExportController extends Controller
 
 
                 $xlsCell = array(
-                    "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "充值ip","区服ID", "游戏区服",
+                    "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属市场专员", "充值ip","区服ID", "游戏区服",
                     "角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}"
                 );
 
@@ -1210,12 +1221,12 @@ class ExportController extends Controller
 //                        ->join($tab_promote_join)
 //                        ->order('pay_time DESC')
 //                        ->select();
-                        ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status')
+                        ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account,market_admin_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status')
                         ->where($map)
                         ->limit(($i-1)*$perSize  ,$perSize)
                         ->order($order ? $order : 'pay_time desc')
                         ->select();
-
+                    $adminUsernameList = getAdminUsernameList(array_column($xlsData, 'market_admin_id'));
                     foreach($xlsData as $value) {
                         $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
                         if($value['pay_status'] == 1) {
@@ -1230,6 +1241,7 @@ class ExportController extends Controller
                         $value['pay_way'] = get_pay_way($value['pay_way']);
                         $value['pay_status'] = get_info_status($value['pay_status'],9);
                         $value['pay_game_status'] = get_info_status($value['pay_game_status'],14);
+                        $value['market_admin_id'] = $adminUsernameList[$value['market_admin_id']] ?? '无';
                         mb_convert_variables('GBK', 'UTF-8', $value);
                         fputcsv($fp, $value);
                     }