From 63054ac0d86b3f0e43cf2361fd0150ccdd43d303 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 2 Jul 2020 16:19:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceCompareController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinanceCompareController.class.php b/Application/Admin/Controller/FinanceCompareController.class.php index af19d85c9..a83460b21 100644 --- a/Application/Admin/Controller/FinanceCompareController.class.php +++ b/Application/Admin/Controller/FinanceCompareController.class.php @@ -486,7 +486,7 @@ class FinanceCompareController extends ThinkController }elseif($way == 3){ $checkarr = $this->ybzf; } - if(!in_array($way,$checkarr)){//渠道不符 + if(!in_array($v['pay_way'],$checkarr)){//渠道不符 $ydata[$v['pay_order_number']]['type'] = 5; $flag = false; continue; From 585f5239845afaacbf5858b18eb48754a18e4e65 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 6 Jul 2020 15:19:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?arpu=E5=88=86=E6=9E=90bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/StatController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index eb690a23d..bb95ec29d 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -838,6 +838,7 @@ AND UNIX_TIMESTAMP( array_multisort($orderColumn, $sort, SORT_REGULAR, $rows); } + $this->checkListOrCountAuthRestMap($map,[]); $this->meta_title = 'ARPU统计'; $this->assign('baseGames', $baseGames); $this->assign('records', $rows); From fa4de7ece5957babedaf2b0db8c53168fb5fb183 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 6 Jul 2020 15:27:26 +0800 Subject: [PATCH 3/3] =?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/Admin/Controller/ExportController.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index f9e332b9f..81e54ec16 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3873,13 +3873,14 @@ class ExportController extends Controller $this->meta_title = '留存统计'; $start = I('start', date('Y-m-d',strtotime('-7 day'))); $end = empty(I('end')) ? time_format(time(),'Y-m-d') : I('end'); - $gameId = I('game_id', 0); $promoteId = I('promote_id', 0); + $baseGameId = I('game_id', 0); + $deviceType = I('device_type', ''); $status = true; $data = false; $error = ''; - if ($gameId == 0) { + if ($baseGameId == 0) { $error = '请选择游戏！'; $status = false; } @@ -3890,6 +3891,10 @@ class ExportController extends Controller $status = false; } if ($status) { + + $baseGame = M('base_game', 'tab_')->where(['id' => $baseGameId])->find(); + $gameId = $deviceType == 'android' ? $baseGame['android_game_id'] : $baseGame['ios_game_id']; + $client = new Client([ 'base_uri' => C('TASK_URL'), 'timeout' => 10.0,