From 8ef0543b561ae95bd639aafc037736fb1223c98c Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 2 Mar 2020 18:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=E9=94=99?=
 =?UTF-8?q?=E4=BD=8Dbug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 8 ++++++++
 Application/Admin/View/Finance/gameStatistics.html      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 78804a5bf..c3c548a23 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/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);
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index 59bbbf751..99bdc9103 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/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>