Merge branch 'feature/plateform_statistics' of wmtx/platform into release

修改导出问题

Application/Admin/Controller/ExportController.class.php

@@ -3214,14 +3214,14 @@ class ExportController extends Controller
         $map['puid'] = 0;
         setPowerPromoteIds($map2);
 
-        $data2 = $user->field('fgame_id,count(IF(register_time ' . $today . ',1,null)) as today,
+        $data2 = $user->field('tab_game.relation_game_id,count(IF(register_time ' . $today . ',1,null)) as today,
                 count(IF(register_time ' . $week . ',1,null)) as week,
                 count(IF(register_time ' . $mounth . ',1,null)) as mounth')
             ->join('tab_game on tab_game.id = fgame_id', 'left')
             ->where($map2)
             ->group('tab_game.relation_game_id')
             ->select();
-        $data2 = array_column($data2, null, 'fgame_id');
+        $data2 = array_column($data2, null, 'relation_game_id');
 //        dd($data2);
         $count = count($data);
         foreach ($data as $key => $value) {
@@ -3232,9 +3232,9 @@ class ExportController extends Controller
             if ($data[$key]['relation_game_id'] == 0) {
                 $data[$key]['relation_game_name'] = '其他注册';
             }
-            $data[$key]['today'] = $data2[$value['fgame_id']]['today'];
+            $data[$key]['today'] = $data2[$value['relation_game_id']]['today'];
-            $data[$key]['week'] = $data2[$value['fgame_id']]['week'];
+            $data[$key]['week'] = $data2[$value['relation_game_id']]['week'];
-            $data[$key]['mounth'] = $data2[$value['fgame_id']]['mounth'];
+            $data[$key]['mounth'] = $data2[$value['relation_game_id']]['mounth'];
         }
         $total=A('Platform')->data_total($data);
         if($_REQUEST['data_order']!=''){

Application/Admin/Controller/PlatformController.class.php

@@ -886,6 +886,7 @@ class PlatformController extends ThinkController
                 'company_name' => '公司',
                 "promote_account"=>"会长账号",
                 'admin_username' => '当前市场专员',
+                'relation_game_name' => '游戏',
                 "count"=>"累计充值",
                 "rand"=>"排行榜",
                 "today"=>"今日充值",