From 0ebde4cb1729689dc8fd0984f2c992cc0f681f13 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 24 Apr 2020 09:12:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DepositController.class.php | 2 + .../Controller/FinanceController.class.php | 2 +- .../Controller/PartnerController.class.php | 1 + .../SuperStatisticalController.class.php | 3 ++ .../UserActionLogController.class.php | 39 ++++++++++++++----- .../Admin/View/Deposit/lists_secord.html | 4 +- Application/Admin/View/Partner/lists.html | 4 +- .../Admin/View/UserActionLog/index.html | 5 ++- .../Controller/PackageController.class.php | 14 +++++++ 9 files changed, 60 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php index e43e42e23..e838bb7c9 100644 --- a/Application/Admin/Controller/DepositController.class.php +++ b/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(); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index bdc6e06e9..26a51e2db 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/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(); diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 6a7c4a2e7..b01fb2cf7 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/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); diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index ecab06174..816f40ec0 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/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(); diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php index 5bdb278f2..ae8ed67b3 100644 --- a/Application/Admin/Controller/UserActionLogController.class.php +++ b/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']}
新值：{$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']}
旧身份证：{$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']}
新值：{$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(); diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html index 380119bc6..c79fed93c 100644 --- a/Application/Admin/View/Deposit/lists_secord.html +++ b/Application/Admin/View/Deposit/lists_secord.html @@ -189,7 +189,9 @@
- 导出 + + 导出 + {$_page|default=''}
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index a7cb8fdfe..b70f0a933 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -76,7 +76,9 @@ 搜索
- 导出excel + + 导出excel +
diff --git a/Application/Admin/View/UserActionLog/index.html b/Application/Admin/View/UserActionLog/index.html index 5f5c4b212..1c1b31ffe 100644 --- a/Application/Admin/View/UserActionLog/index.html +++ b/Application/Admin/View/UserActionLog/index.html @@ -80,6 +80,8 @@ 行为 + 内容 + 游戏 玩家 @@ -107,7 +109,8 @@ {$data.id} - {$data.action} + {$data.action_title} + {$data.action_content} {$data.game_name} {$data.account} {$data.create_time|date='Y-m-d H:i:s',###} diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php index 5350757ca..9cf009ba8 100644 --- a/Application/Home/Controller/PackageController.class.php +++ b/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()) {