From c0a0f44287fc295faf9cfbdc03b76cbec7ee5a46 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 19:05:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E6=B3=A8=E5=86=8C=E7=BB=9F=E8=AE=A1->=E5=8C=BA?= =?UTF-8?q?=E6=9C=8D=E9=80=89=E6=8B=A9=E4=B8=8D=E7=9B=B8=E5=BA=94bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PlatformController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index e24602a2e..f1c8843d5 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -403,7 +403,7 @@ class PlatformController extends ThinkController count(IF(register_time ' . $mounth . ',1,null)) as mounth') ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') ->join("tab_user as u on tp2.id = u.promote_id", 'left') -// ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) + ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->where($map) ->group('tp1.id') ->order('count desc, register_time') From 8b968fc9fbb16f16039525c55f982068afcc2dd7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 19:19:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/RechargeSumController.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 66d201d42..f356c6e34 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -7,6 +7,7 @@ class RechargeSumController extends ThinkController public function summation($p = 1) { + $startDateTime = empty($_REQUEST['timeStart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timeStart']; $endDateTime = empty($_REQUEST['timeEnd']) ? date('Y-m-d') : $_REQUEST['timeEnd']; $startTime = strtotime($startDateTime); @@ -53,10 +54,12 @@ class RechargeSumController extends ThinkController $rmap['game_id'] = $map['game_id'] = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; } - if (!empty($_REQUEST['server_id'])) { + if (!empty($_REQUEST['server_id']) || !empty($_REQUEST['server_name'])) { + if(isset($_REQUEST['server_name'])){ + $_REQUEST['server_id'] = M("server","tab_")->field("id")->where("server_name = '{$_REQUEST['server_name']}'")->find()["id"]; + } $rmap['tab_user_play.server_id'] = $map['server_id'] = $_REQUEST['server_id']; } - if ($_REQUEST['bindcoin'] == 1) { $map['pay_way'] = array('egt', 0); } From 7a82b930bf58c96543044be4c915b786dd8bba31 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 19:35:48 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8D=E5=93=8D=E5=BA=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/RechargeSumController.class.php | 5 +---- Application/Admin/View/RechargeSum/summation.html | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index f356c6e34..6c9946b7b 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -54,10 +54,7 @@ class RechargeSumController extends ThinkController $rmap['game_id'] = $map['game_id'] = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; } - if (!empty($_REQUEST['server_id']) || !empty($_REQUEST['server_name'])) { - if(isset($_REQUEST['server_name'])){ - $_REQUEST['server_id'] = M("server","tab_")->field("id")->where("server_name = '{$_REQUEST['server_name']}'")->find()["id"]; - } + if (!empty($_REQUEST['server_id'])) { $rmap['tab_user_play.server_id'] = $map['server_id'] = $_REQUEST['server_id']; } if ($_REQUEST['bindcoin'] == 1) { diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html index 37a19f460..c01990b4a 100644 --- a/Application/Admin/View/RechargeSum/summation.html +++ b/Application/Admin/View/RechargeSum/summation.html @@ -81,7 +81,7 @@
-
@@ -321,7 +321,7 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + var server_id = "{:I('server_id')}"; $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", @@ -331,11 +331,11 @@ success:function(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(); } }) }); From cfd032b1fa6a4451a3a53d0faf02599552689100 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 23 Dec 2019 19:49:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= 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/PlatformController.class.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index fe36f71ab..70b6c1cf6 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2545,7 +2545,7 @@ class ExportController extends Controller $map['tp1.chain'] = '/'; } //为数据权限添加 - setPowerPromoteIds($map); + setPowerPromoteIds($map, 'u.promote_id'); $data = M('promote', 'tab_')->alias('tp1')->field('tp1.account as promote_account,tp1.id, date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(u.id) as count, count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $week . ',1,null)) as week, @@ -2564,7 +2564,8 @@ class ExportController extends Controller $user_auth_promote_ids = session('user_auth_promote_ids'); if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { //官方渠道数据添加 - $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, + $authorityData = M('user', 'tab_')->alias('u') + ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count, count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $week . ',1,null)) as week, diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index e24602a2e..7626b439f 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -392,7 +392,7 @@ class PlatformController extends ThinkController } //为数据权限添加 - setPowerPromoteIds($map); + setPowerPromoteIds($map, 'u.promote_id'); $data = M('promote', 'tab_')->alias('tp1') ->field('tp1.account as promote_account,tp1.id, @@ -417,7 +417,8 @@ class PlatformController extends ThinkController $user_auth_promote_ids = session('user_auth_promote_ids'); if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { //官方渠道数据添加 - $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, + $authorityData = M('user', 'tab_')->alias('u') + ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count, count(IF(register_time ' . $today . ',1,null)) as today, count(IF(register_time ' . $week . ',1,null)) as week, From 8c577ec4af98a5384a230e346700f862fe6b47ff Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 19:54:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Platform/promote_statistics.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 4ddcb924f..c43e60375 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -33,7 +33,7 @@ 推广员充值统计

推广员注册统计

-

说明：针对所有推广员下的注册用户，进行注册排行统计

+

说明：针对所有推广员下的注册用户，进行注册排行统计(未选择游戏相关参数时，界面数据按照平台账号统计，选择游戏相关参数后，界面数据按照创角统计)