From 107a32cdf4e0b5125041278fd92761221633d107 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 19:40:40 +0800 Subject: [PATCH 1/8] =?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--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/userRecharges.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 5fedd4150..541918ba3 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -159,7 +159,7 @@ - 注册时间 + 注册时间 From 47bad41bfa6d57a51ca7fc045fed7c4fedb9089f Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 20:29:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 4 ++-- Application/Home/Controller/PlayersController.class.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 7fb7f3c61..d14b1daf6 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1896,11 +1896,11 @@ class DownloadController extends BaseController { ->limit(($i-1)*$perSize ,$perSize)->select(); foreach($data as $key => $v) { $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); - $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); + $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); $serverId = $v['server_id']; $gameId = $v['game_id']; $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); - $v['promote_id']= $promoteInfo['nickname']; + $v['promote_id']= $promoteInfo['account']; $csvData['extend'] = $this->encryption($v['extend']); $csvData['create_time'] = $v['create_time']; $csvData['user_account'] = $v['user_account']; diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index f067ef786..c016444fb 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -89,8 +89,8 @@ class PlayersController extends BaseController { //分页 $parameter['p'] = $page; $parameter['row'] = $row; - $parameter['begtime'] = $initBegTime; - $parameter['endtime'] = $initEndTime; + $parameter['begtime'] = I('begtime'); + $parameter['endtime'] = I('endtime'); $parameter['relation_game_id'] = $relationGameId; $parameter['sdk_version'] = $sdkVersion; $parameter['server_id'] = $serverId; From 50382918767f1043a998ee79b5e3ef027e41ed2a Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 20:39:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=98=B2=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 3 +++ Application/Home/Controller/PlayersController.class.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index d14b1daf6..6252624f0 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1188,6 +1188,9 @@ class DownloadController extends BaseController { $gameMap['sdk_version'] = $sdkVersion; } $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true); + if(empty($gameId1)) { + $gameId1 = [100000000]; + } $map['game_id'] = ['in', $gameId1]; } empty(I('server_id')) || $map['tab_pay_info.server_id'] = I('server_id'); diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index c016444fb..2162efa41 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -42,6 +42,9 @@ class PlayersController extends BaseController { $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); + if(empty($gameId)) { + $gameId = [100000]; + } $map['game_id'] = ['in', $gameId]; } if (!empty($serverId)) { From d795fb74f79e768c1b44d0278146f0dfc67f8a3a Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 20:42:39 +0800 Subject: [PATCH 4/8] =?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--=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 | 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 9af3fa9a9..d40432f1c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1685,6 +1685,8 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); + $gameId = $gameId ?? []; + $map['game_id'] = ['in', $gameId]; } if ($serverId != 0) { @@ -1798,6 +1800,7 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); + $gameId = $gameId ?? []; $map['uc.game_id'] = ['in', $gameId]; $subMap['game_id'] = ['in', $gameId]; @@ -1894,7 +1897,6 @@ class QueryController extends BaseController 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']; @@ -2086,6 +2088,8 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); + $gameId = $gameId ?? []; + $params['game_id'] = ['in', $gameId]; } if ($serverId > 0) { From 4586105e493c7e2f1cc5a3707691462790b07bed Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 20:46:04 +0800 Subject: [PATCH 5/8] =?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--=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index d40432f1c..33a240b31 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1685,7 +1685,7 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? []; + $gameId = $gameId ?? [-1]; $map['game_id'] = ['in', $gameId]; } @@ -1800,7 +1800,7 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? []; + $gameId = $gameId ?? [-1]; $map['uc.game_id'] = ['in', $gameId]; $subMap['game_id'] = ['in', $gameId]; @@ -2088,7 +2088,7 @@ class QueryController extends BaseController $gameMap['sdk_version'] = $sdkVersion; } $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? []; + $gameId = $gameId ?? [-1]; $params['game_id'] = ['in', $gameId]; } From fee36cb7ffe2087bfdfca259162d61fe9bb9bab1 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 20:50:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=98=B2=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 6252624f0..012598ebe 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1189,7 +1189,7 @@ class DownloadController extends BaseController { } $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true); if(empty($gameId1)) { - $gameId1 = [100000000]; + $gameId1 = [-100]; } $map['game_id'] = ['in', $gameId1]; } @@ -1385,6 +1385,9 @@ class DownloadController extends BaseController { $gameMap['sdk_version'] = $sdkVersion; } $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true); + if(empty($gameId1)) { + $gameId1 = [-100]; + } $map['game_id'] = ['in', $gameId1]; $subMap['game_id'] = ['in', $gameId1]; } @@ -1507,6 +1510,9 @@ class DownloadController extends BaseController { $gameMap['sdk_version'] = $sdkVersion; } $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true); + if(empty($gameId1)) { + $gameId1 = [-100]; + } $map['game_id'] = ['in', $gameId1]; } if ($serverId > 0) { @@ -1606,6 +1612,9 @@ class DownloadController extends BaseController { $gameMap['sdk_version'] = $sdkVersion; } $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true); + if(empty($gameId1)) { + $gameId1 = [-100]; + } $map['game_id'] = ['in', $gameId1]; } if ($serverId != 0) { From d3417894601b74aaacb5163930a08ad0524fb122 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 20:51:54 +0800 Subject: [PATCH 7/8] =?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--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Common/function.php | 15 ++++++++ .../Home/Controller/QueryController.class.php | 38 ++++--------------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/Application/Home/Common/function.php b/Application/Home/Common/function.php index 1fb3c1774..2827ba43b 100644 --- a/Application/Home/Common/function.php +++ b/Application/Home/Common/function.php @@ -1197,4 +1197,19 @@ function promoteCan($promoteId, \Closure $callback) function getChildGameAddPermission($promoteId) { return D('Promote')->where(array('id' => $promoteId))->getField('child_game_permission'); +} + +function gameSearch($relationGameId, $sdkVersion) +{ + $map = '1 = 1'; + if ($relationGameId != 0) { + $map['relation_game_id'] = $relationGameId; + } + if ($sdkVersion != 0) { + $map['sdk_version'] = $sdkVersion; + } + $gameIds = M('game', 'tab_')->where($map)->getField('id', true); + $gameIds = $gameIds ?? [-1]; + + return $gameIds; } \ No newline at end of file diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 33a240b31..a5aaf12bb 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1678,16 +1678,8 @@ class QueryController extends BaseController } if ($relationGameId != 0 || $sdkVersion != 0) { - if ($relationGameId != 0) { - $gameMap['relation_game_id'] = $relationGameId; - } - if ($sdkVersion != 0) { - $gameMap['sdk_version'] = $sdkVersion; - } - $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? [-1]; - - $map['game_id'] = ['in', $gameId]; + $gameIds = gameSearch($relationGameId, $sdkVersion); + $map['game_id'] = ['in', $gameIds]; } if ($serverId != 0) { $map['server_id'] = $serverId; @@ -1793,17 +1785,9 @@ class QueryController extends BaseController $subMap = ['promote_id' => ['in', $ids]]; if ($relationGameId != 0 || $sdkVersion != 0) { - if ($relationGameId != 0) { - $gameMap['relation_game_id'] = $relationGameId; - } - if ($sdkVersion != 0) { - $gameMap['sdk_version'] = $sdkVersion; - } - $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? [-1]; - - $map['uc.game_id'] = ['in', $gameId]; - $subMap['game_id'] = ['in', $gameId]; + $gameIds = gameSearch($relationGameId, $sdkVersion); + $map['uc.game_id'] = ['in', $gameIds]; + $subMap['game_id'] = ['in', $gameIds]; } if ($serverId != 0) { $map['uc.server_id'] = $serverId; @@ -2081,16 +2065,8 @@ class QueryController extends BaseController 'basicPromotes' => $basicPromotes, ]; if ($relationGameId != 0 || $sdkVersion != 0) { - if ($relationGameId != 0) { - $gameMap['relation_game_id'] = $relationGameId; - } - if ($sdkVersion != 0) { - $gameMap['sdk_version'] = $sdkVersion; - } - $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true); - $gameId = $gameId ?? [-1]; - - $params['game_id'] = ['in', $gameId]; + $gameIds = gameSearch($relationGameId, $sdkVersion); + $params['game_id'] = ['in', $gameIds]; } if ($serverId > 0) { $params['server_id'] = $serverId; From c5ea7c54ed2019b53b6c9d1aa87ad7ccac475c3b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 16 Dec 2019 20:57:27 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E4=B8=8B=E8=BD=BD=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index b9b47fe62..eebc796f7 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -261,7 +261,7 @@
￥10至尊下载
-
￥10至尊下载
+
￥10至尊下载
普通下载