From ff47282287992cb5850fcaa2e290898fb159a868 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 27 Jul 2020 16:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ConsoleController.class.php | 2 +-
 Application/Admin/Controller/FinanceController.class.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php
index 35305e7ef..771cf52d1 100644
--- a/Application/Admin/Controller/ConsoleController.class.php
+++ b/Application/Admin/Controller/ConsoleController.class.php
@@ -127,7 +127,7 @@ class ConsoleController extends Think {
     public function testAggregate()
     {
         $client = new AggregateClient();
-        $result = $client->api('game-data', ['unique_codes' => ['xmjs'], 'started_at' => '2020-06-27', 'ended_at' => '2020-07-27']);
+        $result = $client->api('game-data', ['unique_codes' => ['w123'], 'started_at' => '2019-06-27', 'ended_at' => '2020-07-27']);
         var_dump($result);
     }
 
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 1faf16f15..628198933 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -761,9 +761,9 @@ class FinanceController extends ThinkController
                 $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', '');
             }
             if ($aggAmount != '0.00') {
-                $value['cash_count'] = 0;
-                $value['balance_coin_count'] = 0;
-                $value['inside_cash_count'] = 0;
+                $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,'.','');