From 2c17a4c24f247f2ca9a5acad9ca1094437cbf1f0 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Thu, 12 Dec 2019 17:35:27 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E5=8F=8C=E4=B9=BE=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Common/function.php | 3 ++ .../Controller/DownloadController.class.php | 1 + .../Controller/PlayersController.class.php | 37 +++++++++++++++++++ .../Home/Controller/QueryController.class.php | 2 + 4 files changed, 43 insertions(+) diff --git a/Application/Home/Common/function.php b/Application/Home/Common/function.php index 892c35e21..1fb3c1774 100644 --- a/Application/Home/Common/function.php +++ b/Application/Home/Common/function.php @@ -393,6 +393,9 @@ function get_pay_way($id = null) case 9: return "双乾支付"; break; + case 15: + return "双乾支付-快捷"; + break; } } diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 3f05a9ed8..fbb3391bc 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -27,6 +27,7 @@ class DownloadController extends BaseController { 7 => '苹果支付', 8 => '金猪支付', 9 => '双乾支付', + 15 => '双乾支付-快捷' ]; //提现状态 diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 486613b21..2f4829fb0 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -98,11 +98,13 @@ class PlayersController extends BaseController { $parameter['level_promote_2'] = $levelPromote[0]; $parameter['level_promote_3'] = $levelPromote[1]; $parameter['level_promote_4'] = $levelPromote[2]; + $serverData = $this->getServer($relationGameId, $sdkVersion); $page = set_pagination($count, $row, $parameter); if ($page) { $this->assign('_page', $page); } $this->assign('listData',$rs); + $this->assign('serverData', $serverData); $this->assign('initBegTime', I('begtime')); $this->assign('initEndTime', I('endtime')); $this->display(); @@ -134,4 +136,39 @@ class PlayersController extends BaseController { } return $queryPromote; } + + public function getServer($relationGameId, $sdkVersion) + { + $result['status'] = 0; + $result['data'] = []; + + if (empty($relationGameId)) { + return $result; + } + + $map['relation_game_id'] = intval($relationGameId); + empty($sdkVersion) || $map['sdk_version'] = intval($sdkVersion); + + $gameIds = M('Game', 'tab_') + ->where($map) + ->getField('id', true); + + if (empty($gameIds)) { + return $result; + } + + $gameIds = implode(',', $gameIds); + $where['game_id'] = ['in', $gameIds]; + $where['show_status'] = 1; + + $serverData = M('Server', 'tab_') + ->field('server_id,server_name') + ->where($where) + ->order('server_version,start_time desc') + ->select(); + $result['status'] = 1; + $result['data'] = $serverData; + + return $result; + } } \ No newline at end of file diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 2d52f6888..72c11f272 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -20,6 +20,8 @@ class QueryController extends BaseController 0 => '平台币', 1 => '支付宝', 2 => '微信', + 9 => '双乾支付', + 15 => '双乾支付' ]; public static $payStatus = [ From f05034486cddb273b11e2d944c8bf0c1d3d00735 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 12 Dec 2019 17:58:50 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 72c11f272..a041e3bb4 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1856,7 +1856,7 @@ class QueryController extends BaseController } $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]]; - $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; + $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id"; $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; $loginRecordMap['lr.create_time'] = $map['uc.create_time']; @@ -1884,6 +1884,10 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); foreach ($records as &$list) { + if (empty($list['user_account']) ) { + $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); + $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); + } $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name']; $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']); From 65b5fc4a26c536f27237c675760dc671fb90afbb Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 12 Dec 2019 18:01:31 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=85=85=E5=80=BC=E5=88=97=E8=A1=A8=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Spend/lists.html | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 4c52357aa..ea64fb7c6 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -169,7 +169,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -212,7 +212,6 @@ - 补单 @@ -227,19 +226,17 @@ - - 汇总 - + 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} - 今日充值：{$ttotal} - 昨日充值：{$ytotal} + + 累计充值：{$total}（此处只汇总充值成功的订单） - + From dccb94c779afd9d721b4dadad975e89345601e5c Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Thu, 12 Dec 2019 18:06:31 +0800 Subject: [PATCH 04/23] tab_pay_info --- Data/update.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 95adabd49..8036ae36a 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -696,5 +696,12 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id'; ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; + +ALTER TABLE `tab_pay_info` +MODIFY COLUMN `game_player_id` varchar(255) NULL DEFAULT '0' COMMENT '玩家游戏内id' AFTER `promote_id`; +ALTER TABLE `tab_pay_info` +ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`, +ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`; + -- 菜单(游戏充值预下单) INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); From 01ef816ee16117d84052e8c6d0e97e8e8eb3bf2e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 12 Dec 2019 19:59:21 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + Application/Home/View/default/Query/recharge.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index ae018a7b8..66a4fa08b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -174,6 +174,7 @@ class QueryController extends BaseController break; } $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); + $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--'; $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态'; $list['sdk_version'] = getSDKTypeName($list['sdk_version']); diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index a7f02d908..89728f917 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -216,7 +216,7 @@ {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}) {$vo.p_pro_account}({$vo.p_pro_real_name}) {$vo.pro_account}({$vo.pro_real_name}) - {$vo.pay_time|date='Y-m-d H:i:s',###} + {$vo.pay_time} From 146b9e518a436575478db60d6d6037f01f03d230 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 12 Dec 2019 20:15:28 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5=E8=A7=86=E9=A2=91=E4=B8=8D=E7=BD=AE=E9=A1=B6=E6=97=A0?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=98=BE=E7=A4=BA=E8=A7=86=E9=A2=91=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E6=BB=9A=E5=8A=A8=E5=B1=82=E8=A2=AB=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=8C=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 403 +++++++++--------- 1 file changed, 204 insertions(+), 199 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 0dce88c12..b9b47fe62 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -48,32 +48,36 @@
style="height: 0" > -
+
- -
- -
- + +
+ +
+ -
- +
+
+
-
+
+
-