From 95672ffc905ede8b4a1b4490b7c408a1c8b9952e Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 3 Aug 2020 16:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php       |  3 +--
 .../Admin/Controller/FinanceController.class.php      |  3 +--
 Application/Common/Common/extend.php                  | 11 +++++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 069ed57ae..e05aa5125 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -8343,7 +8343,7 @@ class ExportController extends Controller
             $aggTotal = $result['data']['total'];
         }
 
-        $exceptIds = [];
+        $exceptIds = getAggExceptIds($gameSets);
         foreach ($xlsData as $key => $value) {
             $aggAmount = '0.00';
             $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios';
@@ -8355,7 +8355,6 @@ class ExportController extends Controller
                 $xlsData[$key]['cash_count'] = $value['cash_count'] = 0;
                 $xlsData[$key]['balance_coin_count'] =$value['balance_coin_count'] = 0;
                 $xlsData[$key]['inside_cash_count'] =$value['inside_cash_count'] = 0;
-                $exceptIds[] = $value['game_id'];
             }
             // $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'('));
             $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 5c9d9e249..3940b4203 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -772,7 +772,7 @@ class FinanceController extends ThinkController
         }
 
         $endTime = time();
-        $exceptIds = [];
+        $exceptIds = getAggExceptIds($gameSets);
         foreach ($data as $key => $value) {
             $aggAmount = '0.00';
             $deviceType = $value['sdk_version'] == 1 ? 'android' : 'ios';
@@ -784,7 +784,6 @@ class FinanceController extends ThinkController
                 $data[$key]['cash_count'] = $value['cash_count'] = 0;
                 $data[$key]['balance_coin_count'] = $value['balance_coin_count'] = 0;
                 $data[$key]['inside_cash_count'] = $value['inside_cash_count'] = 0;
-                $exceptIds[] = $value['game_id'];
             }
             $data[$key]['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.','');
             $data[$key]['agg_amount'] = $value['unique_code'] ? $aggAmount : '0.00';
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 127fdec6f..6a50765dc 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -3037,4 +3037,15 @@ function isAggGame($payUrl)
         return true;
     }
     return false;
+}
+
+function getAggExceptIds($gameSettings)
+{
+    $exceptIds = [];
+    foreach ($gameSettings as $setting) {
+        if (isAggGame($setting['pay_notify_url'])) {
+            $exceptIds[] = $setting['game_id'];
+        }
+    }
+    return $exceptIds;
 }
\ No newline at end of file