From 2b7f434955d76a85457c1a84955ab9d0b86d6a1c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 20 Mar 2020 10:29:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86-=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=AE=A1=E7=90=86=20=E6=B8=B8=E6=88=8F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=88=97=E8=A1=A8=E5=92=8C=E5=AF=BC=E5=87=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 3 +-- Application/Admin/Model/SpendModel.class.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 8c4465138..ee3230158 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -7894,7 +7894,7 @@ class ExportController extends Controller $xlsData = D("spend")->gameStatistics($map); foreach ($xlsData as $key => $value) { - $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'(')); + // $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']; if ($value['sdk_version'] == 1) { $xlsData[$key]['sdk_version'] = '安卓'; @@ -7902,7 +7902,6 @@ class ExportController extends Controller $xlsData[$key]['sdk_version'] = '苹果'; } } - $totalData = D("spend")->totalGameStatistics($map); $sumCash = $totalData['cash_count']; diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 67ccfa30a..528cb3c5c 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -841,7 +841,7 @@ class SpendModel extends Model public function gameStatistics($map, $row = 0, $page = 1) { $query = M("Spend s use index(game_time)","tab_") - ->field("s.game_id,s.game_name,p.partner as partner_name, g.game_type_name, + ->field("s.game_id,g.relation_game_name game_name,p.partner as partner_name, g.game_type_name, 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,g.sdk_version")