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 1/2] =?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 2/2] =?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']);