From 0ca2f2a064555949d62cfb5ff59ded9d32ba451f Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Apr 2020 12:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 5 ++++-
 Application/Admin/View/Finance/gameStatistics.html      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 5d391c4ab..f0eac80a3 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8059,6 +8059,7 @@ class ExportController extends Controller
             array('balance_coin_count','平台币直充支出'),
             array('inside_cash_count','内充支出'),
             array('all_cash_count','游戏内充值合计'),
+            array('notice_fail_count','通知失败合计'),
         );
 
         $map = [];
@@ -8104,13 +8105,15 @@ class ExportController extends Controller
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];
+        $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $sumData = [['game_name'=>'总计',
             'cash_count'=>$sumCash,
             'balance_coin_count'=>$sumBalance,
             'inside_cash_count'=>$sumInside,
-            'all_cash_count'=>$sumAll]];
+            'all_cash_count'=>$sumAll,
+            'notice_fail_count'=>$sumNoticeFail]];
         $xlsData = array_merge($xlsData,$sumData);
         $this->exportAddOperationLog("Finance/gameStatistics","充值-财务管理-游戏统计-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index 0657ad863..ce781fe72 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -240,7 +240,7 @@
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>
             <td><if condition="$sumAll neq ''">{$sumAll}<else/>0</if></td>
-            <td><span style="color: red"><if condition="$sumAll neq ''">{$sumNoticeFail}<else/>0</if></span></td>
+            <td><span style="color: red"><if condition="$sumNoticeFail neq ''">{$sumNoticeFail}<else/>0</if></span></td>
             <td>
               <a href="{:U('Finance/gameStatisticsDetail',
                 array(