From c0fac39c188e4c5804ba9d6e503c9afb59c51a17 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 16 Dec 2019 21:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php | 12 ++++++------
 .../Controller/FinanceController.class.php      | 12 +++++++++++-
 Application/Admin/Model/SpendModel.class.php    | 17 +++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 5dbe2d6e6..8f93aab6c 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -6456,8 +6456,6 @@ if ($key == 'model'){
      *充值-》财务管理-》游戏统计-》导出
      */
     public function exportGameStatistics() {
-        dd($_REQUEST);
-
         $month = I("count_date");
         $xlsName = $month . '游戏统计导出';
 
@@ -6496,10 +6494,12 @@ if ($key == 'model'){
             $data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
         }
 
-        $sumCash = D("spend_count")->sumSpendCountField($map,"cash_count");
-        $sumBalance = D("spend_count")->sumSpendCountField($map,"balance_coin_count");
-        $sumInside = number_format(array_sum($insideDataSum),2,'.','');
-        $sumAll = D("spend_count")->sumSpendCountField($map,"cash_count+balance_coin_count") + array_sum($insideDataSum);
+        $totalData = D("spend")->totalGameStatistics($map);
+
+        $sumCash = $totalData['cash_count'];
+        $sumBalance = $totalData['balance_coin_count'];
+        $sumInside = $totalData['inside_cash_count'];
+        $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $sumData = [['game_name'=>'总计',
             'cash_count'=>$sumCash,
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index a4cf1141b..6efe2a91a 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -719,13 +719,23 @@ class FinanceController extends ThinkController
             $map['_string'] .= " and s.pay_time < {$timeend}";
         }
 
-
+       //游戏统计列表
        $data = D("spend")->gameStatistics($map);
         foreach ($data as $key => $value) {
             $data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
         }
 
+        $totalData = D("spend")->totalGameStatistics($map);
+
+        $sumCash = $totalData['cash_count'];
+        $sumBalance = $totalData['balance_coin_count'];
+        $sumInside = $totalData['inside_cash_count'];
+        $sumAll = $sumCash + $sumBalance + $sumInside;
 
+        $this->assign('sumCash', $sumCash);
+        $this->assign('sumBalance', $sumBalance);
+        $this->assign('sumInside', $sumInside);
+        $this->assign('sumAll', $sumAll);
         $this->assign('data',$data);
 
         $this->display();
diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php
index 5c64df6bd..66ca69505 100644
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
@@ -847,5 +847,22 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count")
         return $data;
     }
 
+    /**
+     *获取游戏统计列表数据
+     */
+    public function totalGameStatistics($map)
+    {
+        $data = $this->alias("s")
+            ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count")
+            ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
+            ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
+            ->where(['s.pay_status' => 1])
+            ->where($map)
+            ->find();
+        return $data;
+    }
+
 
 }