修改bug

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,7 +891,7 @@ 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,
         ]);
@@ -899,7 +899,7 @@ class FinanceController extends ThinkController
         $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);

Application/Admin/View/Finance/aggDetail.html

@@ -30,7 +30,7 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">{$_REQUEST['game_name']}游戏订单查看</h3>
+    <h3 class="page_title">{$game['game_name']}-聚合游戏订单查看</h3>
     <p class="description_text"></p>
   </div>
 
@@ -71,7 +71,7 @@
 
       <div class="input-list">
 
-        <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"
+        <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/aggDetail','model='.$model['name'].'&row='.I('row'),false)}"
            style="">搜索</a>
         <if condition="$role_export_check eq true ">
           <if condition="$_GET['all'] neq 1">
@@ -116,20 +116,20 @@
         <notemtpy name = "records">
           <volist name="records" id="record">
             <tr>
-              <td >{$data.order_number}</td>
-              <td >{$data.pay_success_time}</td>
-              <td >{$data.account}</td>
-              <td >{$data.game_name}</td>
-              <td >{$data.rom_platform}</td>
+              <td >{$record.order_number}</td>
+              <td >{$record.pay_success_time}</td>
+              <td >{$record.account}</td>
+              <td >{$record.game_name}</td>
+              <td >{$record.rom_platform}</td>
               <td >聚合</td>
-              <!-- <td >{$data.server_name}</td> -->
-              <td >{$data.role_name}</td>
-              <td >{$data.money}</td>
+              <!-- <td >{$record.server_name}</td> -->
+              <td >{$record.cp_role_name}</td>
+              <td >{$record.money}</td>
             </tr>
           </volist>
           <tr>
             <td ><span>总计</span></td>
-            <td colspan="11" ><span><if condition="$sumAll neq ''">累计充值：{$total}<else/>0</if>
+            <td colspan="11" ><span><if condition="$total neq ''">累计充值：{$total}<else/>0</if>
             </span></td>
           </tr>
         </notemtpy>