导出权限修正

Application/Admin/Controller/DepositController.class.php

@@ -245,6 +245,8 @@ class DepositController extends ThinkController {
             /* 执行查询 */
             ->select();
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         /* 查询记录总数 */
         $count = D('coin_pay_order')->where($map)->count();
 

Application/Admin/Controller/FinanceController.class.php

@@ -757,7 +757,7 @@ class FinanceController extends ThinkController
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];
-        $sumNoticeFail = $totalData['notice_fail_count'];
+        $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $game_types = M("game_type", 'tab_')->field('id, type_name')->select();

Application/Admin/Controller/PartnerController.class.php

@@ -187,6 +187,7 @@ class PartnerController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
 //        dd($parseData[0]);
         $this->assign('listData', $parseData[0]);
         $this->assign('count', $count);

Application/Admin/Controller/SuperStatisticalController.class.php

@@ -36,6 +36,9 @@ class SuperStatisticalController extends ThinkController
         foreach($supersign_token as $k => $v) {
             $authorization_all_num += count($this->game_supersign_num($v));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $where['pay_status'] = 1;
         $data['buy_num'] = M('game_supersign', 'tab_')->where($where)->count();
         $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($where)->select();

Application/Admin/Controller/UserActionLogController.class.php

@@ -59,25 +59,44 @@ class UserActionLogController extends AdminController
 
        foreach($data as $key=>$value) {
            $remarks = json_decode($value['remarks'],true);
-//           dump($data);
+
+           $action = json_decode($value['action'],true);
 
            if ($value['type'] == 3) {
-                $data[$key]['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                $data[$key]['action_title'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 4) {
-                $data[$key]['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                $data[$key]['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 0) {
-               $data[$key]['action'] = '修改密码';
+               $data[$key]['action_title'] = '修改密码';
+               if ($action['account']) {
+                   $data[$key]['action_content'] = "-------------------";
+               } else {
+                   $data[$key]['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+               }
+
            } else if ($value['type'] == 1) {
-               $data[$key]['action'] = '修改/绑定手机号';
+               $data[$key]['action_title'] = '修改/绑定手机号';
+               $data[$key]['action_content'] = "手机号：{$action['phone']}";
            } else if ($value['type'] == 2) {
-               $data[$key]['action'] = '修改身份信息';
+               $data[$key]['action_title'] = '修改身份信息';
+               $data[$key]['action_content'] = $action['old_data']?"旧姓名：{$action['old_data']['real_name']} - 新姓名：{$action['new_data']['real_name']}<br>旧身份证：{$action['old_data']['idcard']} - 新身份证：{$action['new_data']['idcard']}":"";
            } else if ($value['type'] == 5) {
-               $data[$key]['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
-           } else if ($value['type'] == 11) {
-               $data[$key]['action'] = '修改绑定上级推广员';
+               $data[$key]['action_title'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+           } else if ($value['type'] == 6) {
+               $data[$key]['action_title'] = '点击推广链接下载:'.$value['action'];
+           } else if ($value['type'] == 7){
+               $data[$key]['action_title'] = '修改角色名';
+               $data[$key]['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+           } else if ($value['type'] == 8){
+               $data[$key]['action_title'] = '解绑手机号';
+               $data[$key]['action_content'] = "手机号：{$action['phone']}";
+           }
+           else if ($value['type'] == 11) {
+               $data[$key]['action_title'] = '修改绑定上级推广员';
            } else {
-               $data[$key]['action'] = '未知';
+               $data[$key]['action_title'] = '未知';
            }
+
        }
 //       die();
 

Application/Admin/View/Deposit/lists_secord.html

@@ -189,7 +189,9 @@
         </div>
     </div>
     <div class="page">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>26,'xlsname'=>'平台币订单_推广员充值'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Partner/lists.html

@@ -76,7 +76,9 @@
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('lists','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
             </div>
             <div class="input-list">
+                <if condition="$role_export_check eq true ">
                     <a class="sch-btn" href="javascript:;" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出excel</a>
+                </if>
             </div>
         </div>
     </div>

Application/Admin/View/UserActionLog/index.html

@@ -80,6 +80,8 @@
 
           <th >行为</th>
 
+          <th >内容</th>
+
           <th >游戏</th>
 
           <th>玩家</th>
@@ -107,7 +109,8 @@
           <volist name="data" id="data" key="$key">
             <tr>
               <td >{$data.id}</td>
-              <td >{$data.action}</td>
+              <td >{$data.action_title}</td>
+              <td >{$data.action_content}</td>
               <td >{$data.game_name}</td>
               <td >{$data.account}</td>
               <td >{$data.create_time|date='Y-m-d H:i:s',###}</td>

Application/Home/Controller/PackageController.class.php

@@ -82,7 +82,21 @@ class PackageController extends Controller
         }
         $packageUrl = $game['sdk_version'] == 1 ? $apply['pack_url'] : $apply['plist_url'];
 
+        $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
+        $url = $applyService->getLandingPageUrl($apply);
+
         M('game','tab_')->where(['id' => $game['id']])->setInc('dow_num');
+
+        $log['game_id'] = $gameId;
+        $log['game_name'] = $game['game_name'];
+        $log['action'] = $url;
+        $log['type'] = 6;
+        $log['ip'] = get_client_ip();
+        $log['create_time'] = time();
+        $log['remarks'] = '记录成功';
+
+        M('user_action_log', 'tab_')->data($log)->add();
+
         if (Request::isAndroid()) {
             $this->gotoPkgUrl($packageUrl);
         } else if (Request::isIOS()) {