订单查询更新

Application/Home/Controller/QueryController.class.php

@@ -99,7 +99,7 @@ class QueryController extends BaseController
         $map['tab_spend.is_check'] = ['neq', 2];
 
         $data = M('Spend', 'tab_')
-            ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id')
+            ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id,tab_promote.parent_id as pro_parent_id')
             ->join('tab_game on tab_spend.game_id = tab_game.id')
             ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id')
             ->where($map)
@@ -114,6 +114,14 @@ class QueryController extends BaseController
 
         if (!empty($data)) {
             foreach ($data as &$list) {
+                if ($list['pro_grand_id'] > 0) {
+                    $thisPromoteData = D('Promote')
+                        ->field('account,real_name')
+                        ->where(array('id' => $list['pro_parent_id']))
+                        ->find();
+                    $list['p_pro_account'] = $thisPromoteData['account'];
+                    $list['p_pro_real_name'] = $thisPromoteData['real_name'];
+                }
                 $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
             }
         }
@@ -148,7 +156,7 @@ class QueryController extends BaseController
         $this->assign('pID', PID);
         $this->assign('ownId', I('own_id'));
         $this->assign('payWayData', QueryController::$payWay);
-        $this->meta_title = "充值明细";
+        $this->meta_title = "订单查询";
         $this->display();
     }
 
@@ -1880,6 +1888,7 @@ class QueryController extends BaseController
         }
 
         $this->assign('list_data', $spendData);
+        $this->meta_title = "订单详情";
         $this->display('view_spend_detailed');
     }
 }

Application/Home/View/default/Public/promote_base.html

@@ -51,7 +51,7 @@
 						<div class="navContent jsnavContent">
 							<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
 							<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
-							<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">充值明细</a>
+							<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">订单查询</a>
 							<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
 <!--							<a href="{:U('Query/arpu_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu_analysis '>active</if> ">ARPU统计</a>-->
 <!--							<a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a>-->

Application/Home/View/default/Query/recharge.html

@@ -55,11 +55,11 @@
   <div class="page-search normal_list query-recharge-search">
     <div class="trunk-title">
       <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>充值明细</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>订单查询</span></div>
       </div>
       <img src="__IMG__/20180207/icon_chongzhi.png">
-      <span class="title_main">充值明细</span>
-      <span class="details">对所有渠道用户玩家产生的充值信息，进行记录的功能</span>
+      <span class="title_main">订单数据</span>
+      <span class="details">对所有渠道用户玩家产生的订单信息，进行记录的功能</span>
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
@@ -207,9 +207,9 @@
                   <empty name="ownId">
                     <empty name="vo.pro_grand_id">
                       <td>{$vo.pro_account}({$vo.pro_real_name})</td>
-                      <td></td>
+                      <td>{$vo.pro_account}({$vo.pro_real_name})</td>
                       <else/>
-                      <td></td>
+                      <td>{$vo.p_pro_account}({$vo.p_pro_real_name})</td>
                       <td>{$vo.pro_account}({$vo.pro_real_name})</td>
                     </empty>
                   </empty>