Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

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])

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"