From 00a5fed6fdc726e71a4f060611d02a42cde8e151 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 17 Feb 2020 11:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Model/SpendModel.class.php       | 2 +-
 Application/Admin/View/Finance/gameStatistics.html | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php
index 9242d01ec..bab8b51aa 100644
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
@@ -844,7 +844,7 @@ class SpendModel extends Model
             ->field("s.game_id,s.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")
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version")
             ->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, 'pay_game_status' => 1])
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index b486d0ee5..59bbbf751 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -161,6 +161,8 @@
 
           <th >游戏</th>
 
+          <th >设备类型</th>
+
           <th>游戏类型</th>
 
           <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
@@ -191,6 +193,7 @@
             <tr>
               <td ><if condition="$data.partner_name neq ''">{$data.partner_name}<else/>无</if></td>
               <td ><if condition="$data.game_name neq ''">{$data.game_name}<else/>无</if></td>
+              <td ><if condition="$data.sdk_version eq 1">安卓<elseif condition="$data.sdk_version eq 2"/>苹果</if></td>
               <td ><if condition="$data.game_type_name neq ''">{$data.game_type_name}<else/>无</if></td>
               <td ><if condition="$data.cash_count neq ''">{$data.cash_count}<else/>0</if></td>
               <td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer"