From cc966711d180bf76e76921a74e468db4e63b730c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Mar 2020 10:38:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=90=8D=E7=A7=B0=E4=B8=8E=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancePromoteController.class.php | 18 +++++++++++++++--- .../View/FinancePromote/gameCoinDetail.html | 4 +++- .../View/FinancePromote/gameStatistics.html | 4 +++- .../FinancePromote/gameStatisticsDetail.html | 2 ++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 50173fd69..5c406446d 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/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"=>"订单金额", diff --git a/Application/Admin/View/FinancePromote/gameCoinDetail.html b/Application/Admin/View/FinancePromote/gameCoinDetail.html index e49138ea4..86d11a271 100644 --- a/Application/Admin/View/FinancePromote/gameCoinDetail.html +++ b/Application/Admin/View/FinancePromote/gameCoinDetail.html @@ -105,6 +105,7 @@ 充值时间 玩家账号 游戏名称 + 设备名称 游戏区服 角色名称 订单金额 @@ -123,6 +124,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -137,7 +139,7 @@ - 总计 + 总计 {$total_cost}0.00 {$total_pay_amount}0.00 diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index 2b42d54c4..64890d9d2 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -180,6 +180,7 @@ 团体类型 游戏 + 设备
游戏现金金额第三方支付（微信，支付宝，快捷）。
@@ -211,6 +212,7 @@ {$data.account} {$data.company_belong} {$data.game_name} + {$data.sdk_version} {$data.cash_count} {$data.balance_coin_count} @@ -223,7 +225,7 @@ - 总计 + 总计 {$sumCash}0 {$sumBalance}0 {$sumInside}0 diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index a380574d6..6239bbe8c 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -164,6 +164,7 @@ 玩家账号 游戏名称 + 设备名称 所属推广员 @@ -199,6 +200,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name}