From 2b7f434955d76a85457c1a84955ab9d0b86d6a1c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 20 Mar 2020 10:29:32 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86=20=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=88=97=E8=A1=A8=E5=92=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=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") From 9064fc7c584a95396081ed487b8c032767c032ca Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 20 Mar 2020 17:08:07 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=90=AB=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 5 ++ .../Controller/ExportController.class.php | 5 +- .../Controller/FinanceController.class.php | 71 +++++++++++++++++-- .../Admin/View/Finance/coinDetail.html | 15 ++-- .../View/Finance/gameStatisticsDetail.html | 13 +--- 5 files changed, 80 insertions(+), 29 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 1642dc963..4a6b153e6 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -886,3 +886,8 @@ function getSDKTypeName($sdkType, $chinese = false) return $sdkName; } +//游戏名称取消 (安卓版),(苹果版) +function clearGameNameType($game_name) +{ + return preg_replace("/\(.*\)/","",$game_name); +} diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index ee3230158..eba9d5083 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8010,6 +8010,7 @@ class ExportController extends Controller array('pay_time','充值时间'), array('user_account','玩家账号'), array('game_name','游戏名称'), + array('sdk_version','设备名称'), array('server_name','游戏区服'), array('game_player_name','角色名称'), array('cost','订单金额'), @@ -8074,7 +8075,7 @@ class ExportController extends Controller $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"; @@ -8096,6 +8097,8 @@ class ExportController extends Controller foreach($xlsData as $key => $value) { $xlsData[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $xlsData[$key]['sdk_version'] =$xlsData[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; } $map['pay_game_status'] = 1; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index dc7d416da..f5403389f 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -836,14 +836,41 @@ class FinanceController extends ThinkController $map['game_player_name'] = array('like',I("user_nickname").'%'); } // var_dump($map);die(); - $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,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version"; $group = ""; $order = "pay_time DESC"; - $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row); + if(isset($_REQUEST['export'])){ + $data = D('spend')->getSpendData($map,$field,$group,0,0,$row); + }else{ + $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row); + } foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); + $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + } + if(isset($_REQUEST['export'])){ + //操作日志 + $GetData = $_GET; + unset($GetData['export']); + $dcop = array( + "pay_order_number"=>"支付订单号", + "pay_time"=>"充值时间", + "user_account"=>"玩家账号", + "game_name"=>"游戏名称", + "sdk_version"=>"设备类型", + "promote_account"=>"所属推广员", + "spend_ip"=>"充值ip", + "server_name"=>"游戏区服", + "game_player_name"=>"角色名称", + "cost"=>"订单金额", + "pay_amount"=>"实付金额", + "pay_way"=>"充值方式" + ); + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-订单查看-导出"]); + data2csv($data,"游戏统计订单查看",$dcop); } $totalData = D('spend')->totalGameStatistics($map, false); @@ -937,7 +964,7 @@ class FinanceController extends ThinkController } // var_dump($map);die(); $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"; @@ -949,16 +976,46 @@ class FinanceController extends ThinkController $field2 = $field . ',balance'; $join = 'left join tab_user as u on u.id = tab_spend.user_id'; } - - $data = D('spend')->getSpendData($map, $field2, $group, $order, $page, $row, $join); - + + if(isset($_REQUEST['export'])){ + $data = D('spend')->getSpendData($map, $field2, $group, $order, 0, 0, $join); + }else{ + $data = D('spend')->getSpendData($map, $field2, $group, $order, $page, $row, $join); + } 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,'.',''); } + if(isset($_REQUEST['export'])){ + //操作日志 + $GetData = $_GET; + unset($GetData['export']); + $dcop = array( + "pay_order_number"=>"支付订单号", + "pay_time"=>"充值时间", + "user_account"=>"玩家账号", + "game_name"=>"游戏名称", + "sdk_version"=>"设备名称", + "server_name"=>"游戏区服", + "game_player_name"=>"角色名称", + "cost"=>"订单金额", + "pay_amount"=>"实付金额", + "pay_way"=>"充值方式" + ); + if ($map['pay_way'] ==-1) { + $title = "内充支出明细"; + $dcop["bind_balance"]="绑定币余额"; + } elseif ($map['pay_way'] ==0) {//平台币 + $title = "平台币直充明细"; + $dcop["balance"]="平台币余额"; + } + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-{$title}-导出"]); + data2csv($data,$title,$dcop); + } $count = D("spend")->getSpendData($map,$field,$group,$order); $count = count($count); $page = set_pagination($count,$row); diff --git a/Application/Admin/View/Finance/coinDetail.html b/Application/Admin/View/Finance/coinDetail.html index d9ba26176..1b8a7e8bd 100644 --- a/Application/Admin/View/Finance/coinDetail.html +++ b/Application/Admin/View/Finance/coinDetail.html @@ -50,16 +50,7 @@ 搜索 - 导出 + 导出 @@ -76,6 +67,7 @@ 充值时间 玩家账号 游戏名称 + 设备名称 游戏区服 角色名称 订单金额 @@ -94,6 +86,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -108,7 +101,7 @@ - 总计 + 总计 {$total_cost}0.00 {$total_pay_amount}0.00 diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index 67a583667..57681aea9 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -93,16 +93,7 @@ 搜索 - 导出 + 导出 @@ -123,6 +114,7 @@ 玩家账号 游戏名称 + 设备类型 所属推广员 @@ -158,6 +150,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name} From cc966711d180bf76e76921a74e468db4e63b730c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Mar 2020 10:38:45 +0800 Subject: [PATCH 03/16] =?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} From 6d3f1b67e29649024dfd54a79fe129f7b0fbff6a Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 23 Mar 2020 16:01:20 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E9=A6=96=E9=A1=B5=20=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PayChannelController.class.php | 61 +++++++++++++------ Application/Admin/View/PayChannel/index.html | 13 +++- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 667021e46..955bcffea 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -59,7 +59,7 @@ class PayChannelController extends ThinkController //游戏币计算 $data = M('spend use index(pay_channel)','tab_') - ->field("game_name,sum(pay_amount) as pay_amount,game_id") + ->field("game_name,sum(pay_amount) as pay_amount,game_id,sdk_version") ->where($map) ->group('game_id') ->order('pay_amount desc') @@ -73,7 +73,7 @@ class PayChannelController extends ThinkController $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") - ->field("tab_pay_info.game_name,0 as pay_amount,sum(tab_deposit.pay_amount) as platform_coin,0 as test_coin,tab_pay_info.game_id") + ->field("tab_pay_info.game_name,0 as pay_amount,sum(tab_deposit.pay_amount) as platform_coin,0 as test_coin,tab_pay_info.game_id,tab_pay_info.sdk_version") ->where($coinMap) ->group("game_id") ->select(); @@ -125,7 +125,8 @@ class PayChannelController extends ThinkController $data[$key]['platform_coin'] = $handleCoinData[$value['game_id']]?$handleCoinData[$value['game_id']]:0; $data[$key]['test_coin'] = $handleTestData[$value['game_id']]?$handleTestData[$value['game_id']]:0; $data[$key]['test_platform_coin'] = $handleTestCoinData[$value['game_id']]?$handleTestCoinData[$value['game_id']]:0; - + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; } $superMap = $map; // unset($superMap['promote_id']); @@ -253,7 +254,7 @@ class PayChannelController extends ThinkController $this->assign('_page', $page); } - $sumData['game'] = '汇总'; + $sumData['game_name'] = '汇总'; $sumData['pay_amount'] = 0; $sumData['platform_coin'] = 0; $sumData['test_coin'] = 0; @@ -291,37 +292,58 @@ class PayChannelController extends ThinkController $sumData['sum'] = $sumData['pay_amount'] +$sumData['test_coin'] + $sumData['platform_coin']; $coinSum = $coinSum + $offcialData['pay_amount'] + $spreadData['pay_amount']+$offcialTestCost; } + $sum_pay_amount = M('test_order', 'tab_')->where($maptestorder)->field('sum(pay_amount) as sum_order_amount')->find(); + $moneyAllCount = array_sum(array_column($channelData, 'pay_amount')); if($_REQUEST['export'] == 1) { $title = array('产品名称','游戏现金金额','平台币直冲金额','测试金额','支付渠道内合计'); $superSignData['game_name'] = '超级签'; + $superSignData['platform_coin'] = '0'; + $superSignData['sdk_version'] = ''; + $offcialData['game_name'] = '官网'; - $spreadData['game_name'] = '推广后台'; + $offcialData['platform_coin'] = $offcialData['pay_amount']; + $offcialData['pay_amount'] = "0"; + $offcialData['sdk_version'] = ""; - $superSignData['platform_coin'] = '0'; - $offcialData['platform_coin'] = '0'; - $spreadData['platform_coin'] = '0'; + + $spreadData['game_name'] = '推广后台'; + $spreadData['platform_coin'] = $spreadData['pay_amount']; + $spreadData['pay_amount'] = '0'; $spreadData['test_coin'] = '0'; + $spreadData['sdk_version'] = ''; + + $sumData['sdk_version'] = ''; + + $testOrder["game_name"] = "测试环境内外网平台"; + $testOrder["sdk_version"] = ""; + $testOrder["pay_amount"] =$sum_pay_amount['sum_order_amount'] ?: "0"; + $testOrder["platform_coin"] ="0"; + $testOrder['test_coin'] = '0'; + $testOrder['sum'] = $sum_pay_amount['sum_order_amount'] ?: "0"; + + //充值方式统计 $payTypeDataExport['game_name'] = '充值方式统计'; foreach($payTypeData as $key => $value) { if ($value) { - $payTypeDataExport['pay_amount'] .= $key.'：'.$value." "; + $payTypeDataExport['sdk_version'] .= $key.'：'.$value." "; } } - $payTypeDataExport['pay_amount'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". + $payTypeDataExport['sdk_version'] .= "平台币直充总金额(2019.12.18号以前的不显示在列表中，此项也不计入充值方式统计)：". ($coinSum); $channelDataExport['game_name'] = '支付渠道'; + $channelDataExport2['game_name'] = '支付渠道占比'; foreach($channelData as $key => $value) { if ($value) { - $channelDataExport['pay_amount'] .= $value['pay_way'].'：'.$value['pay_amount']." "; + $channelDataExport['sdk_version'] .= $value['pay_way'].'：'.$value['pay_amount']." "; + $channelDataExport2['sdk_version'] .= $value['pay_way'].'：'.round($value['pay_amount']*100/ $moneyAllCount,2)."% "; } } - unset($sumData['test_platform_coin']); if ($_REQUEST['game_id']) { @@ -333,10 +355,9 @@ class PayChannelController extends ThinkController $GetData = $_GET; unset($GetData['export']); addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-支付渠道查看-导出"]); - - db2csv(array_merge(array_merge(array_merge(array_merge( - array_merge(array_merge( - array_merge($data,[0=>$superSignData]),[0=>$offcialData])),[0=>$spreadData],[0=>$sumData])),[0=>$payTypeDataExport]),[0=>$channelDataExport]),'支付渠道统计导出',$title); + //处理导出数据 + data2csv(array_merge($data,[$superSignData],[$offcialData],[$spreadData],[$sumData],[$testOrder],[$payTypeDataExport],[$channelDataExport],[$channelDataExport2]),"支付渠道统计导出",array( + "game_name"=>"产品名称","sdk_version"=>"设备名称","pay_amount"=>"游戏现金金额","platform_coin"=>"平台币直冲金额","test_coin"=>"测试金额","sum"=>"支付渠道内合计")); } @@ -348,15 +369,15 @@ class PayChannelController extends ThinkController $this->meta_title = "支付渠道统计"; $size = $row;//每页显示的记录数 $data = array_slice($data, ($arraypage - 1) * $size, $size); - $sum_pay_amount = M('test_order', 'tab_')->where($maptestorder)->field('sum(pay_amount) as sum_order_amount')->find(); + //平台币直充金额，下面列表 $this->assign('coinSum',$coinSum); $channelData2 = $channelData; $arr_merge = array_merge($channelData2,$testorderChannelArr); - $this->assign('sumData',$sumData); - $this->assign('channelData',$arr_merge); - $this->assign('listdata',$data); + $this->assign('sumData',$sumData); + $this->assign('channelData',$arr_merge); + $this->assign('listdata',$data); //统计总额和比例 $this->assign('channelData2',$channelData); $this->assign('sum_pay_amount',$sum_pay_amount); diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index 59fdfc13c..0a626a9e9 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -137,6 +137,7 @@
产品名称平台官网，超级签，游戏等等产品
+
设备名称游戏的设备名称
游戏现金金额第三方支付充值到游戏的金额
@@ -165,6 +166,7 @@ {$data.game_name} + {$data.sdk_version} {$data['pay_amount']} @@ -179,6 +181,7 @@ 超级签 + {$superSignData['pay_amount']}0.00 0.00 {$superSignData.test_coin}0.00 @@ -189,6 +192,7 @@ 官网 + 0.00 {$offcialData['pay_amount']} {$offcialData.test_coin}0.00 @@ -199,6 +203,7 @@ 推广后台 + 0.00 {$spreadData['pay_amount']} 0.00 @@ -210,6 +215,7 @@ 汇总 + {$sumData['pay_amount']}0.00 {$sumData['platform_coin']}0.00 {$sumData['test_coin']} @@ -220,6 +226,7 @@ 测试环境内外网平台 + {$sum_pay_amount['sum_order_amount']}0.00 0.00 0.00 @@ -231,7 +238,7 @@ 充值方式统计 - + {$key}：{$payTypeData}          @@ -242,7 +249,7 @@ 支付渠道 - + {$channelData.pay_way}：{$channelData.pay_amount}          @@ -250,7 +257,7 @@ 支付渠道占比 - + {$channel.pay_way}: From 84fe51efef06f25f8408fbe14618ff5e931ac657 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Mar 2020 09:45:07 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93/?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A2=E5=8D=95=20=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 10 +++- .../Controller/PayChannelController.class.php | 47 ++++++++++++------- .../Controller/TestOrderController.class.php | 9 +++- .../Admin/View/PayChannel/gameDetail.html | 2 + .../Admin/View/PayChannel/testDetail.html | 3 ++ Application/Admin/View/TestOrder/lists.html | 3 ++ 6 files changed, 55 insertions(+), 19 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index eba9d5083..e185ea878 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2394,6 +2394,7 @@ class ExportController extends Controller array('user_account', '测试账号'), array('pay_time', '充值时间'), array('game_name', '游戏名称'), + array('sdk_version', '设备名称'), array('order_amount', '订单金额'), array('pay_amount', '实付金额'), array('pay_way', '充值方式'), @@ -2440,7 +2441,10 @@ class ExportController extends Controller } - $orderData = M('test_order', 'tab_')->where($map)->order('add_time desc')->select(); + $orderData =M('test_order t', 'tab_') + ->field("t.*,g.sdk_version") + ->join("tab_game g on t.game_id = g.id","left") + ->where($map)->order('add_time desc')->select(); $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); $xlsData = []; @@ -2450,12 +2454,14 @@ class ExportController extends Controller }else { $order_list['server_type'] = '测试外网'; } + $order_list['game_name'] =clearGameNameType($v['game_name']); + $order_list['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; $order_list['order_type'] = get_order_type($v['order_type']); $order_list['order_no'] = $v['order_no']; $order_list['cp_order_no'] = $v['cp_order_no']; $order_list['user_account'] = $v['user_account']; $order_list['pay_time'] = date('Y-m-d H:i:s', $v['pay_time']); - $order_list['game_name'] = $v['game_name']; + // $order_list['game_name'] = $v['game_name']; $order_list['order_amount'] = $v['order_amount']; $order_list['pay_amount'] = $v['pay_amount']; $order_list['pay_way'] = get_pay_way($v['pay_way']); diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 955bcffea..ca6371d92 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -589,7 +589,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($coinMap,'tab_deposit.promote_id'); $spendData = M('spend','tab_') - ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") + ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way,sdk_version") ->where($map) ->select(false); // var_dump($spendData);die(); @@ -599,7 +599,7 @@ class PayChannelController extends ThinkController $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, - tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name, + tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_pay_info.sdk_version, tab_deposit.pay_amount as cost,tab_deposit.pay_amount,tab_deposit.pay_way") ->where($coinMap) ->select(false); @@ -656,6 +656,11 @@ class PayChannelController extends ThinkController foreach ($data as $key => $value) { $data[$key]['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']); + + if ($model == 'spend') { + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + } } $sql = "select count(1) as count from ({$unionSql})t;"; @@ -772,7 +777,7 @@ class PayChannelController extends ThinkController } $spendData = M('spend','tab_') - ->field("pay_order_number,pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") + ->field("pay_order_number,pay_time,user_account,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,cost,pay_amount,pay_way") ->where($map) ->select(false); // var_dump($spendData);die(); @@ -782,7 +787,7 @@ class PayChannelController extends ThinkController $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") - ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, + ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_pay_info.sdk_version,tab_deposit.promote_account, tab_deposit.pay_ip as spend_ip,tab_pay_info.server_name,tab_pay_info.game_player_name, tab_deposit.pay_amount as cost,tab_deposit.pay_amount,tab_deposit.pay_way") ->where($coinMap) @@ -825,7 +830,7 @@ class PayChannelController extends ThinkController if ($model == 'spend') { - $xlsCell = array('支付订单号', '充值时间', '玩家账号', '游戏名称', '所属推广员', '充值ip', '游戏区服', '角色名称', '订单金额', '实付金额', '充值方式'); + $xlsCell = array('支付订单号', '充值时间', '玩家账号', '游戏名称', '设备名称','所属推广员', '充值ip', '游戏区服', '角色名称', '订单金额', '实付金额', '充值方式'); $unionSql = "{$spendData} UNION ALL {$coinData}"; } elseif($model == 'coin_pay_order') { $xlsCell = array('支付订单号', '充值时间', '所属推广员', '订单金额', '实付金额', '充值方式'); @@ -863,8 +868,12 @@ class PayChannelController extends ThinkController $sql = "select * from ({$unionSql})t order by pay_time DESC limit {$page},{$perSize};"; $xlsData = M()->query($sql); - + foreach ($xlsData as $k => $v) { + if ($model == 'spend') { + $v['game_name'] =clearGameNameType($v['game_name']); + $v['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; + } $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']); $v['pay_way'] = get_pay_way($v['pay_way']); @@ -973,7 +982,7 @@ class PayChannelController extends ThinkController } // setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') - ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") + ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status,sdk_version") ->join('inner join tab_test_white_list on tab_spend.user_id=tab_test_white_list.user_id') ->where($map) // ->order('tab_spend.id DESC') @@ -1001,7 +1010,7 @@ class PayChannelController extends ThinkController ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->join("inner join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id") ->field("pay_order_number,tab_deposit.order_number,tab_deposit.user_account,tab_deposit.create_time as pay_time, - tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, + tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_pay_info.sdk_version,tab_deposit.pay_amount as cost, tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") ->where($coinMap) ->select(false); @@ -1027,6 +1036,9 @@ class PayChannelController extends ThinkController $data[$key]['pay_type'] = get_pay_way($value['pay_type']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + if ($value['pay_way']==1 || $value['pay_way']==9 ) { $data[$key]['pay_way'] = '支付宝'; } else if ($value['pay_way']==2 || $value['pay_way']==3 ) { @@ -1098,6 +1110,8 @@ class PayChannelController extends ThinkController $data[$key]['pay_time'] = Date('Y-m-d H:i:s',$value['pay_time']); $data[$key]['pay_type'] = get_pay_way($value['pay_type']); + $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + $data[$key]['sdk_version'] ="苹果"; if ($value['pay_way']==1 || $value['pay_way']==9 ) { $data[$key]['pay_way'] = '支付宝'; @@ -1288,7 +1302,7 @@ class PayChannelController extends ThinkController if ($model == 'spend') { - $xlsCell = array('支付订单号', 'cp订单号', '测试账号', '充值时间', '游戏名称', '游戏区服', + $xlsCell = array('支付订单号', 'cp订单号', '测试账号', '充值时间', '游戏名称','设备名称', '游戏区服', '角色名称', '订单金额', ' 实付金额 ', '充值方式', '支付渠道', '游戏通知状态',); mb_convert_variables('GBK', 'UTF-8', $xlsCell); @@ -1300,7 +1314,7 @@ class PayChannelController extends ThinkController // setPowerPromoteIds($map,'promote_id'); $data = M('spend','tab_') - ->field("pay_order_number,order_number,user_account,pay_time,game_name,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") + ->field("pay_order_number,order_number,user_account,pay_time,game_name,sdk_version,server_name,game_player_name,cost,pay_amount,pay_way as pay_type,pay_way,pay_game_status") ->join('inner join tab_test_white_list on tab_spend.user_id=tab_test_white_list.user_id') ->where($map) // ->order('tab_spend.id DESC') @@ -1331,7 +1345,7 @@ class PayChannelController extends ThinkController ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->join("inner join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id") ->field("pay_order_number,tab_deposit.order_number,tab_deposit.user_account,tab_deposit.create_time as pay_time, - tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, + tab_pay_info.game_name,tab_pay_info.sdk_version,tab_pay_info.server_name,tab_pay_info.game_player_name,tab_deposit.pay_amount as cost, tab_deposit.pay_amount,tab_deposit.pay_way as pay_type,tab_deposit.pay_way,'' as pay_game_status") ->where($coinMap) ->select(false); @@ -1354,6 +1368,8 @@ class PayChannelController extends ThinkController $value['pay_order_number'] = "'".$value['pay_order_number']; $value['order_number'] = "'".$value['order_number']; + $value['game_name'] =clearGameNameType($value['game_name']); + $value['sdk_version'] =$value['sdk_version'] == 1 ? "安卓" : "苹果"; if (!$value['order_number']) { $data[$key]['order_number'] = '无'; @@ -1412,7 +1428,7 @@ class PayChannelController extends ThinkController } elseif($model == 'game_supersign') { - $xlsCell = array('支付订单号', '测试账号', '充值时间', '游戏名称', + $xlsCell = array('支付订单号', '测试账号', '充值时间', '游戏名称','设备名称', '订单金额', ' 实付金额 ', '充值方式', '支付渠道',); mb_convert_variables('GBK', 'UTF-8', $xlsCell); @@ -1450,19 +1466,18 @@ class PayChannelController extends ThinkController $page = ($i - 1) * $perSize; $data = M('game_supersign', 'tab_') - ->field("order_id as pay_order_number,account as user_account,pay_time,game_name,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way") + ->field("order_id as pay_order_number,account as user_account,pay_time,game_name,@t:='苹果' sdk_version,pay_price as cost,pay_price as pay_amount,pay_way as pay_type,pay_way") ->join('inner join tab_test_white_list on tab_game_supersign.user_id=tab_test_white_list.user_id') ->join('left join tab_game on tab_game_supersign.game_id= tab_game.id') ->where($map) ->limit($page ,$perSize) ->order('tab_game_supersign.id DESC') ->select(); - foreach ($data as $key => $value) { $value['pay_order_number'] = "'".$value['pay_order_number']; $value['pay_time'] = Date('Y-m-d H:i:s', $value['pay_time']); - + $value['game_name'] =clearGameNameType($value['game_name']); $value['pay_type'] = get_pay_way($value['pay_type']); if ($value['pay_way'] == 1 || $value['pay_way'] == 9) { @@ -1499,7 +1514,7 @@ class PayChannelController extends ThinkController $map['create_time'] = $map['pay_time']; unset($map['pay_time']); } -// setPowerPromoteIds($map,'tab_deposit.promote_id'); + // setPowerPromoteIds($map,'tab_deposit.promote_id'); $accessNum = M('deposit','tab_') ->field("pay_order_number,order_number,user_account,create_time as pay_time,pay_amount as cost,pay_amount,pay_way as pay_type,pay_way") diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php index 6ba7a699a..10f36f285 100644 --- a/Application/Admin/Controller/TestOrderController.class.php +++ b/Application/Admin/Controller/TestOrderController.class.php @@ -47,7 +47,14 @@ class TestOrderController extends ThinkController $timeend = strtotime($_REQUEST['timeend'])+86399; $map['pay_time'] = array("ELT",$timeend); } - $order_list = M('test_order', 'tab_')->where($map)->page($page,$row)->order('add_time desc')->select(); + $order_list = M('test_order t', 'tab_') + ->field("t.*,g.sdk_version") + ->join("tab_game g on t.game_id = g.id","left") + ->where($map)->page($page,$row)->order('add_time desc')->select(); + foreach ($order_list as $k => &$v) { + $v['game_name'] =clearGameNameType($v['game_name']); + $v['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; + } $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index a185fecf9..3839b3798 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -124,6 +124,7 @@ 玩家账号 游戏名称 + 设备名称 所属推广员 @@ -159,6 +160,7 @@ {$data.pay_time} {$data.user_account} {$data.game_name} + {$data.sdk_version} {$data.promote_account} {$data.spend_ip} {$data.server_name} diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 95a64b1b0..3df675051 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -124,6 +124,7 @@ 充值时间 游戏名称 + 设备名称 游戏区服 @@ -160,6 +161,7 @@ {$data.user_account} {$data.pay_time} {$data.game_name} + {$data.sdk_version} {$data.server_name} {$data.game_player_name} {$data.cost} @@ -175,6 +177,7 @@ ------ ------ ------ + ------ ------ ------ {$sumAllData.cost} diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index e12feddc6..2595921aa 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -124,6 +124,7 @@ 充值时间 游戏名称 + 设备名称 订单金额 @@ -158,6 +159,7 @@ {$data.user_account} {$data.pay_time|date='Y-m-d H:i:s',###} {$data.game_name} + {$data.sdk_version} {$data.order_amount} {$data.pay_amount} {$data.pay_way|get_pay_way} @@ -173,6 +175,7 @@ ------ ------ ------ + ------ {$sum_order_amount['sum_order_amount']} {$sum_pay_amount['sum_order_amount']} ------ From f0a19cfc9915fbf092cd12583983f4d2d9946b82 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Mar 2020 10:08:11 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=BA=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 26 +++++++++++++++++++ .../Controller/ExportController.class.php | 4 +-- .../Controller/FinanceController.class.php | 4 +-- .../FinancePromoteController.class.php | 6 ++--- .../Controller/PayChannelController.class.php | 14 +++++----- .../Controller/TestOrderController.class.php | 2 +- 6 files changed, 42 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 4a6b153e6..18a0546c0 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -891,3 +891,29 @@ function clearGameNameType($game_name) { return preg_replace("/\(.*\)/","",$game_name); } +//设备名称词典 +function getGameTypeName($id,$chinese=true) +{ + $android = 'Android'; + $ios = 'ios'; + if($chinese){ + $android = '安卓'; + $ios = '苹果'; + } + $data = array( + ["id"=>0,'name'=>"{$android}+{$ios}"], + ["id"=>1,'name'=>$android], + ["id"=>2,'name'=> $ios] + ); + if($id > -1){ + foreach($data as $k=>$v){ + if($v['id'] == $id){ + return $v['name']; + break; + } + } + }else{ + return $data; + } +} + diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index e185ea878..ac9308087 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2455,7 +2455,7 @@ class ExportController extends Controller $order_list['server_type'] = '测试外网'; } $order_list['game_name'] =clearGameNameType($v['game_name']); - $order_list['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; + $order_list['sdk_version'] =getGameTypeName($v['sdk_version']); $order_list['order_type'] = get_order_type($v['order_type']); $order_list['order_no'] = $v['order_no']; $order_list['cp_order_no'] = $v['cp_order_no']; @@ -8104,7 +8104,7 @@ class ExportController extends Controller foreach($xlsData as $key => $value) { $xlsData[$key]['pay_way'] = getPayType($value['pay_way']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); - $xlsData[$key]['sdk_version'] =$xlsData[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $xlsData[$key]['sdk_version'] =getGameTypeName($xlsData[$key]['sdk_version']); } $map['pay_game_status'] = 1; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index f5403389f..e13d5d9b8 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -848,7 +848,7 @@ class FinanceController extends ThinkController foreach($data as $key => $value) { $data[$key]['pay_way'] = getPayType($value['pay_way']); - $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); } if(isset($_REQUEST['export'])){ @@ -985,7 +985,7 @@ class FinanceController extends ThinkController 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]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['cost'] = number_format($value['cost'],2,'.',''); $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); } diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 5c406446d..3a3fe5c64 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -458,7 +458,7 @@ class FinancePromoteController extends AdminController $value['company_belong'] =getCompanyBlong($value['company_belong']); $value['game_name'] =clearGameNameType($value['game_name']); - $value['sdk_version'] =$value['sdk_version'] == 1 ? "安卓" : "苹果"; + $value['sdk_version'] =getGameTypeName($value['sdk_version']); if(!$value['game_name']) $value['game_name'] = "无"; } @@ -578,7 +578,7 @@ 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]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } if (isset($_REQUEST['export'])) { @@ -743,7 +743,7 @@ class FinancePromoteController extends AdminController $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]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['cost'] = number_format($value['cost'],2,'.',''); $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.',''); diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index ca6371d92..b305ff4b3 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -10,7 +10,9 @@ use Org\WeixinSDK\Weixin; class PayChannelController extends ThinkController { public function index($p = 0) { - + if(!array_key_exists("timestart",$_REQUEST)){ + $this->redirect(ACTION_NAME, array('timestart' => date('Y-m-d',strtotime('-30 day')),"timeend"=>date('Y-m-d'))); + } $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 $arraypage = $page; @@ -126,7 +128,7 @@ class PayChannelController extends ThinkController $data[$key]['test_coin'] = $handleTestData[$value['game_id']]?$handleTestData[$value['game_id']]:0; $data[$key]['test_platform_coin'] = $handleTestCoinData[$value['game_id']]?$handleTestCoinData[$value['game_id']]:0; $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); - $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } $superMap = $map; // unset($superMap['promote_id']); @@ -659,7 +661,7 @@ class PayChannelController extends ThinkController if ($model == 'spend') { $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); - $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); } } @@ -872,7 +874,7 @@ class PayChannelController extends ThinkController foreach ($xlsData as $k => $v) { if ($model == 'spend') { $v['game_name'] =clearGameNameType($v['game_name']); - $v['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; + $v['sdk_version'] =getGameTypeName($v[$key]['sdk_version']); } $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']); $v['pay_way'] = get_pay_way($v['pay_way']); @@ -1037,7 +1039,7 @@ class PayChannelController extends ThinkController $data[$key]['pay_type'] = get_pay_way($value['pay_type']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); - $data[$key]['sdk_version'] =$data[$key]['sdk_version'] == 1 ? "安卓" : "苹果"; + $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); if ($value['pay_way']==1 || $value['pay_way']==9 ) { $data[$key]['pay_way'] = '支付宝'; @@ -1369,7 +1371,7 @@ class PayChannelController extends ThinkController $value['pay_order_number'] = "'".$value['pay_order_number']; $value['order_number'] = "'".$value['order_number']; $value['game_name'] =clearGameNameType($value['game_name']); - $value['sdk_version'] =$value['sdk_version'] == 1 ? "安卓" : "苹果"; + $value['sdk_version'] =getGameTypeName($value['sdk_version']); if (!$value['order_number']) { $data[$key]['order_number'] = '无'; diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php index 10f36f285..ec50da15b 100644 --- a/Application/Admin/Controller/TestOrderController.class.php +++ b/Application/Admin/Controller/TestOrderController.class.php @@ -53,7 +53,7 @@ class TestOrderController extends ThinkController ->where($map)->page($page,$row)->order('add_time desc')->select(); foreach ($order_list as $k => &$v) { $v['game_name'] =clearGameNameType($v['game_name']); - $v['sdk_version'] =$v['sdk_version'] == 1 ? "安卓" : "苹果"; + $v['sdk_version'] =getGameTypeName($v['sdk_version']); } $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find(); $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find(); From d6e44d32dc15d2f839874437e47b1f39e9db9640 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Mar 2020 11:38:32 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E7=94=B3=E8=AF=B7=E6=B8=B8=E6=88=8F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E9=80=89=E6=8B=A9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 21 +++++++++++++++++-- Application/Admin/View/Promote/lists.html | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index ef77192dc..50bcb86e1 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -1123,15 +1123,15 @@ class PromoteController extends ThinkController { if (IS_AJAX) { //获取所有游戏 - $game_list = M('game', 'tab_')->field('id,game_name,short')->where(['game_status'=>1,'down_port'=>1])->select(); + $game_list = M('game', 'tab_')->field('relation_game_id id,relation_game_name game_name,short')->where(['game_status'=>1,'down_port'=>1])->group("relation_game_id")->select(); $data['data']['game_list'] = empty($game_list) ? '' : $game_list; //获取推广员信息 $promote_info = M('promote', 'tab_')->field('id,account,game_ids')->where(['id'=>I('id', 0, 'intval')])->find(); if (!empty($promote_info['game_ids'])) { + $this->changeGameidToRelationGameid($promote_info['game_ids']); $promote_info['game_ids'] = explode(',', $promote_info['game_ids']); } $data['data']['promote_info'] = empty($promote_info) ? '' : $promote_info; - $data['msg'] = '请求成功'; $data['code'] = 1; @@ -1139,6 +1139,14 @@ class PromoteController extends ThinkController exit; } } + //普通游戏id转唯一游戏id + protected function changeGameidToRelationGameid(&$ids) + { + $rid = M('game', 'tab_')->field('relation_game_id')->where(["id"=>["in",$ids]])->group("relation_game_id")->select(); + if($rid){ + $ids = implode(",",array_column($rid,'relation_game_id')); + } + } //更新推广员可推广游戏 @@ -1152,6 +1160,7 @@ class PromoteController extends ThinkController $game_ids = I('game_ids', ''); if (!empty($game_ids)) { $game_ids = implode(',', $game_ids); + $this->changeRelationGameidToGameid($game_ids); } else { $game_ids = 0; } @@ -1163,6 +1172,14 @@ class PromoteController extends ThinkController } } } + //唯一游戏id转普通游戏id + protected function changeRelationGameidToGameid(&$ids) + { + $rid = M('game', 'tab_')->field('id')->where(["relation_game_id"=>["in",$ids]])->select(); + if($rid){ + $ids = implode(",",array_column($rid,'id')); + } + } public function shortCutMenu($p = 1) { diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 014df7416..9f973fa42 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -422,7 +422,7 @@ 全选 -