From 99fcc4cbbb118305839e73d47ed2903167cad5ef Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Thu, 18 Jun 2020 14:23:44 +0800
Subject: [PATCH] upt

---
 .../Admin/Controller/ExportController.class.php      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 33dfaa804..739fe1d30 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1068,7 +1068,6 @@ class ExportController extends Controller
                 );
                 break;
             case 7:
-
                 $startDate = empty($_REQUEST['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timestart'];
                 $endDate = empty($_REQUEST['timeend']) ? date('Y-m-d') : $_REQUEST['timeend'];
 
@@ -1206,15 +1205,20 @@ 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, tab_promote_company.company_name, spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status')
-                        ->join('tab_promote on tab_promote.id = tab_spend.promote_id', 'left')
-                        ->join('tab_promote_company on tab_promote_company.id and tab_promote.company_id', 'left')
+                        ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name, spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
+                        // ->join('tab_promote on tab_promote.id = tab_spend.promote_id', 'left')
+                        // ->join('tab_promote_company on tab_promote_company.id and tab_promote.company_id', 'left')
                         ->where($map)
                         ->limit(($i-1)*$perSize  ,$perSize)
                         ->order($order ? $order : 'pay_time desc')
                         ->select();
+                    $promoters = D('Promote')->where(['id'=>['in', array_unique(array_column($xlsData, 'promote_id'))]])->field('id, company_id')->select();
+                    $promoters = $promoters ? array_column($promoters, 'company_id', 'id') : [];
+                    $companys = $promoters ? M('promote_company', 'tab_')->where(['id'=>['in', array_unique(array_values($promoters))]])->field('id, company_name')->select() : [];
+                    $companys = $companys ? array_column($companys, 'company_name', 'id') : [];
 
                     foreach($xlsData as $value) {
+                        $value['company_name'] = $promoters[$value['promote_id']] == 0 ? '官方渠道' : ($companys[$promoters[$value['promote_id']]] ?? '');
                         $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
                         if($value['pay_status'] == 1) {
                             $value['payed_time'] = date('Y-m-d H:i:s',$value['payed_time']);