From bc28933369856f09bb51807fba4e55ea7fba32e1 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 27 Dec 2019 11:10:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B-=E3=80=8B=E5=AF=BC=E5=87=BA=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=88=90=E5=8A=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 5825a0213..2b99a255e 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -7208,7 +7208,7 @@ class ExportController extends Controller $map['_string'] .= " pay_time < {$timeend}"; } - $map['pay_status'] = 1; + $map['pay_game_status'] = 1; if (!empty(I("game_id"))) { $map['game_id'] = I("game_id"); } @@ -7224,6 +7224,7 @@ class ExportController extends Controller $order = "pay_time DESC"; $xlsData = D('spend')->getSpendData($map,$field,$group,$order); +// dd(D("spend")->_sql()); foreach($xlsData as $key => $value) { $xlsData[$key]['pay_way'] = getPayType($value['pay_way']); } From f580b442895843d8a8668719c8c451fb23c125ed Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Dec 2019 11:39:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1=E5=8C=BA=E6=9C=8D=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PlatformController.class.php | 17 ++++++++++++++++- .../View/Platform/promotepay_statistics.html | 18 +++++++++++------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 24d2b4c87..0774439ec 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -640,7 +640,7 @@ class PlatformController extends ThinkController if (isset($_REQUEST['game_name'])) { $map['s.game_name'] = $_REQUEST['game_name']; if (isset($_REQUEST['server_id'])) { - $map['s.server_name'] = $_REQUEST['server_id']; + $map['s.server_id'] = $_REQUEST['server_id']; unset($_REQUEST['server_id']); } } @@ -1002,6 +1002,21 @@ class PlatformController extends ThinkController $this->display(); } + public function getSpendServer(){ + if(isset($_REQUEST['game_name'])){ + $game = M('Game','tab_')->field('id')->where(['game_name'=>$_REQUEST['game_name']])->find(); + $game_id = $game['id']; + + } + if(isset($_REQUEST['game_id'])){ + $game_id = $_REQUEST['game_id']; + } + $map['game_id'] = $game_id; + $map['server_name'] = array('neq',''); + $data = M('server','tab_')->field('server_name,server_id')->where($map)->group('server_name')->select(); + $this->AjaxReturn($data); + } + public function uc_deposit($p = 1) { if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index ef0284de1..53fd236c2 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -353,15 +353,17 @@ // endDate:date }) $("#game_id").change(function(){ + console.log($("#game_id option:selected").attr('game-id')); $.ajax({ - url:"{:U('Ajax/getSpendServer')}", + url:"{:U('getSpendServer')}", type:"post", data:{game_id:$("#game_id option:selected").attr('game-id')}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } $("#server_id").empty(); $("#server_id").append(str); @@ -370,18 +372,20 @@ } }) }); - var game_id = "{:I('game_name')}"; + var game_name = "{:I('game_name')}"; var game_server = "{:I('server_id')}"; - if(game_id){ + if(game_name){ + console.log({game_name:game_name}) $.ajax({ - url:"{:U('Ajax/getSpendServer')}", + url:"{:U('getSpendServer')}", type:"post", - data:{game_id:game_id,type:2}, + data:{game_name:game_name}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } $("#server_id").empty(); $("#server_id").append(str); From a5c926b2cddb18f1c5c47e825d84697856c74f6c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 27 Dec 2019 11:50:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E9=A2=84=E5=91=8A=E5=8C=BA=E6=9C=8D=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ServerNoticeController.class.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Application/Admin/Controller/ServerNoticeController.class.php b/Application/Admin/Controller/ServerNoticeController.class.php index 8f6974eb1..e6a893d5c 100644 --- a/Application/Admin/Controller/ServerNoticeController.class.php +++ b/Application/Admin/Controller/ServerNoticeController.class.php @@ -262,13 +262,9 @@ class ServerNoticeController extends ThinkController { $game_map = []; if ($game_name) { $game_map['relation_game_name'] = $game_name; - }else { - $this->AjaxReturn([]); } if ($sdk_version) { $map['server_version'] = $game_map['sdk_version'] = $sdk_version; - }else { - $this->AjaxReturn([]); } $game = M("Game", 'tab_')->where($game_map)->getField('id', true);