From 6241fb427dae1449dc52ad59794a0159bdebaf51 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 15:33:38 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=AF=86=E7=A0=81key=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/User/Model/UcenterMemberModel.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/User/Model/UcenterMemberModel.class.php b/Application/User/Model/UcenterMemberModel.class.php index f1b9cb64e..70953fe13 100644 --- a/Application/User/Model/UcenterMemberModel.class.php +++ b/Application/User/Model/UcenterMemberModel.class.php @@ -118,6 +118,8 @@ class UcenterMemberModel extends Model{ if($data = $this->create($data)){ $data['username'] = $username; $data['email'] = $email; + $data['password'] = think_ucenter_md5($password, UC_AUTH_KEY); + $data['second_pwd'] = think_ucenter_md5($second_pwd, UC_AUTH_KEY); try { $status = M('UcenterMember', 'sys_')->add($data); } catch (\Throwable $th) { From 66d098a81b6ce948f1a681110d4ac2f5e983982c Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 23 Dec 2019 15:51:29 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=8F=90=E7=A4=BA=E5=8E=BB=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AuthManagerController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 5ebaa6eee..9420e7c42 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -482,7 +482,7 @@ class AuthManagerController extends AdminController{ if ($AuthGroup->where("id = {$gid}")->save(array('data_empower_type'=>$data_empower_type,'data_president'=>$promoteData))) { $this->success('操作成功',U('AuthManager/index')); } else { - $this->error('操作失败,请改变成员'); + $this->success('操作成功',U('AuthManager/index')); } } From 8c7107ddd2833509998e74cbcdd036cc0acf13e2 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 23 Dec 2019 16:16:23 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 46c6e2d76..650ee7671 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -772,3 +772,33 @@ ADD COLUMN `data_empower_type` tinyint(4) NOT NULL DEFAULT 1 COMMENT '数据权 ALTER TABLE `platform`.`sys_auth_group` ADD COLUMN `data_president` longtext NULL COMMENT '会长数据' AFTER `data_empower_type`; +-- 推广员表新增推广公司id liuweiwen 2019-12-23 +ALTER TABLE tab_promote ADD `company_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广公司ID'; +-- 新增推广公司表 liuweiwen 2019-12-23 +CREATE TABLE `tab_promote_company` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `company_name` varchar(60) NOT NULL COMMENT '推广公司名称', + `uid` int(11) NOT NULL DEFAULT '0' COMMENT '添加人ID', + `status` tinyint(3) NOT NULL DEFAULT '1' COMMENT '状态 0-禁用 1-启用', + `create_time` int(10) NOT NULL DEFAULT '0' COMMENT '添加时间', + `last_up_time` int(10) NOT NULL DEFAULT '0' COMMENT '最后更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='推广公司'; + +-- 菜单(推广公司录入)有个变量，所以后面几句要一起执行 liuweiwen +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) +VALUES ('推广公司录入', 185, 56, 'PromoteCompany/lists', 0, '该功能用于录入工会所属的推广公司名称', '推广员管理', 0, 1); + +set @company_id = (SELECT id FROM sys_menu WHERE title = '推广公司录入'); +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) +VALUES ('新增', @company_id, 0, 'PromoteCompany/add', 0, '', '推广员管理', 0, 1); +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) +VALUES ('编辑', @company_id, 0, 'PromoteCompany/edit', 0, '', '推广员管理', 0, 1); +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) +VALUES ('删除', @company_id, 0, 'PromoteCompany/del', 0, '', '推广员管理', 0, 1); +-- 增加修改b_spend表索引 liuweiwen 2019-12-23 +DROP INDEX o ON tab_spend; +ALTER TABLE tab_spend ADD INDEX o(pay_status, is_check, settle_check, promote_id); +ALTER TABLE tab_user_login_record ADD INDEX user_id_promote_idx(user_id, promote_id); + + From c0a0f44287fc295faf9cfbdc03b76cbec7ee5a46 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 19:05:42 +0800 Subject: [PATCH 04/11] =?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 05/11] =?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 06/11] =?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 07/11] =?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 08/11] =?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 @@ 推广员充值统计

推广员注册统计

-

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

+

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

From 1f4490733abc3430cd15c2ca31fd5b745e229289 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 20:20:49 +0800 Subject: [PATCH 09/11] =?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=94=A8=E6=88=B7?= 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 c43e60375..37bc4761b 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -33,7 +33,7 @@ 推广员充值统计

推广员注册统计

-

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

+

说明：针对所有推广员下的注册用户，进行注册排行统计(界面数据按照创角统计)

From 116dc2c86f2ff1e11f87f808a7152054584c90e8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Dec 2019 20:29:15 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=89=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Member/user_info.html | 2 +- Application/Admin/View/Platform/promote_statistics.html | 2 +- Application/Admin/View/User/rolelist.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index ce39a6797..ec448a0ce 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -37,7 +37,7 @@

玩家列表

-

说明：本站用户即手机和账号注册用户，第三方用户即通过微信、百度、QQ、新浪等方式登录用户。

+

说明：此列表数据以平台账号为统计基数

说明：游客登录，默认属于第三方用户；当用户通过SDK设置了用户名以后，记录变换到本站用户列表里，账户自动更换为设置的账号！

 diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 37bc4761b..78e9e9ea8 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -33,7 +33,7 @@ 推广员充值统计

推广员注册统计

-

说明：针对所有推广员下的注册用户，进行注册排行统计(界面数据按照创角统计)

+

说明：此列表数据以点击推广链接下载游戏注册数量为统计基数

diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 676987c05..d94296fd7 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -43,7 +43,7 @@

角色查询

-

说明：角色查询仅作为玩家角色查询的辅助工具，使用此功能需先保证游戏对接已经获取相关参数

+

说明：此列表数据以游戏角色为统计基数

From 9dcc55d472c67006144716f31814dbab3eddacff Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Dec 2019 10:29:55 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E6=97=A0?= =?UTF-8?q?=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 --- Application/Admin/Controller/MemberController.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 47754f345..260683adb 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -83,10 +83,16 @@ class MemberController extends ThinkController //1.2 与游戏相关 $game_map = false; if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) { + $game_map = " and tab_user_play_info.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")"; } if (isset($_REQUEST['server_name'])) { - $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' "; + if($game_map){ + $game_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' "; + }else{ + $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' "; + } + } $promoteRoot = getPowerPromoteIds();