diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 8c6db5e2e..6385a9579 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -881,7 +881,7 @@ class FinanceController extends ThinkController $account = I('account', ''); $gameId = I('game_id', 0); - $game = M('game', 'tab_')->field(['id', 'unique_code', 'game_name'])->where(['game_id' => $gameId])->find(); + $game = M('game', 'tab_')->field(['id', 'unique_code', 'game_name', 'sdk_version'])->where(['id' => $gameId])->find(); $client = new AggregateClient(); $result = $client->api('game-recharge-detail', [ @@ -891,15 +891,15 @@ class FinanceController extends ThinkController 'account' => $account, 'order_number' => $orderNumber, 'role_name' => $roleName, - 'device_type' => I("sdk_type", 0), + 'device_type' => $game['sdk_version'], 'page' => $p, 'limit' => $limit, ]); - + $count = 0; $total = '0.00'; $records = []; - if ($result['code'] != '0000') { + if ($result['code'] == '0000') { $count = $result['data']['count']; $total = $result['data']['total']; $records = $result['data']['records']; @@ -907,6 +907,7 @@ class FinanceController extends ThinkController foreach ($records as $key => $record) { $records[$key]['game_name'] = $game['game_name']; + $records[$key]['rom_platform'] = $record['rom_platform'] == 'android' ? '安卓' : 'IOS'; } if(isset($_REQUEST['export'])){ @@ -931,6 +932,7 @@ class FinanceController extends ThinkController $this->assign('_page', $page); } + $this->assign('game', $game); $this->assign('pagination', $page); $this->assign('total', $total); $this->assign('records', $records); diff --git a/Application/Admin/View/Finance/aggDetail.html b/Application/Admin/View/Finance/aggDetail.html index 4edc6edd5..a727da166 100644 --- a/Application/Admin/View/Finance/aggDetail.html +++ b/Application/Admin/View/Finance/aggDetail.html @@ -30,7 +30,7 @@ @@ -71,7 +71,7 @@
- 搜索 @@ -116,20 +116,20 @@ - {$data.order_number} - {$data.pay_success_time} - {$data.account} - {$data.game_name} - {$data.rom_platform} + {$record.order_number} + {$record.pay_success_time} + {$record.account} + {$record.game_name} + {$record.rom_platform} 聚合 - - {$data.role_name} - {$data.money} + + {$record.cp_role_name} + {$record.money} 总计 - 累计充值:{$total}0 + 累计充值:{$total}0