公会统计 游戏名称与设备名称分开

Application/Admin/Controller/FinancePromoteController.class.php

@@ -456,6 +456,10 @@ class FinancePromoteController extends AdminController
             $value['inside_cash_count']?:0;
             $value['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.','');
             $value['company_belong'] =getCompanyBlong($value['company_belong']);
+
+            $value['game_name'] =clearGameNameType($value['game_name']);
+            $value['sdk_version'] =$value['sdk_version'] == 1 ? "安卓" : "苹果";
+
             if(!$value['game_name']) $value['game_name'] = "无";
         }
         if (isset($_REQUEST['export'])) {
@@ -469,6 +473,7 @@ class FinancePromoteController extends AdminController
                 "account"=>"会长账号",
                 "company_belong"=>"团体类型",
                 "game_name"=>"游戏",
+                "sdk_version"=>"设备",
                 "cash_count"=>"游戏现金金额",
                 "balance_coin_count"=>"平台币直充支出",
                 "inside_cash_count"=>"内充支出",
@@ -562,7 +567,7 @@ class FinancePromoteController extends AdminController
         if (!empty(I('user_nickname'))) {
             $map['game_player_name'] = array('like',I("user_nickname").'%');
         }
-        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
         $group = "";
         $order = "pay_time DESC";
         if(isset($_REQUEST['export'])){
@@ -572,6 +577,8 @@ class FinancePromoteController extends AdminController
         }
         foreach($data as $key => $value) {
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
+            $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
+            $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果";
         }
         if (isset($_REQUEST['export'])) {
 
@@ -584,6 +591,7 @@ class FinancePromoteController extends AdminController
                 "pay_time"=>"充值时间",
                 "user_account"=>"玩家账号",
                 "game_name"=>"游戏名称",
+                "sdk_version"=>"设备名称",
                 "promote_account"=>"所属推广员",
                 "spend_ip"=>"充值ip",
                 "server_name"=>"游戏区服",
@@ -620,7 +628,7 @@ class FinancePromoteController extends AdminController
     {
         $map['s.pay_status']=1;
         $query = M("spend","tab_")->alias("s")
-            ->field("s.game_id,s.game_name,p.partner as partner_name,
+            ->field("s.game_id,s.game_name,s.sdk_version,p.partner as partner_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,
@@ -713,7 +721,7 @@ class FinancePromoteController extends AdminController
             $map['tab_spend.game_player_name'] = array('like',I("user_nickname").'%');
         }
         $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,tab_spend.user_account,
-        tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,
+        tab_spend.user_nickname,tab_spend.game_name,tab_spend.promote_account,spend_ip,tab_spend.server_name,tab_spend.sdk_version,
         game_player_name,pay_amount,cost,pay_way";
         $group = "";
         $order = "pay_time DESC";
@@ -734,6 +742,9 @@ class FinancePromoteController extends AdminController
         foreach($data as $key => $value) {
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
 
+            $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
+            $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果";
+
             $data[$key]['cost'] = number_format($value['cost'],2,'.','');
             $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.','');
 
@@ -747,6 +758,7 @@ class FinancePromoteController extends AdminController
                 "pay_time"=>"充值时间",
                 "user_account"=>"玩家账号",
                 "game_name"=>"游戏名称",
+                "sdk_version"=>"设备名称",
                 "server_name"=>"游戏区服",
                 "game_player_name"=>"角色名称",
                 "cost"=>"订单金额",

Application/Admin/View/FinancePromote/gameCoinDetail.html

@@ -105,6 +105,7 @@
                     <th>充值时间</th>
                     <th >玩家账号</th>
                     <th >游戏名称</th>
+                    <th >设备名称</th>
                     <th >游戏区服</th>
                     <th >角色名称</th>
                     <th >订单金额</th>
@@ -123,6 +124,7 @@
                         <td >{$data.pay_time}</td>
                         <td >{$data.user_account}</td>
                         <td >{$data.game_name}</td>
+                        <td >{$data.sdk_version}</td>
                         <td >{$data.server_name}</td>
                         <td >{$data.game_player_name}</td>
                         <td >{$data.cost}</td>
@@ -137,7 +139,7 @@
                     </tr>
                 </volist>
                 <tr>
-                    <td colspan="6" ><span>总计</span></td>
+                    <td colspan="7" ><span>总计</span></td>
                     <td ><span><if condition="$total_cost neq ''">{$total_cost}<else/>0.00</if></span></td>
                     <td><if condition="$total_pay_amount neq ''">{$total_pay_amount}<else/>0.00</if></td>
                     <td colspan="2"> </td>

Application/Admin/View/FinancePromote/gameStatistics.html

@@ -180,6 +180,7 @@
           <th>团体类型</th>
 
           <th >游戏</th>
+          <th >设备</th>
 
           <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
 
@@ -211,6 +212,7 @@
                 <td >{$data.account}</td>
                 <td >{$data.company_belong}</td>
                 <td >{$data.game_name}</td>
+                <td >{$data.sdk_version}</td>
                 <td >{$data.cash_count}</td>
                 <td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>0,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],p=>1,row=>10]))}">{$data.balance_coin_count}</td>
                 <td class="coin-detail" data-pay_type="-1" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>-1,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],p=>1,row=>10]))}">
@@ -223,7 +225,7 @@
               </tr>
             </volist>
             <tr>
-              <td colspan="4" ><span>总计</span></td>
+              <td colspan="5" ><span>总计</span></td>
               <td ><span><if condition="$sumCash neq ''">{$sumCash}<else/>0</if></span></td>
               <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
               <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>

Application/Admin/View/FinancePromote/gameStatisticsDetail.html

@@ -164,6 +164,7 @@
           <th >玩家账号</th>
 
           <th >游戏名称</th>
+          <th >设备名称</th>
 
           <th >所属推广员</th>
 
@@ -199,6 +200,7 @@
               <td >{$data.pay_time}</td>
               <td >{$data.user_account}</td>
               <td >{$data.game_name}</td>
+              <td >{$data.sdk_version}</td>
               <td >{$data.promote_account}</td>
               <td >{$data.spend_ip}</td>
               <td >{$data.server_name}</td>