From bbb7f3301c075569c4765c01ceea88916a89eb76 Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 1 Aug 2020 13:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ExportController.class.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 408269e65..0bd47117e 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1200,7 +1200,7 @@ class ExportController extends Controller $xlsCell = array( - "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员", "充值ip","区服ID", "游戏区服", + "支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员","所属商户", "充值ip","区服ID", "游戏区服", "角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}" ); @@ -1232,7 +1232,7 @@ 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, 0 as company_name,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, promote_id') + ->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,merchant_id,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) @@ -1254,6 +1254,7 @@ class ExportController extends Controller }else { $value['payed_time'] = "------"; } + $value['merchant_id'] = getMerchantName($value['merchant_id']); checkEncryptionAuth($value['user_account'],'spend_lists'); // $value['user_account'] = encryption($value['user_account']); ($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; @@ -1369,6 +1370,7 @@ class ExportController extends Controller array('pay_amount', "充值平台币"), array('pay_way', "充值方式", 'get_pay_way', '*'), array('pay_ip', "充值ip"), + array('merchant_id', "所属商户"), array('create_time', "充值时间"), array('payed_time','支付时间'), array('pay_status', L('Order_status'), 'get_info_status', '*', '9'), @@ -1384,6 +1386,8 @@ class ExportController extends Controller ($xlsData[$key]['promote_account']=='官方渠道'||$xlsData[$key]['promote_account']=='自然注册')?($xlsData[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; + $xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']); + $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); if ($value['pay_status'] == 1){ $xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']); @@ -2411,6 +2415,7 @@ class ExportController extends Controller array('promote_account', L('Subordinate_channel')), array('pay_amount', "充值平台币"), array('pay_way', "充值方式"), + array('merchant_id', "所属商户"), array('create_time', "充值时间"), array('pay_status', L('Order_status'), 'get_info_status', '*', '9'), array('', "共计充值{$total}"), @@ -2427,6 +2432,7 @@ class ExportController extends Controller // var_dump($xlsData);die(); foreach ($xlsData as $key => $value) { $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); + $xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']); if(!$xlsData[$key]['pay_way']) { $xlsData[$key]['pay_way'] = '无'; } else { @@ -2449,6 +2455,7 @@ class ExportController extends Controller array('order_amount', '订单金额'), array('pay_amount', '实付金额'), array('pay_way', '充值方式'), + array('merchant_id', '所属商户'), array('add_time', '录入时间'), ); @@ -2517,6 +2524,7 @@ class ExportController extends Controller $order_list['pay_amount'] = $v['pay_amount']; $order_list['pay_way'] = get_pay_way($v['pay_way']); $order_list['add_time'] = date('Y-m-d H:i:s', $v['add_time']); + $order_list['merchant_id'] = getMerchantName($v['merchant_id']); checkEncryptionAuth($order_list['user_account'],'TestOrder_lists');