From b88f395c9a4f5b45a7e447ffc5ddb3b88f882982 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 27 Dec 2019 14:05:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A5=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/BehaviorLogController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 5306bc473..ddfb070e8 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -130,13 +130,13 @@ class BehaviorLogController extends ThinkController $show_data = []; foreach($data as $k => $v) { if($v['tab'] == 'spend') { - $order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['pay_time']; } elseif($v['tab'] == 'deposit') { $order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['create_time']; } - $re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-'; + $re_data['order_number'] = 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['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-'; From 873c81605e263591c5321fa07aa2d657d80daa23 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 27 Dec 2019 14:07:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 5 ++++- Application/Admin/Controller/StatisticsController.class.php | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index a8325b244..e07184e31 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3523,7 +3523,10 @@ class ExportController extends Controller $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_name'])) { + $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + $map .= " AND server_name = '{$_REQUEST['server_name']}' "; + }; $game_map .= ") "; } else if (isset($_REQUEST['game_name'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index 5bb786fd6..38a81eb00 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -1039,7 +1039,10 @@ class StatisticsController extends ThinkController { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_name'])) { + $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + $map .= " AND server_name = '{$_REQUEST['server_name']}' "; + }; $game_map .= ") "; } else if (isset($_REQUEST['game_name'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); From f4495f93a92eef0d1ea5cd6ca0352e6623e4ee73 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 27 Dec 2019 14:40:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ltv=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ExportController.class.php | 8 ++++---- .../Controller/StatisticsController.class.php | 8 ++++---- Application/Admin/View/Statistics/ltv.html | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index e07184e31..93b94e43f 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3519,13 +3519,13 @@ class ExportController extends Controller // } $map = " 1=1 "; $game_map = ""; - if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { + if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) { - $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; - $map .= " AND server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_id'])) { + $game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' "; + $map .= " AND server_id = '{$_REQUEST['server_id']}' "; }; $game_map .= ") "; } else if (isset($_REQUEST['game_name'])) { diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index 38a81eb00..467be7f9c 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -1035,13 +1035,13 @@ class StatisticsController extends ThinkController { $map = " 1=1 "; $game_map = ""; - if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { + if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) { - $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; - $map .= " AND server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_id'])) { + $game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' "; + $map .= " AND server_id = '{$_REQUEST['server_id']}' "; }; $game_map .= ") "; } else if (isset($_REQUEST['game_name'])) { diff --git a/Application/Admin/View/Statistics/ltv.html b/Application/Admin/View/Statistics/ltv.html index 21d660723..fe5a31fd4 100644 --- a/Application/Admin/View/Statistics/ltv.html +++ b/Application/Admin/View/Statistics/ltv.html @@ -64,7 +64,7 @@
-
@@ -128,7 +128,7 @@ 'end'=>I('end',date('Y-m-d',strtotime('-1 day'))), 'game_name'=>I('game_name'), 'game_type'=>I('game_type'), - 'server_name'=>I('server_name'), + 'server_id'=>I('server_id'), 'xlsname'=>'统计_ltv统计' ),false)}">导出 {$_page|default=''} @@ -222,7 +222,7 @@ $(function(){ pickerPosition:'bottom-right' }); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}) $.ajax({ @@ -234,11 +234,11 @@ $(function(){ console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) });