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

修改游戏统计bug

Application/Admin/Controller/FinanceController.class.php

@@ -903,6 +903,7 @@ class FinanceController extends ThinkController
         $roleName = I('role_name', '');
         $account = I('account', '');
         $gameId = I('game_id', 0);
+        $channelType = I('channel_type', 0);
 
         $game = M('game', 'tab_')->field(['id', 'unique_code', 'game_name', 'sdk_version'])->where(['id' => $gameId])->find();
 
@@ -917,6 +918,7 @@ class FinanceController extends ThinkController
             'device_type' => $game['sdk_version'],
             'page' => $p,
             'limit' => $limit,
+            'channel_type' => $channelType,
         ]);
 
         $count = 0;

Application/Admin/View/Finance/gameStatistics.html

@@ -232,7 +232,8 @@
                 'sdk_type'=>$_GET['sdk_type'],
                 'game_id'=>$data['game_id'],
                 'game_name'=>$data['game_name'],
-                'partner_id'=>$_REQUEST['partner_id']
+                'partner_id'=>$_REQUEST['partner_id'],
+                'channel_type'=>1,
               ])}">{$data.agg_wm_amount}</a></td>
               <td ><span style="color:red;"><if condition="$data.agg_wm_failed_amount neq ''">{$data.agg_wm_failed_amount}<else/>0</if></span></td>
               <td ><span style="color:red;">
@@ -250,6 +251,7 @@
                 'sdk_type'=>$_GET['sdk_type'],
                 'game_id'=>$data['game_id'],
                 'game_name'=>$data['game_name'],
+                'channel_type'=>2,
                 'partner_id'=>$_REQUEST['partner_id']
               ])}">{$data.agg_amount}</a></td>
               <td ><span style="color:red;"><if condition="$data.agg_failed_amount neq ''">{$data.agg_failed_amount}<else/>0</if></span></td>