Merge branch 'hotfix/master_gamestatistics' of wmtx/platform into master

游戏统计错位bug提交

Application/Admin/Controller/ExportController.class.php

@@ -7235,6 +7235,7 @@ class ExportController extends Controller
 
         $xlsCell = array(
             array('game_name','游戏'),
+            array('sdk_version','设备类型'),
             array('game_type_name','游戏类型'),
             array('partner_name','合作公司'),
             array('cash_count','游戏现金金额'),
@@ -7274,6 +7275,13 @@ class ExportController extends Controller
         $xlsData = D("spend")->gameStatistics($map);
         foreach ($xlsData as $key => $value) {
             $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
+
+            if ($value['sdk_version'] == 1) {
+                $xlsData[$key]['sdk_version'] = '安卓';
+            } else if ($value['sdk_version'] == 2) {
+                $xlsData[$key]['sdk_version'] = '苹果';
+            }
+
         }
 
         $totalData = D("spend")->totalGameStatistics($map);

Application/Admin/View/Finance/gameStatistics.html

@@ -230,7 +230,7 @@
             </tr>
           </volist>
           <tr>
-            <td colspan="3" ><span>总计</span></td>
+            <td colspan="4" ><span>总计</span></td>
             <td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>