From 2ce274486d050b0667a3e80aa042a92d7e5690ac Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 18 Jun 2020 10:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=B8=A0=E9=81=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B1=9F=E6=81=AF=E7=BD=91=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/BehaviorLogController.class.php | 4 +++- .../BindRechargeRecordController.class.php | 4 ++++ .../Controller/ExportController.class.php | 18 +++++++++++++----- .../Controller/MemberController.class.php | 5 +++++ .../Admin/Controller/MendController.class.php | 3 +++ 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 3ffafeb7a..2405a5764 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -65,6 +65,7 @@ class BehaviorLogController extends ThinkController // $data = M('pay_info', 'tab_')->field('tab_pay_info.id,tab_pay_info.user_account,extend,tab_pay_info.create_time,tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.promote_account,tab_pay_info.order_id,tab_pay_info.game_player_id,tab_pay_info.game_player_name,price,tab_server.server_name')->join('LEFT JOIN tab_server on tab_pay_info.server_id = tab_server.server_num AND tab_pay_info.game_id = tab_server.game_id AND tab_pay_info.server_id <> 0')->where($map)->order('tab_pay_info.id DESC')->page($p, $row)->select(); $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); foreach($data as $k => $v) { + ($data[$k]['promote_account']=='官方渠道'||$data[$k]['promote_account']=='自然注册')?($data[$k]['promote_account']=C('OFFICIEL_CHANNEL')):''; if(empty($v['extend'])) { $data[$k]['extend'] = $v['order_id']; } @@ -141,9 +142,10 @@ class BehaviorLogController extends ThinkController $re_data['pay_time'] = $order_detail['create_time']; $re_data['payed_time'] = date("Y-m-d H:i:s", $order_detail['payed_time']); } + ($order_detail['promote_account']=='官方渠道'||$order_detail['promote_account']=='自然注册')?($re_data['promote_account']="江息网络"):($re_data['promote_account'] = $order_detail['promote_account']); $re_data['extend'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; - $re_data['promote_account'] = $order_detail['promote_account']; +// $re_data['promote_account'] = $order_detail['promote_account']; $re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-'; $re_data['pay_amount'] = $order_detail['pay_amount']; $re_data['pay_way'] = get_pay_way($order_detail['pay_way']); diff --git a/Application/Admin/Controller/BindRechargeRecordController.class.php b/Application/Admin/Controller/BindRechargeRecordController.class.php index 0ede8cefa..066be0acf 100644 --- a/Application/Admin/Controller/BindRechargeRecordController.class.php +++ b/Application/Admin/Controller/BindRechargeRecordController.class.php @@ -51,6 +51,10 @@ class BindRechargeRecordController extends ThinkController{ empty(I('pay_order_number')) || $map['pay_order_number'] = I('pay_order_number',''); $data = $model->getLists($map,"create_time desc",$p); + foreach($data as $key => $value) { + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; + } + $this->assign("data",$data); //分页 diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index ea282b699..7c61f0e95 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -154,6 +154,7 @@ class ExportController extends Controller ->select(); foreach($xlsData as $value) { + ($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; $value['create_time'] = date("Y-m-d H:i:s",$value['create_time']); $value['play_time'] = date("Y-m-d H:i:s",$value['play_time']); mb_convert_variables('GBK', 'UTF-8', $value); @@ -1221,7 +1222,7 @@ class ExportController extends Controller } 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')):''; $value['extend'] = $value['extend'].'`'; $value['pay_way'] = get_pay_way($value['pay_way']); $value['pay_status'] = get_info_status($value['pay_status'],9); @@ -1346,6 +1347,8 @@ class ExportController extends Controller checkEncryptionAuth($xlsData[$key]['user_account'],'deposit_lists'); + ($xlsData[$key]['promote_account']=='官方渠道'||$xlsData[$key]['promote_account']=='自然注册')?($xlsData[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; + $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']); @@ -2028,6 +2031,7 @@ class ExportController extends Controller $xlsData = M('pay_info', 'tab_')->where($map)->order('id DESC')->select(); foreach($xlsData as $k => $v) { $xlsData[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + ($xlsData[$k]['promote_account']=='官方渠道'||$xlsData[$k]['promote_account']=='自然注册')?($xlsData[$k]['promote_account']=C('OFFICIEL_CHANNEL')):''; } break; $startDate = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart']; @@ -2280,9 +2284,10 @@ class ExportController extends Controller $re_data['pay_time'] = set_show_time($order_detail['create_time']); $re_data['payed_time'] = set_show_time($order_detail['payed_time']); } - $re_data['extend'] = !empty($order_detail['extend']) ? $order_detail['extend'] : '-'; + ($order_detail['promote_account']=='官方渠道'||$order_detail['promote_account']=='自然注册')?($re_data['promote_account']="江息网络"):($re_data['promote_account'] = $order_detail['promote_account']); + $re_data['extend'] = !empty($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; - $re_data['promote_account'] = $order_detail['promote_account']; +// $re_data['promote_account'] = $order_detail['promote_account']; $re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-'; $re_data['pay_amount'] = $order_detail['pay_amount']; $re_data['pay_way'] = get_pay_way($order_detail['pay_way']); @@ -4158,6 +4163,9 @@ class ExportController extends Controller $data = $data['data']; foreach ($data as $key => $value) { checkEncryptionAuth($data[$key]['user_account'],'BindRechargeRecordExport'); + + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; + $data[$key]['pay_way'] = get_pay_way($value['pay_way']); $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']); if ($value['pay_status'] == 1) { @@ -7241,10 +7249,10 @@ class ExportController extends Controller $value['register_type'] = get_registertype($value['register_type']); $value['top_promote'] = $value['parent_name']?$value['promote_account'].'['.$value['parent_name'].']':$value['promote_account']; if (!$value['promote_account']) { - $value['top_promote'] = "官方渠道"; + $value['top_promote'] = C('OFFICIEL_CHANNEL'); } if($value['parent_name'] == "官方渠道") { - $value['top_promote'] = $value['promote_account']; + $value['top_promote'] = C('OFFICIEL_CHANNEL'); } unset($value['promote_account']); unset($value['parent_name']); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 872a13515..c20f99081 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -160,6 +160,11 @@ class MemberController extends ThinkController } $data = $data->select(); + + foreach ($data as $key=>&$value ) { + ($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + } + if(isset($_REQUEST['export'])){ $isadmin = is_administrator(); //获取等级 diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 9ba943f92..225336495 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -79,6 +79,9 @@ class MendController extends ThinkController { } //格式化信息 foreach ($data as $key => $value) { + + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; + $data[$key]['create_time'] = date("Y-m-d H:i:s",$value['create_time']); $data[$key]['order_time'] = date("Y-m-d H:i:s",$value['order_time']); }