Merge branch 'hotfix/retention_down' of wmtx/platform into release

修改留存率

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,

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;

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);