From 9aed64f46d4bcac6f4066e98f161827be89e475b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 15 Jun 2020 15:06:28 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=85=85?= =?UTF-8?q?=E5=80=BC=E6=B1=87=E6=80=BB=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A1=A5?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 34 ++++ .../Controller/PlatformController.class.php | 27 ++- .../Controller/RepairController.class.php | 7 +- .../Controller/TimingController.class.php | 188 ++++++++++++++++++ 4 files changed, 246 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index cc7e5adef..2f99f79c4 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -964,3 +964,37 @@ function checkEncryptionAuth(&$value,$string){ } } +function PromoteStatistics($orderNo) { + + $spend = M("spend","tab_") + ->field("promote_id,promote_account,pay_time,pay_amount") + ->where(array('pay_order_number'=>$orderNo)) + ->find(); + + $start = strtotime(date("Ymd",$spend['pay_time'])); + + $statisticsData = M("promote_statistics","tab_") + ->where(['promote_id'=>$spend['promote_id'],'time'=>$start]) + ->find(); + + $statisticsData['count']?$statisticsData['count']:$statisticsData['count']=0; + + $insert['promote_id'] = $spend['promote_id']; + $insert['promote_account'] = $spend['promote_account']; + $insert['count'] = $spend['pay_amount']?(($spend['pay_amount']*100)+$statisticsData['count']):0; + $insert['time'] = $start; + + if ($statisticsData) { + + M("promote_statistics","tab_") + ->where(['promote_id'=>$spend['promote_id'],'time'=>$start]) + ->save($insert); + + } else { + + M("promote_statistics","tab_")->add($insert); + + } + +} + diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index f6b3fcfd7..c76d4d573 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -665,16 +665,25 @@ class PlatformController extends ThinkController $map['s.server_id'] = $_REQUEST['server_id']; unset($_REQUEST['server_id']); } - } - $data = M('promote', 'tab_')->alias('tp1') - ->field('tp1.account as promote_account,tp1.id, + } + + if (isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])) { + $data = M('promote', 'tab_')->alias('tp1') + ->field('tp1.account as promote_account,tp1.id, floor(sum(pay_amount)*100) as count') - ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') - ->join("tab_spend as s on tp2.id = s.promote_id", 'left') - ->where($map) - ->group('tp1.id') - ->order('count desc') - ->select(); + ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') + ->join("tab_spend as s use INDEX(search) on tp2.id = s.promote_id", 'left') + ->where($map) + ->group('tp1.id') + ->order('count desc') + ->select(); + } else { + $statisticsMap['time'] =$map['pay_time']; + $data = M('promote_statistics', 'tab_')->field("promote_account,promote_id as id,sum(count) count")->where($statisticsMap)->group("promote_id")->select(); + } + + +// var_dump($data);die(); //今日/本周/本月不变 $tmap = $map; if(isset($map['pay_time'])){ diff --git a/Application/Admin/Controller/RepairController.class.php b/Application/Admin/Controller/RepairController.class.php index f6eb96244..87df477e9 100644 --- a/Application/Admin/Controller/RepairController.class.php +++ b/Application/Admin/Controller/RepairController.class.php @@ -123,7 +123,7 @@ class RepairController extends ThinkController { */ public function noticePayed($orderNo, $second, $type) { $auth = session('user_auth'); - + if (IS_AJAX) { if ($type != 'spend' && $type != 'deposit') { $this->ajaxReturn(['status'=>0,'msg'=>'参数有误']); @@ -161,8 +161,12 @@ class RepairController extends ThinkController { $game = new GameApi(); $result=$game->game_pay_notify($param,1); $spend = M($tab, "tab_"); + if($result == "success"){ $rr = $spend->where(array('pay_order_number'=>$orderNo))->save(array('pay_game_status'=>1)); + + PromoteStatistics($orderNo); + if ($rr !== false) { $cpFlag = 1; M($tab, 'tab_')->commit(); @@ -171,6 +175,7 @@ class RepairController extends ThinkController { $this->ajaxReturn(array('status'=>1,'msg'=>'补单失败.')); } }else{ + PromoteStatistics($orderNo); M($tab, 'tab_')->commit(); } } else { // deposit diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 9a800890b..540ced5e8 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -9,6 +9,7 @@ namespace Admin\Controller; use User\Api\UserApi as UserApi; +use function GuzzleHttp\Psr7\str; /** * 后台首页控制器 @@ -343,4 +344,191 @@ class TimingController extends AdminController { } + public function setPromoteStatistics() { + + echo "-------------------------------------------------------------\n"; + + $startTime = strtotime("20190829"); + $endTime = time(); + + if (I("start_time")) { + $startTime = strtotime(I("start_time")); + } + + if (I("end_time")) { + $endTime = strtotime(I("end_time")); + } + + if ($endTime < $startTime) { + echo "错误，开始时间不得大于结束时间";die(); + } + + for($start = $startTime;$start<$endTime;$start=$start+86400) { + + $map['pay_time'] = ['between', array($start, $start+86399)]; + $map['tp1.chain'] = '/'; + $map['pay_status'] = 1; + $map['promote_id'] = array('egt', 0); + + $data = M('promote', 'tab_')->alias('tp1') + ->field('tp1.account as promote_account,tp1.id as promote_id,floor(sum(pay_amount)*100) as count') + ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') + ->join("tab_spend as s on tp2.id = s.promote_id", 'left') + ->where($map) + ->group('tp1.id') + ->order('count desc') + ->select(); + foreach($data as $key => $value) { + $insert['promote_id'] = $value['promote_id']; + $insert['promote_account'] = $value['promote_account']; + $insert['count'] = $value['count']?$value['count']:0; + $insert['time'] = $start; + + $statisticsData = M("promote_statistics","tab_") + ->where(['promote_id'=>$value['promote_id'],'time'=>$start]) + ->find(); + + $date = date("Y-m-d",$start); + + if ($statisticsData) { + + M("promote_statistics","tab_") + ->where(['promote_id'=>$value['promote_id'],'time'=>$start]) + ->save($insert); + echo "更新{$value['promote_account']}在{$date}充值:{$value['count']}\n"; + } else { + + M("promote_statistics","tab_")->add($insert); + echo "新增{$value['promote_account']}在{$date}充值:{$value['count']}\n"; + } + } + + + + } + + echo "-------------------------------------------------------------\n"; + + } + + + public function shiftPromoteStatistics() { + + $data = M("shift_task")->where(['status'=>0,'type'=>2])->select(); + + $promote_data = []; + + foreach ($data as $key => $value) { + + $promote_data[] = $value['from_promote_id']; + $promote_data[] = $value['to_promote_id']; + + } + $promote_data=array_unique($promote_data); + sort($promote_data); + + $chain_data = M("promote","tab_") + ->field("id") + ->where(['chain'=>'/','id'=>['in',$promote_data]]) + ->select(); + $chain_data = array_column($chain_data,'id'); + + $chain_data_secord = M("promote","tab_") + ->field("substring_index(chain, '/', 2) as id") + ->where(['id'=>['in',$promote_data]]) + ->select(); + $chain_data_secord = array_column($chain_data_secord,'id'); + foreach($chain_data_secord as $k=>$v){ + if($v == '/'){ + unset($chain_data_secord[$k]); + } + + $chain_data_secord[$k] = substr($chain_data_secord[$k],1,strlen($v)); + if ($chain_data_secord[$k] == false) { + unset($chain_data_secord[$k]); + } +// var_dump(strlen($chain_data_secord[$k])); + + } + $data = []; + $data = array_merge(array_unique($chain_data),array_unique($chain_data_secord)); + + + $this->PromoteStatistics($data); +// dump($data); +// dump(array_unique($chain_data_secord)); + + } + + public function PromoteStatistics($promote) { + + echo "-------------------------------------------------------------\n"; + + $startTime = strtotime("20190829"); + $endTime = time(); + + if (I("start_time")) { + $startTime = strtotime(I("start_time")); + } + + if ($promote) { + $map['tp2.id'] = ['in',$promote]; + } + + if (I("end_time")) { + $endTime = strtotime(I("end_time")); + } + + if ($endTime < $startTime) { + echo "错误，开始时间不得大于结束时间";die(); + } + + for($start = $startTime;$start<$endTime;$start=$start+86400) { + + $map['pay_time'] = ['between', array($start, $start+86399)]; + $map['tp1.chain'] = '/'; + $map['pay_status'] = 1; + $map['promote_id'] = array('egt', 0); + + $data = M('promote', 'tab_')->alias('tp1') + ->field('tp1.account as promote_account,tp1.id as promote_id,floor(sum(pay_amount)*100) as count') + ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') + ->join("tab_spend as s on tp2.id = s.promote_id", 'left') + ->where($map) + ->group('tp1.id') + ->order('count desc') + ->select(); + foreach($data as $key => $value) { + $insert['promote_id'] = $value['promote_id']; + $insert['promote_account'] = $value['promote_account']; + $insert['count'] = $value['count']?$value['count']:0; + $insert['time'] = $start; + + $statisticsData = M("promote_statistics","tab_") + ->where(['promote_id'=>$value['promote_id'],'time'=>$start]) + ->find(); + + $date = date("Y-m-d",$start); + + if ($statisticsData) { + + M("promote_statistics","tab_") + ->where(['promote_id'=>$value['promote_id'],'time'=>$start]) + ->save($insert); + echo "更新{$value['promote_account']}在{$date}充值:{$value['count']}\n"; + } else { + + M("promote_statistics","tab_")->add($insert); + echo "新增{$value['promote_account']}在{$date}充值:{$value['count']}\n"; + } + } + + + + } + + echo "-------------------------------------------------------------\n"; + + } + } From a153fb9a0e59749fd761a27ef35d1f11dd6f4b60 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 23 Jun 2020 16:52:21 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 42 ++ .../Controller/MarketController.class.php | 189 +++++++++ .../Controller/MemberController.class.php | 22 +- .../Controller/SpendController.class.php | 19 + .../Admin/Controller/UserController.class.php | 20 + Application/Admin/View/Market/rebind.html | 365 ++++++++++++++++++ .../Admin/View/Market/rebindRecords.html | 241 ++++++++++++ Application/Admin/View/Member/user_info.html | 14 +- Application/Admin/View/Spend/lists.html | 16 +- Application/Admin/View/User/rolelist.html | 14 +- .../Base/Repository/SpendRepository.class.php | 171 ++++++++ .../Base/Service/MarketService.class.php | 74 ++++ .../Base/Service/PaymentService.class.php | 8 + Application/Base/Task/BaseTask.class.php | 21 + .../Base/Task/MarketShiftTask.class.php | 31 ++ Application/Base/Task/Task.class.php | 83 ++++ Application/Base/Tool/ServiceClient.class.php | 63 +++ 17 files changed, 1387 insertions(+), 6 deletions(-) create mode 100644 Application/Admin/Controller/MarketController.class.php create mode 100644 Application/Admin/View/Market/rebind.html create mode 100644 Application/Admin/View/Market/rebindRecords.html create mode 100644 Application/Base/Service/MarketService.class.php create mode 100644 Application/Base/Service/PaymentService.class.php create mode 100644 Application/Base/Task/BaseTask.class.php create mode 100644 Application/Base/Task/MarketShiftTask.class.php create mode 100644 Application/Base/Task/Task.class.php create mode 100644 Application/Base/Tool/ServiceClient.class.php diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 7fd9fc095..c035089c1 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -10,6 +10,7 @@ use Base\Tool\TaskClient; use Base\Service\PromoteService; use GuzzleHttp\Client; use think\Db; +use Base\Task\Task; class ConsoleController extends Think { @@ -92,6 +93,47 @@ class ConsoleController extends Think { } } + public function runTask($type = null, $count = 1) + { + Printer::export($type); + Printer::export($count); + try { + $task = new Task($type); + $task->run($count); + Printer::export('运行完成'); + } catch (\Exception $e) { + Printer::export($e->getMessage()); + } + } + + public function addTask() + { + $id = M('market_shift', 'tab_')->add([ + 'from_id' => 1, + 'to_id' => 2, + 'split_time' => 0, + 'created_time' => time() + ]); + $params = [ + 'market_shift_id' => $id + ]; + Task::add('market-shift', $params); + } + + public function initMarketAdmin() + { + $marketService = new MarketService(); + $promoteService = new PromoteService(); + $promotes = M('promote', 'tab_')->where(['level' => ['gt', 1], 'admin_id' => ['gt', 0], 'company_belong' => ['in', [1, 2]]])->select(); + foreach ($promotes as $promote) { + $subPromotes = $promoteService->getAllChildren($promote, 0, ['id']); + $promoteIds = [$promote['id']]; + $promoteIds = array_merge(array_column($subPromotes, 'id'), $promoteIds); + $marketService->shiftSpend($promoteIds, 0, $promote['admin_id']); + $marketService->shiftDeposit($promoteIds, 0, $promote['admin_id']); + } + } + public function modifyLoginRepair() { $this->modifyLogin(1569686400); diff --git a/Application/Admin/Controller/MarketController.class.php b/Application/Admin/Controller/MarketController.class.php new file mode 100644 index 000000000..e8dc2b908 --- /dev/null +++ b/Application/Admin/Controller/MarketController.class.php @@ -0,0 +1,189 @@ +field(['id'])->where(['company_id' => $companyId, 'level' => 1])->getField('id', true); + if (count($companyPromoteIds) > 0) { + $promoteIds = count($promoteIds) ? array_intersect($companyPromoteIds, $promoteIds) : $companyPromoteIds; + $promoteIds[] = 0; + } else { + $promoteIds = [0]; + } + } + if (count($promoteIds)) { + $conditions['promote_id'] = ['in', $promoteIds]; + } + $query = M('market_shift', 'tab_')->where($conditions); + + $countQuery = clone $query; + $items = $query->order('id desc')->page($page, $row)->select(); + $count = $countQuery->count(); + + $recordPromotes = []; + $recordCompanys = []; + if (count($items) > 0) { + $recordPromotes = M('promote', 'tab_')->field(['id', 'account', 'company_id'])->where(['id' => ['in', array_column($items, 'promote_id')]])->select(); + $recordCompanyIds = array_column($recordPromotes, 'company_id'); + if (count($recordCompanyIds) > 0) { + $recordCompanys = M('promote_company', 'tab_')->field(['id', 'company_name', 'company_belong'])->where(['id' => ['in', $recordCompanyIds]])->select(); + } + $adminIds = array_merge(array_column($items, 'from_id'), array_column($items, 'to_id')); + $recordAdmins = M('ucenter_member', 'sys_')->field(['id', 'username'])->where(['id' => ['in', $adminIds]])->select(); + $recordPromotes = index_by_column('id', $recordPromotes); + $recordCompanys = index_by_column('id', $recordCompanys); + $recordAdmins = index_by_column('id', $recordAdmins); + } + + $companyTypes = [ + 0 => '内团', + 1 => '外团', + 2 => '外团-分发联盟', + 3 => '无' + ]; + + $statusList = [ + 0 => '待处理', + 1 => '处理成功', + 2 => '处理失败', + ]; + + $records = []; + foreach ($items as $item) { + $records[] = [ + 'id' => $item['id'], + 'promote_account' => $recordPromotes[$item['promote_id']]['account'], + 'company_name' => $recordCompanys[$recordPromotes[$item['promote_id']]['company_id']]['company_name'], + 'company_belong' => $companyTypes[$recordCompanys[$recordPromotes[$item['promote_id']]['company_id']]['company_belong']], + 'remark' => $item['remark'], + 'from_username' => $recordAdmins[$item['from_id']]['username'], + 'to_username' => $recordAdmins[$item['to_id']]['username'], + 'split_time' => date('Y-m-d H:i:s', $item['split_time']), + 'created_time' => date('Y-m-d H:i:s', $item['created_time']), + 'status_text' => $statusList[$item['status']], + 'status' => $item['status'] + ]; + } + $companys = M('promote_company', 'tab_')->field(['id', 'company_name'])->where(['company_belong' => ['in', [1, 2]]])->select(); + + $page = set_pagination($count, $row); + if($page) { + $this->assign('_page', $page); + } + $this->assign('records', $records); + $this->assign('companys', $companys); + $this->display(); + } + + public function rebind() + { + $this->meta_title = '新增换绑'; + $id = I('id', 0); + $companys = M('promote_company', 'tab_')->field(['id', 'company_name'])->where(['company_belong' => ['in', [1, 2]]])->select(); + $marketAdmins = getMarketAdmins(); + $this->assign('companys', $companys); + $this->assign('marketAdmins', $marketAdmins); + $this->display('rebind'); + } + + public function save() + { + $records = I('records', []); + if (count($records) == 0) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '未提交换绑数据' + ]); + } + + $userAuth = session('user_auth'); + foreach ($records as $record) { + $item = [ + 'promote_id' => $record['promote_id'], + 'from_id' => $record['from_id'], + 'to_id' => $record['to_id'], + 'split_time' => $record['split_time'], + 'remark' => $record['remark'], + 'creator_id' => $userAuth['uid'], + 'created_time' => time() + ]; + $id = M('market_shift', 'tab_')->add($item); + if ($id) { + Task::add('market-shift', ['market_shift_id' => $id]); + } + } + + $this->ajaxReturn([ + 'status' => 1, + 'message' => '提交成功，等待后台处理' + ]); + } + + public function delete() + { + $id = I('id', 0); + M('market_shift', 'tab_')->where(['id' => $id])->delete(); + + addOperationLog([ + 'op_type' => 2, + 'key' => $id, + 'op_name' => '删除市场换绑记录', + 'url' => U('Market/delete', ['id' => $id]), + 'menu' => '推广员-推广员管理-市场换绑-删除市场换绑记录' + ]); + + $this->ajaxReturn([ + 'status' => 1, + 'message' => '删除成功' + ]); + } + + public function getPromotesByCompany() + { + $companyId = I('company_id', 0); + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id']) + ->where(['level' => 1, 'company_id' => $companyId, 'admin_id' => ['gt', 0]]) + ->select(); + + $marketAdmins = index_by_column('id', getMarketAdmins()); + + $records = []; + foreach ($promotes as $promote) { + $admin = isset($marketAdmins[$promote['admin_id']]) ? $marketAdmins[$promote['admin_id']] : null; + $records[] = [ + 'id' => $promote['id'], + 'account' => $promote['account'], + 'admin_id' => $promote['admin_id'], + 'admin_username' => $admin ? $admin['username'] : '', + ]; + } + + $this->ajaxReturn([ + 'status' => 1, + 'message' => '获取成功', + 'data' => [ + 'promotes' => $records + ] + ]); + } +} diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 73a47deae..6e06bb156 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -79,6 +79,16 @@ class MemberController extends ThinkController $is_repeat = true; } + $marketAdminId = I('market_admin_id', 0); + if ($marketAdminId) { + $map['tab_user.market_admin_id'] = $marketAdminId; + } + + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $userAuth = session('user_auth'); + $map['tab_user.market_admin_id'] = $userAuth['uid']; + } if (isset($_REQUEST['status'])) { $map['lock_status'] = $_REQUEST['status']; @@ -135,7 +145,7 @@ class MemberController extends ThinkController //计算用户列表 $data = M("user","tab_") ->field("tab_user.id,`device_number`,`age_status`,`account`,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark, - `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat") + `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat,tab_user.market_admin_id") ->where($map) ->group("tab_user.id") ->order($order); @@ -217,7 +227,13 @@ class MemberController extends ThinkController )); data2csv($data,"玩家_玩家列表",$field); } - + + $adminUsernameList = getAdminUsernameList(array_column($data, 'market_admin_id')); + foreach ($data as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + } + //计算总人数 if($is_repeat){ $field ="count(*) user_count,IFNULL(sum(ss.pay_amount), 0) recharge_total"; @@ -258,6 +274,8 @@ class MemberController extends ThinkController $no_repeat_count = $userDbRes['no_repeat_count']; } + $this->assign('isMarketAdmin', $isMarketAdmin); + $this->assign('marketAdmins', getMarketAdmins()); $this->assign('repeat_count',$repeat_count); $this->assign('no_repeat_count',$no_repeat_count); diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 8c008686e..b2fe67251 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -72,6 +72,17 @@ class SpendController extends ThinkController unset($_REQUEST['pay_game_status']); } + $marketAdminId = I('market_admin_id', 0); + if ($marketAdminId) { + $map['market_admin_id'] = $marketAdminId; + } + + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $userAuth = session('user_auth'); + $map['market_admin_id'] = $userAuth['uid']; + } + // $promoteRoot = getPowerPromoteIds(); // $data_empower_type = session('user_auth')['data_empower_type']; // @@ -125,6 +136,14 @@ class SpendController extends ThinkController $data = D(self::model_name)->lists($_GET["p"], $map, $order); + $adminUsernameList = getAdminUsernameList(array_column($data, 'market_admin_id')); + foreach ($data['data'] as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + } + + $this->assign('isMarketAdmin', $isMarketAdmin); + $this->assign('marketAdmins', getMarketAdmins()); $this->assign('startDate', $startDate); $this->assign('endDate', $endDate); $this->assign('list_data', $data['data']); diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 64cc6a33e..45dc6352e 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -666,6 +666,17 @@ class UserController extends AdminController unset($_REQUEST['role_id']); } + $marketAdminId = I('market_admin_id', 0); + if ($marketAdminId) { + $map['market_admin_id'] = $marketAdminId; + } + + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $userAuth = session('user_auth'); + $map['market_admin_id'] = $userAuth['uid']; + } + // $promoteRoot = getPowerPromoteIds(); // $data_empower_type = session('user_auth')['data_empower_type']; // @@ -704,10 +715,19 @@ class UserController extends AdminController empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"]; $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]); $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); + + $adminUsernameList = getAdminUsernameList(array_column($list, 'market_admin_id')); + foreach ($list as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + } + $this->assign('list', $list); $this->meta_title = '角色数据'; $this->m_title = '角色查询'; + $this->assign('isMarketAdmin', $isMarketAdmin); + $this->assign('marketAdmins', getMarketAdmins()); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'User/rolelist', 'status' => 1])->find()); $this->assign("is_admin",is_administrator()); $show_data_power = (is_administrator()|| session('user_auth')['show_data']); diff --git a/Application/Admin/View/Market/rebind.html b/Application/Admin/View/Market/rebind.html new file mode 100644 index 000000000..0acbe4a10 --- /dev/null +++ b/Application/Admin/View/Market/rebind.html @@ -0,0 +1,365 @@ + + + + + + + + + + + + +
+

{$meta_title}

+ +
+ + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*推广公司： + +
*会长： + +
*原市场专员： + -- +
*新市场专员： + +
订单切分时间： + +
备注： + +
+
+ +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + +
推广公司会长账号内外团原市场专员新市场专员订单切分时间备注操作
+
+
+ +
+
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + \ No newline at end of file diff --git a/Application/Admin/View/Market/rebindRecords.html b/Application/Admin/View/Market/rebindRecords.html new file mode 100644 index 000000000..2af097e02 --- /dev/null +++ b/Application/Admin/View/Market/rebindRecords.html @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + +
+

市场换绑

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ 搜索 + 添加 + +
+ +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
推广公司会长账号内外团原市场专员新市场专员备注订单切分时间状态换绑操作时间操作
aOh! 暂时还没有内容!
{$data.company_name}{$data.promote_account}{$data.company_belong}{$data.from_username}{$data.to_username}{$data.remark}{$data.split_time}{$data.status_text}{$data.created_time} +
+ 删除 +
+
+
+
+
+ + + + {$_page|default=''} +
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + + + + \ No newline at end of file diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index dbac7fc44..f0a3f0d0c 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -160,6 +160,16 @@ + +
+ +
+
 
@@ -202,6 +212,7 @@ 玩家账号 所属推广员 + 所属市场专员 @@ -244,7 +255,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -284,6 +295,7 @@ + {$data.market_admin_username} {$data.balance} {$data.recharge_total} {$data.gold_coin|default='0.00'} diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index f7c6790c8..cb5bab994 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -122,6 +122,16 @@ + +
+ +
+
@@ -151,6 +161,7 @@ 玩家账号 游戏名称 所属推广员 + 所属市场专员 充值ip 区服ID 游戏区服 @@ -170,7 +181,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -215,6 +226,7 @@ + {$data.market_admin_username} {$data.spend_ip} — — @@ -272,7 +284,7 @@ 汇总 - + 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 77bf16481..678214c33 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -108,6 +108,16 @@
+ +
+ +
+
搜索
@@ -127,6 +137,7 @@ 角色名 游戏等级 所属推广员 + 所属市场专员 最后登录时间 最后登录IP @@ -161,13 +172,14 @@ {$data.promote_account|encryptStr} + {$data.market_admin_username} {$data.play_ip} - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! diff --git a/Application/Base/Repository/SpendRepository.class.php b/Application/Base/Repository/SpendRepository.class.php index b9b483087..f6fe4b649 100644 --- a/Application/Base/Repository/SpendRepository.class.php +++ b/Application/Base/Repository/SpendRepository.class.php @@ -374,4 +374,175 @@ class SpendRepository { // return M('spend', 'tab_')->field($columns)->where($map); } + + public function achievement() + { + $time = I('time', date('Y-m-d')); + if (!empty($time)) { + $defaultTime = $time; + } else { + $defaultTime = date('Y-m-d', time()); + } + $sdkVersion = I('sdk_version', 0); + $relationGameId = I('relation_game_id', 0); + $serverId = I('server_id', 0); + $parentId = I('parent_id', 0); + $promoteId = I('promote_id', 0); + $status = I('status', 0); + $searchLevel = 0; + $searchLevelName = ''; + $currentDisplay = ''; + $prevParentId = 0; + + $promoteService = new PromoteService(); + $loginPromote = $this->getLoginPromote(); + + $parent = null; + if ($parentId > 0) { + $parent = M('promote', 'tab_')->where(['id' => $parentId])->find(); + $currentDisplay = $promoteService->getLevelName($parent['level']) . '推广'; + $prevParentId = $parent['parent_id'] == $loginPromote['parent_id'] ? 0 : $parent['parent_id']; + } else { + $parent = $loginPromote; + $currentDisplay = '自己'; + } + $searchLevel = $parent['level'] + 1; + $searchLevelName = $promoteService->getLevelName($searchLevel); + + $games = get_promote_serach_game(); + + $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name', 'group_remark'])->where(['parent_id' => $parent['id']])->select(); + + $map = ['parent_id' => $parent['id']]; + if ($promoteId > 0) { + $map['id'] = $promoteId; + } + + $query = M('promote', 'tab_')->field(['id', 'account', 'real_name', 'level', 'chain'])->where($map); + list($promotes, $pagination, $count) = $this->paginate($query); + + $ids = array_column($promotes, 'id'); + + $rows = []; + if (count($ids) > 0) { + $rows = M('promote', 'tab_') + ->field(['id', 'chain']) + ->where(['chain' => ['like', [$parent['chain'] . $parent['id'] . '/%']], 'level' => ['gt', $parent['level'] + 1]]) + ->select(); + } + + $basicPromotes = []; + foreach ($ids as $id) { + foreach ($rows as $row) { + $needChain = $parent['chain'] . $parent['id'] . '/' . $id . '/'; + if (strpos($row['chain'], $needChain) !== false) { + $basicPromotes[$row['id']] = $id; + } + } + } + $params = [ + 'isContainSubs' => true, + 'basicPromotes' => $basicPromotes, + ]; + if ($relationGameId != 0 || $sdkVersion != 0) { + $gameIds = gameSearch($relationGameId, $sdkVersion); + $params['game_id'] = ['in', $gameIds]; + } + if ($serverId > 0) { + $params['server_id'] = $serverId; + } + if ($status > 0) { + $params['lock_status'] = $status; + } + list($beginTime, $endTime) = $this->getBetweenTime($time); + $params['begin_time'] = $beginTime; + $params['end_time'] = $endTime; + + $timeout = 0; + $records = []; + if (intval($endTime - $beginTime) / (24 * 3600) <= 7) { + $promoteRepository = new PromoteRepository(); + $createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params); + $createRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds($ids, $params); + $newCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds($ids, $params); + // $newCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds($ids, $params); + $newCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds($ids, $params); + $loginUserCountList = $promoteRepository->getLoginUserCountByIds($ids, $params); + + $rechargeCountList = []; + $rechargeUserCountList = []; + $rechargeAmountList = []; + if ($this->canViewUserRecharge) { + $rechargeCountList = $promoteRepository->getRechargeCountByIds($ids, $params); + $rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params); + $rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params); + } + + $promoteService = new PromoteService(); + + if (I('p', 1) == 1) { + $selfParams = $params; + $selfParams['isContainSubs'] = false; + $selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$parent['id']], $selfParams); + $selfCreateRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds([$parent['id']], $selfParams); + $selfNewCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds([$parent['id']], $selfParams); + // $selfNewCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds([$parent['id']], $selfParams); + $selfNewCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds([$parent['id']], $selfParams); + $selfLoginUserCountList = $promoteRepository->getLoginUserCountByIds([$parent['id']], $selfParams); + $record = [ + 'id' => $parent['id'], + 'account' => $parent['account'], + 'promote_group' => $promoteService->getGroupNameByChain($parent['chain'], $parent['id']), + 'real_name' => hideRealName($parent['real_name']), + 'level' => $parent['level'], + 'create_role_count' => $selfCreateRoleCountList[$parent['id']], + 'create_role_user_count' => $selfCreateRoleUserCountList[$parent['id']], + 'new_create_role_user_count' => $selfNewCreateRoleUserCountList[$parent['id']], + // 'new_create_role_device_count' => $selfNewCreateRoleDeviceCountList[$parent['id']], + 'new_create_role_ip_count' => $selfNewCreateRoleIpCountList[$parent['id']], + 'login_user_count' => $selfLoginUserCountList[$parent['id']], + 'current_display' => $currentDisplay, + ]; + if ($this->canViewUserRecharge) { + $selfRechargeCountList = $promoteRepository->getRechargeCountByIds([$parent['id']], $selfParams); + $selfRechargeUserCountList = $promoteRepository->getRechargeUserCountByIds([$parent['id']], $selfParams); + $selfRechargeAmountList = $promoteRepository->getRechargeAmountByIds([$parent['id']], $selfParams); + $record['recharge_count'] = $selfRechargeCountList[$parent['id']]; + $record['recharge_user_count'] = $selfRechargeUserCountList[$parent['id']]; + $record['recharge_amount'] = $selfRechargeAmountList[$parent['id']]['ban_coin'] + $selfRechargeAmountList[$parent['id']]['coin'] + $selfRechargeAmountList[$parent['id']]['cash']; + $record['recharge_by_ban_coin'] = $selfRechargeAmountList[$parent['id']]['ban_coin']; + $record['recharge_by_coin'] = $selfRechargeAmountList[$parent['id']]['coin']; + $record['recharge_by_cash'] = $selfRechargeAmountList[$parent['id']]['cash']; + } + $records[] = $record; + } + foreach ($promotes as $promote) { + $id = $promote['id']; + $record = [ + 'id' => $id, + 'account' => $promote['account'], + 'promote_group' => $promoteService->getGroupNameByChain($promote['chain'], $promote['id']), + 'real_name' => hideRealName($promote['real_name']), + 'level' => $promote['level'], + 'create_role_count' => $createRoleCountList[$id], + 'create_role_user_count' => $createRoleUserCountList[$id], + 'new_create_role_user_count' => $newCreateRoleUserCountList[$id], + // 'new_create_role_device_count' => $newCreateRoleDeviceCountList[$id], + 'new_create_role_ip_count' => $newCreateRoleIpCountList[$id], + 'login_user_count' => $loginUserCountList[$id], + 'current_display' => '', + ]; + if ($this->canViewUserRecharge) { + $record['recharge_count'] = $rechargeCountList[$id]; + $record['recharge_user_count'] = $rechargeUserCountList[$id]; + $record['recharge_amount'] = $rechargeAmountList[$id]['ban_coin'] + $rechargeAmountList[$id]['coin'] + $rechargeAmountList[$id]['cash']; + $record['recharge_by_ban_coin'] = $rechargeAmountList[$id]['ban_coin']; + $record['recharge_by_coin'] = $rechargeAmountList[$id]['coin']; + $record['recharge_by_cash'] = $rechargeAmountList[$id]['cash']; + } + $records[] = $record; + } + } else { + $timeout = 1; + } } \ No newline at end of file diff --git a/Application/Base/Service/MarketService.class.php b/Application/Base/Service/MarketService.class.php new file mode 100644 index 000000000..caeb9b26a --- /dev/null +++ b/Application/Base/Service/MarketService.class.php @@ -0,0 +1,74 @@ +field(['chain', 'id', 'level', 'admin_id'])->where(['id' => $promoteId, 'admin_id' => $formId])->find(); + + if (!$promote) { + throw new \Exception('会长不存在'); + } + if ($promote['level'] != 1) { + throw new \Exception('该账号非会长'); + } + $promotes = (new PromoteService)->getAllChildren($promote, 0, ['id']); + $promoteIds = [$promote['id']]; + $promoteIds = array_merge(array_column($promotes, 'id'), $promoteIds); + + $this->shiftPromote($formId, $toId); + $this->shiftSpend($promoteIds, $formId, $toId, $time); + $this->shiftDeposit($promoteIds, $formId, $toId, $time); + } + + private function shiftPromote($promoteId, $formId, $toId, $time = null) + { + $map = []; + $map['id'] = $promoteId; + M('promote', 'tab_')->where($map)->save(['admin_id' => $toId]); + } + + private function shiftSpend($promoteIds, $formId, $toId, $time = null) + { + $map = []; + $map['promote_id'] = ['in', $promoteIds]; + $map['market_admin_id'] = $formId; + if ($time) { + $map['pay_time'] = ['egt', $time]; + } + + $count = M('spend', 'tab_')->where($map)->count(); + $limit = 50; + $pageCount = ceil($count/$limit); + for ($page = 0; $page <= $pageCount; $page ++) { + M('spend', 'tab_')->where($map)->limit($limit)->save(['market_admin_id' => $toId]); + } + M('spend', 'tab_')->where($map)->save(['market_admin_id' => $toId]); + } + + private function shiftDeposit($promoteIds, $formId, $toId, $time = null) + { + $map = []; + $map['promote_id'] = ['in', $promoteIds]; + $map['market_admin_id'] = $formId; + if ($time) { + $map['create_time'] = ['egt', $time]; + } + + $count = M('deposit', 'tab_')->where($map)->count(); + $limit = 50; + $pageCount = ceil($count/$limit); + for ($page = 0; $page <= $pageCount; $page ++) { + M('deposit', 'tab_')->where($map)->limit($limit)->save(['market_admin_id' => $toId]); + } + M('deposit', 'tab_')->where($map)->save(['market_admin_id' => $toId]); + } +} \ No newline at end of file diff --git a/Application/Base/Service/PaymentService.class.php b/Application/Base/Service/PaymentService.class.php new file mode 100644 index 000000000..1cf22bf5a --- /dev/null +++ b/Application/Base/Service/PaymentService.class.php @@ -0,0 +1,8 @@ + + */ +class BaseTask +{ + public $params; + + public function __construct($params = []) + { + $this->params = $params; + } + + public function run() + { + + } +} \ No newline at end of file diff --git a/Application/Base/Task/MarketShiftTask.class.php b/Application/Base/Task/MarketShiftTask.class.php new file mode 100644 index 000000000..7c1a36d7b --- /dev/null +++ b/Application/Base/Task/MarketShiftTask.class.php @@ -0,0 +1,31 @@ + + */ +class MarketShiftTask extends BaseTask +{ + public function run() + { + $id = $this->params['market_shift_id']; + $record = M('market_shift', 'tab_')->where(['id' => $id])->find(); + if (!$record) { + throw new \Exception('换绑记录不存在'); + } + if ($record['status'] != 0) { + throw new \Exception('换绑记录状态错误'); + } + try { + $marketService = new MarketService(); + $marketService->shift($record); + M('market_shift', 'tab_')->where(['id' => $id])->save(['status' => 1]); + } catch (\Exception $e) { + M('market_shift', 'tab_')->where(['id' => $id])->save(['status' => 2]); + throw new \Exception($e->getMessage()); + } + } +} \ No newline at end of file diff --git a/Application/Base/Task/Task.class.php b/Application/Base/Task/Task.class.php new file mode 100644 index 000000000..6e1db5765 --- /dev/null +++ b/Application/Base/Task/Task.class.php @@ -0,0 +1,83 @@ + + */ +class Task +{ + public static $types = [ + 'market-shift' => '\Base\Task\MarketShiftTask', + ]; + + public $type; + public $tasks; + + public function __construct($type = null) + { + $this->type = $type; + } + + public function run($count = 1) + { + $map = ['status' => 0]; + if ($this->type !== null) { + $map['type'] = $this->type; + } + $this->tasks = M('tasks', 'tab_')->where($map)->limit($count)->select(); + if (count($this->tasks) == 0) { + throw new \Exception('暂无任务'); + } + + $this->updateTasks(['status' => 1, 'start_time' => time()]); + + foreach ($this->tasks as $task) { + $class = $this->getTypeClass($task); + if (is_null($class) || !class_exists($class)) { + $this->updateTask($task, ['status' => 3, 'end_time' => time(), 'result' => '任务处理类不存在']); + continue; + } + try { + $params = json_decode($task['params'], true); + $obj = new $class($params); + $obj->run(); + $this->updateTask($task, ['status' => 2, 'end_time' => time(), 'result' => '处理成功']); + } catch (\Exception $e) { + $this->updateTask($task, ['status' => 3, 'end_time' => time(), 'result' => $e->getMessage()]); + } + } + } + + public function getTypeClass($task) + { + if (!isset(self::$types[$task['type']])) { + return null; + } + return self::$types[$task['type']]; + } + + private function updateTask($task, $data) + { + M('tasks', 'tab_')->where(['id' => $task['id']])->save($data); + } + + private function updateTasks($data) + { + $ids = array_column($this->tasks, 'id'); + M('tasks', 'tab_')->where(['id' => ['in', $ids]])->save($data); + } + + public static function add($type, $params = []) + { + if (!isset(self::$types[$type])) { + return false; + } + $record = [ + 'type' => $type, + 'params' => json_encode($params), + 'created_time' => time() + ]; + return M('tasks', 'tab_')->add($record); + } +} \ No newline at end of file diff --git a/Application/Base/Tool/ServiceClient.class.php b/Application/Base/Tool/ServiceClient.class.php new file mode 100644 index 000000000..8bf2c1a21 --- /dev/null +++ b/Application/Base/Tool/ServiceClient.class.php @@ -0,0 +1,63 @@ +client = new Client([ + 'base_uri' => C('SERVICE_URL'), + 'timeout' => 10.0, + ]); + } + + protected function post($uri, $data) + { + $response = $this->client->post($uri, [ + 'verify' => false, + 'form_params' => $data + ]); + $result = (string)$response->getBody(); + return json_decode($result, true); + } + + public function sendSmsCode(string $mobile, string $clientIp) + { + $options = ['type' => 'code', 'client_ip' => $clientIp]; + return $this->sendSms($mobile, $options); + } + + public function sendSmsContent(string $mobile, string $content) + { + $options = ['type' => 'content', 'content' => $content]; + return $this->sendSms($mobile, $options); + } + + public function sendSmsBatch(array $mobiles, string $content) + { + $options = ['type' => 'batch', 'content' => $content]; + return $this->sendSms($mobiles, $options); + } + + private function sendSms($mobile, array $options) + { + return $this->post('/message/sms-send', ['mobile' => $mobile, 'options' => $options]); + } + + public function checkSms($mobile, $code) + { + return $this->post('/message/sms-check', ['mobile' => $mobile, 'code' => $code]); + } + + public function registerEvent($userId, $source) + { + return $this->post('/game-event/register', ['user_id' => $userId, 'source' => $source]); + } +} \ No newline at end of file From 5f5a6ee1aff964060c8787a234021a5e1068381d Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 24 Jun 2020 18:04:23 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 91 +++++++++++++++++- .../Controller/ConsoleController.class.php | 6 +- .../FinancePromoteController.class.php | 96 +++++++++++++++++-- .../Controller/MemberController.class.php | 14 +-- .../Controller/SpendController.class.php | 2 +- .../Admin/Controller/UserController.class.php | 38 +++++--- .../View/FinancePromote/gameStatistics.html | 24 ++++- .../FinancePromote/gameStatisticsDetail.html | 16 ++++ .../Admin/View/FinancePromote/index.html | 26 ++++- .../View/FinancePromote/promoteUser.html | 26 ++++- .../Base/Service/MarketService.class.php | 6 +- 11 files changed, 304 insertions(+), 41 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index e78bd275c..f8dca8f93 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2469,5 +2469,94 @@ function getAvailableBalance($promote_id=0,$game_id=0,$server_id='') { } +function getMarketGroupIds() +{ + return ['11', '12']; +} + +function getMarketAdmins() +{ + $ids = getMarketGroupIds(); + $adminIds = M('auth_group_access', 'sys_')->where(['group_id' => ['in', $ids]])->getField('uid', true); + return M('ucenter_member', 'sys_')->where(['id' => ['in', $adminIds]])->select(); +} + +function getMarketAdminsByPromoteIds($promoteIds) +{ + $promotes = M('promote', 'tab_')->field(['id', 'chain'])->where(['id' => ['in', $promoteIds]])->select(); + $resultMap = []; + foreach ($promotes as $promote) { + if ($promote['chain'] == '/') { + $resultMap[$promote['id']] = ['top_id' => $promote['id']]; + } else { + $item = explode('/', trim($promote['chain'], '/')); + $resultMap[$promote['id']] = ['top_id' => $item[0]]; + } + } + if (count($promotes) == 0) { + return []; + } + $topPromotes = M('promote', 'tab_')->field(['id', 'admin_id'])->where(['id' => ['in', array_column($resultMap, 'top_id')]])->select(); + $topAdminMap = []; + foreach ($topPromotes as $topPromote) { + $topAdminMap[$topPromote['id']] = $topPromote['admin_id']; + } + $admins = M('ucenter_member', 'sys_')->field(['id', 'username'])->where(['id' => ['in', array_column($topPromotes, 'admin_id')]])->select(); + $admins = index_by_column('id', $admins); + foreach ($resultMap as &$row) { + $adminId = $topAdminMap[$row['top_id']] ?? 0; + $admin = $admins[$adminId] ?? null; + $row['admin'] = $admin; + } + return $resultMap; +} + +function getAdminUsernameList(array $ids) +{ + if (count($ids) == 0) { + return []; + } + $admins = M('ucenter_member', 'sys_')->field(['id', 'username'])->where(['id' => ['in', $ids]])->select(); + $items = []; + foreach ($admins as $admin) { + $items[$admin['id']] = $admin['username']; + } + return $items; +} -?> +function isMarketAdmin() +{ + $ids = getMarketGroupIds(); + $userAuth = session('user_auth'); + $adminIds = M('auth_group_access', 'sys_')->where(['group_id' => ['in', $ids]])->getField('uid', true); + return in_array($userAuth['uid'], $adminIds); +} + +function getPromoteIdsByTopIds($ids) +{ + if (count($ids) == 0) { + return []; + } + $idsExp = implode(',', $ids); + $map = array(); + $where['SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,"/",2),"/",-1)'] = array('exp',"IN({$idsExp})"); + $where['id'] = array('in', $ids);//会长本身 + $where['_logic'] = 'or'; + $map['_complex'] = $where; + $result = M('promote', 'tab_')->field('id')->where($map)->getField('id', true); + return $result; +} + +function getCompanyDevelopTypes() +{ + return [ + 1 => '自主开发', + 2 => '自主开发及维护', + 3 => '只维护' + ]; +} + +function getCompanyDevelopTypeText($type) +{ + return getCompanyDevelopTypes()[$type] ?? '无'; +} \ No newline at end of file diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index c035089c1..1d970e99c 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -11,6 +11,7 @@ use Base\Service\PromoteService; use GuzzleHttp\Client; use think\Db; use Base\Task\Task; +use Base\Service\MarketService; class ConsoleController extends Think { @@ -124,8 +125,11 @@ class ConsoleController extends Think { { $marketService = new MarketService(); $promoteService = new PromoteService(); - $promotes = M('promote', 'tab_')->where(['level' => ['gt', 1], 'admin_id' => ['gt', 0], 'company_belong' => ['in', [1, 2]]])->select(); + $promotes = M('promote', 'tab_')->field(['id', 'admin_id', 'account', 'chain', 'level']) + ->where(['level' => 1, 'admin_id' => ['gt', 0], 'company_belong' => ['in', [1, 2]]]) + ->select(); foreach ($promotes as $promote) { + Printer::export('处理会长: ' . $promote['account']); $subPromotes = $promoteService->getAllChildren($promote, 0, ['id']); $promoteIds = [$promote['id']]; $promoteIds = array_merge(array_column($subPromotes, 'id'), $promoteIds); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 24fbd3190..15b84a551 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -76,6 +76,21 @@ class FinancePromoteController extends AdminController $nwtflag = false; } } + if(isset($_REQUEST['admin_id'])){ + if($_REQUEST['admin_id']!=0){ + $nwtflag = false; + } + } + if(isset($_REQUEST['admin_id'])){ + if($_REQUEST['admin_id']!=0){ + $nwtflag = false; + } + } + if(isset($_REQUEST['develop_type'])){ + if($_REQUEST['develop_type']!=0){ + $nwtflag = false; + } + } if (isset($_REQUEST['promote_id'])) { if($_REQUEST['promote_id'] == 0){ $gfidlag = true; @@ -110,7 +125,14 @@ class FinancePromoteController extends AdminController "bind_coin_count"=>0, "inside_cash_count"=>0, ); + $promotes = []; + if (count($senddata) > 0) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($senddata, 'p_id')]])->select(); + } + $promotes = index_by_column('id', $promotes); + $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); foreach($senddata as $k=>$v){ + $promote = $promotes[$v['p_id']] ?? null; $v['company_belong'] = $v['company_belong'] ?:0; $v['company_belong'] = getCompanyBlong($v['company_belong']); if(empty($v['company_name'])) $v['company_name']= $this->COMPANY_NAME; @@ -119,8 +141,10 @@ class FinancePromoteController extends AdminController if(!array_key_exists('balance_coin_count',$v)) $v['balance_coin_count']=0; if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0; if(!array_key_exists('inside_cash_count',$v)) $v['inside_cash_count']=0; - $v['promote_account'] = get_promote_name($v['p_id']); - + $v['promote_account'] = $v['p_id'] == 0 ? '官方渠道' : ($promote ? $promote['account'] : ''); + $v['admin_username'] = $adminUsernames[$promote['admin_id']] ?? '无'; + $v['develop_type_text'] = getCompanyDevelopTypeText($v['develop_type']); + $v['inside_cash_count'] = number_format($v['inside_cash_count'],2,'.',''); $v['allcount'] = number_format($v['cash_count']-0+$v['balance_coin_count']+$v['bind_coin_count'],2,'.',''); $count['cash_count'] += $v['cash_count']; @@ -208,6 +232,13 @@ class FinancePromoteController extends AdminController $map['promote.company_belong'] = $_REQUEST['company_belong']; } + + if (!empty(I('develop_type'))) { + $map['company.develop_type'] = I('develop_type'); + } + if (!empty(I('admin_id'))) { + $map['promote.admin_id'] = I('admin_id'); + } if($type == "spend"){ @@ -222,7 +253,7 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong"; + IFNULL(company_id,0) company_id,company_name,develop_type,IFNULL(promote.company_belong,0) company_belong"; return M() ->table("tab_spend s use index(promote_time)") ->field($field) @@ -319,8 +350,18 @@ class FinancePromoteController extends AdminController "bind_coin_count"=>0, "inside_cash_count"=>0, ); - foreach($senddata as $k=>$v){ + $promotes = []; + if (count($senddata) > 0) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($senddata, 'promote_id')]])->select(); + } + $promotes = index_by_column('id', $promotes); + $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); + + foreach($senddata as $k=>$v){ + $promote = $promotes[$v['promote_id']] ?? null; + $v['admin_username'] = $adminUsernames[$promote['admin_id']] ?? '无'; + $v['develop_type_text'] = getCompanyDevelopTypeText($v['develop_type']); $v['company_belong'] = getCompanyBlong($v['company_belong']); if(empty($v['company_name'])) $v['company_name']= $this->COMPANY_NAME; if(empty($v['promote_account'])) $v['promote_account']= "官方渠道"; @@ -391,7 +432,7 @@ class FinancePromoteController extends AdminController $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, - IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,IFNULL(promote.company_belong,0) company_belong"; + IFNULL(company_id,0) company_id,company_name,promote_id,promote.account promote_account,develop_type,IFNULL(promote.company_belong,0) company_belong"; return M() ->table("tab_spend s use index(promote_time)") ->field($field) @@ -439,6 +480,12 @@ class FinancePromoteController extends AdminController } elseif (isset($_REQUEST['time_end'])) { $map['s.pay_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399]; } + if (!empty(I('develop_type'))) { + $map['develop_type'] = I('develop_type'); + } + if (!empty(I('admin_id'))) { + $map['admin_id'] = I('admin_id'); + } //获取推广员 $title = ''; @@ -454,13 +501,24 @@ class FinancePromoteController extends AdminController }else { $data =self::gameStatisticsData($map, $row, $p); } + $promotes = []; + if (count($data) > 0) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($data, 'p_id')]])->select(); + } + $promotes = index_by_column('id', $promotes); + $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); + foreach ($data as $key => &$value) { + $promote = $promotes[$value['p_id']] ?? null; $value['cash_count']?:0; $value['balance_coin_count']?:0; $value['inside_cash_count']?:0; $value['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.',''); $value['company_belong'] =getCompanyBlong($value['company_belong']); + $value['admin_username'] = $adminUsernames[$promote['admin_id']] ?? '无'; + $value['develop_type_text'] = getCompanyDevelopTypeText($value['develop_type']); + $value['game_name'] =clearGameNameType($value['game_name']); $value['sdk_version'] =getGameTypeName($value['sdk_version']); @@ -538,6 +596,14 @@ class FinancePromoteController extends AdminController $map['pay_order_number'] = $_REQUEST['pay_order_number']; } + /* if (!empty(I('develop_type'))) { + $map['company.develop_type'] = I('develop_type'); + } + + if (!empty(I('admin_id'))) { + $map['market_admin_id'] = I('admin_id'); + } */ + if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type']) || isset($_REQUEST['partner_id'])) { $map["game_id"] = array("in",implode(',', array_column(getGameidByPartnerNameType($_REQUEST['partner_id'],$_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) ); } @@ -650,7 +716,7 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count, IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_name,'{$this->COMPANY_NAME}') company_name,IFNULL(promote.company_belong,0) company_belong") + IFNULL(company_name,'{$this->COMPANY_NAME}') company_name,develop_type,IFNULL(promote.company_belong,0) company_belong") ->join('LEFT JOIN tab_game as g ON s.game_id=g.id') ->join("tab_promote promote ON s.promote_id = promote.id","left") ->join("tab_promote_company company ON promote.company_id = company.id","left") @@ -678,7 +744,9 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count"); if ($join) { $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id') - ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id'); + ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id') + ->join("tab_promote promote ON s.promote_id = promote.id","left") + ->join("tab_promote_company company ON promote.company_id = company.id","left"); } $data = $query->where(['s.pay_status' => 1]) ->where($map) @@ -987,6 +1055,20 @@ class FinancePromoteController extends AdminController } $title .= (getCompanyBlong($_REQUEST['company_belong'])."-"); } + + if (!empty(I('develop_type'))) { + $map['company.develop_type'] = I('develop_type'); + if(I('develop_type') != 0){ + $gfflg = false; + } + } + if (!empty(I('admin_id'))) { + $map['promote.admin_id'] = I('admin_id'); + if(I('admin_id') != 0){ + $gfflg = false; + } + } + if (isset($_REQUEST['promote_id'])) { if($ptype){ $pmap = false;//取消非特异推广员检索 diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 6e06bb156..febe047cf 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -81,13 +81,13 @@ class MemberController extends ThinkController $marketAdminId = I('market_admin_id', 0); if ($marketAdminId) { - $map['tab_user.market_admin_id'] = $marketAdminId; + $map['promote.admin_id'] = $marketAdminId; } $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { $userAuth = session('user_auth'); - $map['tab_user.market_admin_id'] = $userAuth['uid']; + $map['promote.admin_id'] = $userAuth['uid']; } if (isset($_REQUEST['status'])) { @@ -144,8 +144,8 @@ class MemberController extends ThinkController $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]); //计算用户列表 $data = M("user","tab_") - ->field("tab_user.id,`device_number`,`age_status`,`account`,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark, - `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat,tab_user.market_admin_id") + ->field("tab_user.id,`device_number`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark, + `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat,promote.admin_id") ->where($map) ->group("tab_user.id") ->order($order); @@ -164,6 +164,7 @@ class MemberController extends ThinkController "); } $data->join("tab_user_data AS ss ON ss.user_id = tab_user.id","left"); + $data->join("tab_promote AS promote ON promote.id = tab_user.promote_id", "left"); if(!isset($_REQUEST['export'])){ $data ->page($page, $row); @@ -228,10 +229,10 @@ class MemberController extends ThinkController data2csv($data,"玩家_玩家列表",$field); } - $adminUsernameList = getAdminUsernameList(array_column($data, 'market_admin_id')); + $adminUsernameList = getAdminUsernameList(array_column($data, 'admin_id')); foreach ($data as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; - $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + $value['market_admin_username'] = $adminUsernameList[$value['admin_id']] ?? '无'; } //计算总人数 @@ -258,6 +259,7 @@ class MemberController extends ThinkController "); } $user_count->join("tab_user_data AS ss ON ss.user_id = tab_user.id","left"); + $user_count->join("tab_promote AS promote ON promote.id = tab_user.promote_id", "left"); $userDbRes = $user_count->find(); if($is_repeat){ $user_count =$userDbRes['user_count']; diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index b2fe67251..cc1c4a612 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -136,7 +136,7 @@ class SpendController extends ThinkController $data = D(self::model_name)->lists($_GET["p"], $map, $order); - $adminUsernameList = getAdminUsernameList(array_column($data, 'market_admin_id')); + $adminUsernameList = getAdminUsernameList(array_column($data['data'], 'market_admin_id')); foreach ($data['data'] as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 45dc6352e..d803f2324 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -666,25 +666,35 @@ class UserController extends AdminController unset($_REQUEST['role_id']); } - $marketAdminId = I('market_admin_id', 0); - if ($marketAdminId) { - $map['market_admin_id'] = $marketAdminId; - } - + $adminId = 0; $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { $userAuth = session('user_auth'); - $map['market_admin_id'] = $userAuth['uid']; + $adminId = $userAuth['uid']; } -// $promoteRoot = getPowerPromoteIds(); -// $data_empower_type = session('user_auth')['data_empower_type']; -// -// if ($promoteRoot) { + $marketAdminId = I('market_admin_id', 0); + if ($adminId == 0) { + $adminId = $marketAdminId > 0 ? $marketAdminId : 0; + } + + if ($adminId) { + $topPromoteIds = M('promote', 'tab_')->where(['admin_id' => $adminId, 'level' => 1])->getField('id', true); + $promoteIds = getPromoteIdsByTopIds($topPromoteIds); + if (count($promoteIds) == 0) { + $promoteIds = [-1]; + } + $map['promote_id'] = ['in', $promoteIds]; + } + + // $promoteRoot = getPowerPromoteIds(); + // $data_empower_type = session('user_auth')['data_empower_type']; + // + // if ($promoteRoot) { // $map['promote_id'] =array('in',$promoteRoot); // } else if(!$promoteRoot&&$data_empower_type!=1){ -// $map['id'] = array('lt',1); -// } + // $map['id'] = array('lt',1); + // } setPowerPromoteIds($map,'promote_id'); if (isset($_REQUEST['promote_id'])) { @@ -716,10 +726,10 @@ class UserController extends AdminController $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]); $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); - $adminUsernameList = getAdminUsernameList(array_column($list, 'market_admin_id')); + $adminList = getMarketAdminsByPromoteIds(array_column($list, 'promote_id')); foreach ($list as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; - $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; + $value['market_admin_username'] = isset($adminList[$value['promote_id']]) && $adminList[$value['promote_id']]['admin'] ? $adminList[$value['promote_id']]['admin']['username'] : '无'; } $this->assign('list', $list); diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index 553f6b7bc..3e142e708 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -128,6 +128,23 @@ +
+ +
+ +
+ +
+
+ +
+
+ +
diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 1a4edb172..0b748e630 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -119,6 +119,24 @@ +
+ +
+ +
+ +
+
@@ -165,8 +183,9 @@ 推广公司 会长渠道 + 所属市场专员 内外团 - + 开发类型 游戏现金金额▲ @@ -215,8 +234,9 @@ {$data.company_name} {$data['promote_account']} + {$data['admin_username']} {$data['company_belong']} - + {$data['develop_type_text']} {$data.cash_count} {$data.balance_coin_count} @@ -248,7 +268,7 @@ - 汇总: + 汇总: {$all_count['cash_count']} {$all_count['balance_coin_count']} {$all_count['bind_coin_count']} diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html index 589b01a3a..b7cc5c3eb 100644 --- a/Application/Admin/View/FinancePromote/promoteUser.html +++ b/Application/Admin/View/FinancePromote/promoteUser.html @@ -109,6 +109,23 @@
+
+ +
+ +
+ +
@@ -157,7 +174,9 @@ 推广公司 推广员账号 - 内外团 + 所属市场专员 + 团体类型 + 开发类型 游戏现金金额▲ @@ -206,8 +225,9 @@ {$data.company_name} {$data['promote_account']} + {$data['admin_username']} {$data['company_belong']} - + {$data['develop_type_text']} {$data.cash_count} {$data.balance_coin_count} {$data.bind_coin_count} @@ -222,7 +242,7 @@ - 汇总: + 汇总: --- {$all_count['cash_count']} {$all_count['balance_coin_count']} diff --git a/Application/Base/Service/MarketService.class.php b/Application/Base/Service/MarketService.class.php index caeb9b26a..f6b85bbb0 100644 --- a/Application/Base/Service/MarketService.class.php +++ b/Application/Base/Service/MarketService.class.php @@ -29,14 +29,14 @@ class MarketService $this->shiftDeposit($promoteIds, $formId, $toId, $time); } - private function shiftPromote($promoteId, $formId, $toId, $time = null) + public function shiftPromote($promoteId, $formId, $toId, $time = null) { $map = []; $map['id'] = $promoteId; M('promote', 'tab_')->where($map)->save(['admin_id' => $toId]); } - private function shiftSpend($promoteIds, $formId, $toId, $time = null) + public function shiftSpend($promoteIds, $formId, $toId, $time = null) { $map = []; $map['promote_id'] = ['in', $promoteIds]; @@ -54,7 +54,7 @@ class MarketService M('spend', 'tab_')->where($map)->save(['market_admin_id' => $toId]); } - private function shiftDeposit($promoteIds, $formId, $toId, $time = null) + public function shiftDeposit($promoteIds, $formId, $toId, $time = null) { $map = []; $map['promote_id'] = ['in', $promoteIds]; From 76fcfec7c2ecd1c4ade03555525dde9590ed8aa6 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sun, 28 Jun 2020 10:52:43 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 24 ++++++++ .../Controller/ConsoleController.class.php | 6 +- .../Controller/ExportController.class.php | 10 +++- .../FinancePromoteController.class.php | 10 +++- .../Controller/MarketController.class.php | 57 ++++++++++++++++++- .../Controller/MemberController.class.php | 4 +- .../Admin/Controller/UserController.class.php | 21 +------ .../Admin/View/Market/rebindRecords.html | 32 +++++++++-- Application/Admin/View/User/rolelist.html | 1 + .../Base/Service/MarketService.class.php | 27 +++++---- Application/Base/Task/Task.class.php | 22 +++++-- 11 files changed, 164 insertions(+), 50 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index f8dca8f93..ac8a86f56 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2559,4 +2559,28 @@ function getCompanyDevelopTypes() function getCompanyDevelopTypeText($type) { return getCompanyDevelopTypes()[$type] ?? '无'; +} + +function withMarketAdminCondition($map, $searchMarketAdminId = 0) +{ + $adminId = 0; + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $userAuth = session('user_auth'); + $adminId = $userAuth['uid']; + } + + if ($adminId == 0) { + $adminId = $searchMarketAdminId > 0 ? $searchMarketAdminId : 0; + } + + if ($adminId) { + $topPromoteIds = M('promote', 'tab_')->where(['admin_id' => $adminId, 'level' => 1])->getField('id', true); + $promoteIds = getPromoteIdsByTopIds($topPromoteIds); + if (count($promoteIds) == 0) { + $promoteIds = [-1]; + } + $map['promote_id'] = ['in', $promoteIds]; + } + return $map; } \ No newline at end of file diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 1d970e99c..62c10f21a 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -94,12 +94,12 @@ class ConsoleController extends Think { } } - public function runTask($type = null, $count = 1) + public function runTask($queue = 'common', $count = 1) { - Printer::export($type); + Printer::export($queue); Printer::export($count); try { - $task = new Task($type); + $task = new Task($queue); $task->run($count); Printer::export('运行完成'); } catch (\Exception $e) { diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index f0eac80a3..fe9db7e1e 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -64,8 +64,8 @@ class ExportController extends Controller // array('play_ip', "最后登录ip"), // ); $xlsCell = array( - "创建时间","玩家账号", "游戏名称","游戏区服", L('Game_area_clothing'), "角色ID", "角色名", "游戏等级","所属推广员", - "最后登录时间", '最后登录ip', + "创建时间","玩家账号", "游戏名称","游戏区服", L('Game_area_clothing'), "角色ID", "角色名", "游戏等级","推广员ID", "所属推广员", + "最后登录时间", '最后登录ip','所属市场专员' ); if (isset($_REQUEST['game_name'])) { $map['game_name'] = ['like', trim($_REQUEST['game_name'])."%"]; @@ -92,6 +92,8 @@ class ExportController extends Controller unset($_REQUEST['role_name']); } + $map = withMarketAdminCondition($map, I('market_admin_id', 0)); + // $promoteRoot = getPowerPromoteIds(); // $data_empower_type = session('user_auth')['data_empower_type']; // @@ -147,13 +149,15 @@ class ExportController extends Controller for($i = 1; $i <= $pages; $i++) { $xlsData = M('user_play_info', 'tab_') - ->field("create_time,user_account,game_name,server_id,server_name,role_id,role_name,role_level,promote_account,play_time,play_ip") + ->field("create_time,user_account,game_name,server_id,server_name,role_id,role_name,role_level,promote_id,promote_account,play_time,play_ip") ->where($map) ->limit(($i-1)*$perSize ,$perSize) ->order('play_time desc') ->select(); + $adminList = getMarketAdminsByPromoteIds(array_column($xlsData, 'promote_id')); foreach($xlsData as $value) { + $value['market_admin_username'] = isset($adminList[$value['promote_id']]) && $adminList[$value['promote_id']]['admin'] ? $adminList[$value['promote_id']]['admin']['username'] : '无'; $value['create_time'] = date("Y-m-d H:i:s",$value['create_time']); $value['play_time'] = date("Y-m-d H:i:s",$value['play_time']); mb_convert_variables('GBK', 'UTF-8', $value); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 15b84a551..43e4699d5 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -164,7 +164,9 @@ class FinancePromoteController extends AdminController data2csv($data,'公会统计',array( "company_name"=>"推广公司", "promote_account"=>"会长渠道", - "company_belong"=>"内外团", + "admin_username"=>"所属市场专员", + "company_belong"=>"团体类型", + "develop_type_text"=>"开发类型", "cash_count"=>"游戏现金金额", "balance_coin_count"=>"平台币直充支出", "bind_coin_count"=>"内充支出", @@ -395,7 +397,9 @@ class FinancePromoteController extends AdminController data2csv($data,'渠道统计',array( "company_name"=>"推广公司", "promote_account"=>"推广员账号", - "company_belong"=>"内外团", + "admin_username"=>"所属市场专员", + "company_belong"=>"团体类型", + "develop_type_text"=>"开发类型", "cash_count"=>"游戏现金金额", "balance_coin_count"=>"平台币直充支出", "bind_coin_count"=>"内充支出", @@ -537,7 +541,9 @@ class FinancePromoteController extends AdminController data2csv($data,$title, array( "company_name"=>"推广公司", "account"=>"会长账号", + "admin_username"=>"所属市场专员", "company_belong"=>"团体类型", + "develop_type_text"=>"开发类型", "game_name"=>"游戏", "sdk_version"=>"设备", "cash_count"=>"游戏现金金额", diff --git a/Application/Admin/Controller/MarketController.class.php b/Application/Admin/Controller/MarketController.class.php index e8dc2b908..cae762737 100644 --- a/Application/Admin/Controller/MarketController.class.php +++ b/Application/Admin/Controller/MarketController.class.php @@ -66,6 +66,7 @@ class MarketController extends ThinkController 0 => '待处理', 1 => '处理成功', 2 => '处理失败', + 3 => '已取消' ]; $records = []; @@ -78,7 +79,7 @@ class MarketController extends ThinkController 'remark' => $item['remark'], 'from_username' => $recordAdmins[$item['from_id']]['username'], 'to_username' => $recordAdmins[$item['to_id']]['username'], - 'split_time' => date('Y-m-d H:i:s', $item['split_time']), + 'split_time' => $item['split_time'] == 0 ? '全部' : date('Y-m-d H:i:s', $item['split_time']), 'created_time' => date('Y-m-d H:i:s', $item['created_time']), 'status_text' => $statusList[$item['status']], 'status' => $item['status'] @@ -116,13 +117,37 @@ class MarketController extends ThinkController ]); } + $status = true; + $message = ''; + foreach ($records as $record) { + if ($record['from_id'] == $record['to_id']) { + $status = false; + $message = '含有原市场专员与新市场专员相同数据，不可转换。'; + break; + } + } + if (!$status) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => $message + ]); + } + + $hasRecord = M('market_shift', 'tab_')->where(['promote_id' => ['in', array_column($records, 'promote_id')], 'status' => 0])->find(); + if ($hasRecord) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '该会长含有未完成的市场换绑任务，请稍后再申请。' + ]); + } + $userAuth = session('user_auth'); foreach ($records as $record) { $item = [ 'promote_id' => $record['promote_id'], 'from_id' => $record['from_id'], 'to_id' => $record['to_id'], - 'split_time' => $record['split_time'], + 'split_time' => strtotime($record['split_time']), 'remark' => $record['remark'], 'creator_id' => $userAuth['uid'], 'created_time' => time() @@ -158,6 +183,34 @@ class MarketController extends ThinkController ]); } + public function cancel() + { + $id = I('id', 0); + $shift = M('market_shift', 'tab_')->where(['id' => $id])->find(); + + if ($shift['status'] != 0) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '该换绑非待处理状态，不可取消' + ]); + } + + addOperationLog([ + 'op_type' => 2, + 'key' => $id, + 'op_name' => '取消市场换绑记录', + 'url' => U('Market/delete', ['id' => $id]), + 'menu' => '推广员-推广员管理-市场换绑-取消市场换绑记录' + ]); + + M('market_shift', 'tab_')->where(['id' => $id])->save(['status' => 3]); + + $this->ajaxReturn([ + 'status' => 1, + 'message' => '取消成功' + ]); + } + public function getPromotesByCompany() { $companyId = I('company_id', 0); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index febe047cf..bbee60d51 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -182,6 +182,7 @@ class MemberController extends ThinkController if(empty($viplevel)) {$viplevel = false;} } + $adminUsernameList = getAdminUsernameList(array_column($data, 'admin_id')); foreach ($data as $k => &$v) { $v['register_type'] = get_registertype($v['register_type']); if(!$isadmin){ @@ -211,10 +212,11 @@ class MemberController extends ThinkController $v['lock_status'] = get_info_status($v['lock_status'],4); $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑"; $v['is_repeat'] = $v['is_repeat']==1 ? "是" :"否"; + $v['market_admin_username'] = $adminUsernameList[$v['admin_id']] ?? '无'; } $field = array( - "id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币", + "id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","market_admin_username"=>"所属市场专员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币", "small_count"=>"小号","vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间", "device_number"=>"设备号","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态" ); diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index d803f2324..2618801a6 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -666,26 +666,7 @@ class UserController extends AdminController unset($_REQUEST['role_id']); } - $adminId = 0; - $isMarketAdmin = isMarketAdmin(); - if ($isMarketAdmin) { - $userAuth = session('user_auth'); - $adminId = $userAuth['uid']; - } - - $marketAdminId = I('market_admin_id', 0); - if ($adminId == 0) { - $adminId = $marketAdminId > 0 ? $marketAdminId : 0; - } - - if ($adminId) { - $topPromoteIds = M('promote', 'tab_')->where(['admin_id' => $adminId, 'level' => 1])->getField('id', true); - $promoteIds = getPromoteIdsByTopIds($topPromoteIds); - if (count($promoteIds) == 0) { - $promoteIds = [-1]; - } - $map['promote_id'] = ['in', $promoteIds]; - } + $map = withMarketAdminCondition($map, I('market_admin_id', 0)); // $promoteRoot = getPowerPromoteIds(); // $data_empower_type = session('user_auth')['data_empower_type']; diff --git a/Application/Admin/View/Market/rebindRecords.html b/Application/Admin/View/Market/rebindRecords.html index 2af097e02..1a85d4e10 100644 --- a/Application/Admin/View/Market/rebindRecords.html +++ b/Application/Admin/View/Market/rebindRecords.html @@ -73,7 +73,7 @@
- 搜索 + 搜索 添加
@@ -99,7 +99,7 @@ 订单切分时间 状态 换绑操作时间 - 操作 + @@ -119,11 +119,14 @@ {$data.split_time} {$data.status_text} {$data.created_time} - + @@ -232,6 +235,27 @@ }) } }) + $('.cancel-btn').on({ + click: function() { + var id = $(this).parents('tr').eq(0).attr('data-id'); + $.ajax({ + url: '{:U("cancel")}', + type: 'post', + dataType: 'json', + data: {id: id}, + success: function(result) { + if (result.status == 1) { + layer.msg(result.message) + setTimeout(function() { + window.location.href = window.location.href + }, 200) + } else { + layer.msg(result.message) + } + } + }) + } + }) }); /* $(".export-btn").on("click",function(e){ e.preventDefault(); diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 678214c33..9f6c3ceb6 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -194,6 +194,7 @@ 'role_name'=>I('role_name'), 'promote_level'=>I('promote_level'), 'promote_id'=>I('promote_id'), + 'market_admin_id'=>I('market_admin_id'), 'game_type'=>I('game_type'), 'xlsname'=>'玩家_角色查询', 'time_start'=>I('time_start'), diff --git a/Application/Base/Service/MarketService.class.php b/Application/Base/Service/MarketService.class.php index f6b85bbb0..d2b92ea76 100644 --- a/Application/Base/Service/MarketService.class.php +++ b/Application/Base/Service/MarketService.class.php @@ -7,12 +7,12 @@ class MarketService { public function shift($marketShift) { - $formId = $marketShift['form_id']; + $fromId = $marketShift['from_id']; $promoteId = $marketShift['promote_id']; $toId = $marketShift['to_id']; $time = $marketShift['split_time'] == 0 ? null : $marketShift['split_time']; - $promote = M('promote', 'tab_')->field(['chain', 'id', 'level', 'admin_id'])->where(['id' => $promoteId, 'admin_id' => $formId])->find(); + $promote = M('promote', 'tab_')->field(['chain', 'id', 'level', 'admin_id'])->where(['id' => $promoteId, 'admin_id' => $fromId])->find(); if (!$promote) { throw new \Exception('会长不存在'); @@ -20,27 +20,34 @@ class MarketService if ($promote['level'] != 1) { throw new \Exception('该账号非会长'); } + if ($fromId == $toId) { + throw new \Exception('原市场专员与新市场专员相同，不可转换。'); + } + if ($promote['admin_id'] == $toId) { + throw new \Exception('新市场专员与现市场专员相同，不可转换。'); + } $promotes = (new PromoteService)->getAllChildren($promote, 0, ['id']); $promoteIds = [$promote['id']]; $promoteIds = array_merge(array_column($promotes, 'id'), $promoteIds); - $this->shiftPromote($formId, $toId); - $this->shiftSpend($promoteIds, $formId, $toId, $time); - $this->shiftDeposit($promoteIds, $formId, $toId, $time); + $this->shiftPromote($promoteId, $fromId, $toId); + $this->shiftSpend($promoteIds, $fromId, $toId, $time); + $this->shiftDeposit($promoteIds, $fromId, $toId, $time); } - public function shiftPromote($promoteId, $formId, $toId, $time = null) + public function shiftPromote($promoteId, $fromId, $toId, $time = null) { $map = []; $map['id'] = $promoteId; + $map['admin_id'] = $fromId; M('promote', 'tab_')->where($map)->save(['admin_id' => $toId]); } - public function shiftSpend($promoteIds, $formId, $toId, $time = null) + public function shiftSpend($promoteIds, $fromId, $toId, $time = null) { $map = []; $map['promote_id'] = ['in', $promoteIds]; - $map['market_admin_id'] = $formId; + $map['market_admin_id'] = $fromId; if ($time) { $map['pay_time'] = ['egt', $time]; } @@ -54,11 +61,11 @@ class MarketService M('spend', 'tab_')->where($map)->save(['market_admin_id' => $toId]); } - public function shiftDeposit($promoteIds, $formId, $toId, $time = null) + public function shiftDeposit($promoteIds, $fromId, $toId, $time = null) { $map = []; $map['promote_id'] = ['in', $promoteIds]; - $map['market_admin_id'] = $formId; + $map['market_admin_id'] = $fromId; if ($time) { $map['create_time'] = ['egt', $time]; } diff --git a/Application/Base/Task/Task.class.php b/Application/Base/Task/Task.class.php index 6e1db5765..b2b91e0a2 100644 --- a/Application/Base/Task/Task.class.php +++ b/Application/Base/Task/Task.class.php @@ -11,20 +11,32 @@ class Task 'market-shift' => '\Base\Task\MarketShiftTask', ]; - public $type; + public static $queues = [ + 'common' => [], + 'market-shift' => ['market-shift'] + ]; + + public $queue; public $tasks; - public function __construct($type = null) + public function __construct($queue = 'common') { - $this->type = $type; + $this->queue = $queue; } public function run($count = 1) { $map = ['status' => 0]; - if ($this->type !== null) { - $map['type'] = $this->type; + if (!isset(self::$queues[$this->queue])) { + throw new \Exception('无此队列'); } + $types = self::$queues[$this->queue]; + if (count($types) > 0) { + $map['type'] = ['in', $types]; + } else { + throw new \Exception('暂无任务'); + } + $this->tasks = M('tasks', 'tab_')->where($map)->limit($count)->select(); if (count($this->tasks) == 0) { throw new \Exception('暂无任务'); From 11caa30cfa314b800fe0315d1b1a49e00e32389a Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sun, 28 Jun 2020 11:11:02 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 13bdaac33..b4d59aba4 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1998,4 +1998,32 @@ ADD UNIQUE INDEX `userid_type`(`user_id`, `type`) COMMENT '用户id与类型唯 ALTER TABLE `tab_promote` ADD COLUMN `withdraw_show` tinyint(2) NOT NULL DEFAULT 0 COMMENT '推广员提现查看权限 1 有 0 无' AFTER `group_remark`, -ADD COLUMN `withdraw_done` tinyint(2) NOT NULL DEFAULT 0 COMMENT '推广员提现查看权限 1 有 0 无' AFTER `withdraw_show`; \ No newline at end of file +ADD COLUMN `withdraw_done` tinyint(2) NOT NULL DEFAULT 0 COMMENT '推广员提现查看权限 1 有 0 无' AFTER `withdraw_show`; + +CREATE TABLE `tab_tasks` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `type` varchar(20) COLLATE utf8mb4_bin NOT NULL COMMENT '类型', + `params` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '参数', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态 0 待处理 1 处理中 2 处理成功 3 处理失败 ', + `result` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '处理结果', + `start_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '处理开始时间', + `end_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '处理结束时间', + `created_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +CREATE TABLE `tab_market_shift` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `promote_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '会长ID', + `from_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '原市场专员ID', + `to_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '市场专员ID', + `split_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '切割时间', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态 0 待处理 1 处理成功 2 处理失败 ', + `remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注', + `creator_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者', + `created_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +ALTER TABLE `tab_deposit` add column `market_admin_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '市场专员ID' after promote_account; +ALTER TABLE `tab_spend` add column `market_admin_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '市场专员ID' after promote_account; \ No newline at end of file From 6f2f588617e2aced2b8b205a77e7b1c228b6cdcc Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sun, 28 Jun 2020 14:39:30 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 10 ++++++---- .../FinancePromoteController.class.php | 15 ++++++++++++--- Application/Base/Task/Task.class.php | 3 ++- Application/Base/Task/TestTask.class.php | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 Application/Base/Task/TestTask.class.php diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 62c10f21a..787594709 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -94,7 +94,7 @@ class ConsoleController extends Think { } } - public function runTask($queue = 'common', $count = 1) + public function runTask($queue = 'common', $count = 10) { Printer::export($queue); Printer::export($count); @@ -109,7 +109,7 @@ class ConsoleController extends Think { public function addTask() { - $id = M('market_shift', 'tab_')->add([ + /* $id = M('market_shift', 'tab_')->add([ 'from_id' => 1, 'to_id' => 2, 'split_time' => 0, @@ -117,8 +117,10 @@ class ConsoleController extends Think { ]); $params = [ 'market_shift_id' => $id - ]; - Task::add('market-shift', $params); + ]; */ + for ($i=0; $i<50; $i++) { + Task::add('test', ['value' => $i]); + } } public function initMarketAdmin() diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 43e4699d5..24a0b62f3 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -127,7 +127,10 @@ class FinancePromoteController extends AdminController ); $promotes = []; if (count($senddata) > 0) { - $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($senddata, 'p_id')]])->select(); + $promoteIds = array_column($senddata, 'p_id'); + if ($promoteIds) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', $promoteIds]])->select(); + } } $promotes = index_by_column('id', $promotes); $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); @@ -355,7 +358,10 @@ class FinancePromoteController extends AdminController $promotes = []; if (count($senddata) > 0) { - $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($senddata, 'promote_id')]])->select(); + $promoteIds = array_column($senddata, 'promote_id'); + if (count($promoteIds)) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', $promoteIds]])->select(); + } } $promotes = index_by_column('id', $promotes); $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); @@ -507,7 +513,10 @@ class FinancePromoteController extends AdminController } $promotes = []; if (count($data) > 0) { - $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', array_column($data, 'p_id')]])->select(); + $promoteIds = array_column($data, 'p_id'); + if (count($promoteIds) > 0) { + $promotes = M('promote', 'tab_')->field(['id', 'account', 'admin_id'])->where(['id' => ['in', $promoteIds]])->select(); + } } $promotes = index_by_column('id', $promotes); $adminUsernames = getAdminUsernameList(array_column($promotes, 'admin_id')); diff --git a/Application/Base/Task/Task.class.php b/Application/Base/Task/Task.class.php index b2b91e0a2..902f5ad97 100644 --- a/Application/Base/Task/Task.class.php +++ b/Application/Base/Task/Task.class.php @@ -9,10 +9,11 @@ class Task { public static $types = [ 'market-shift' => '\Base\Task\MarketShiftTask', + 'test' => '\Base\Task\TestTask', ]; public static $queues = [ - 'common' => [], + 'common' => ['test'], 'market-shift' => ['market-shift'] ]; diff --git a/Application/Base/Task/TestTask.class.php b/Application/Base/Task/TestTask.class.php new file mode 100644 index 000000000..f4f8894f6 --- /dev/null +++ b/Application/Base/Task/TestTask.class.php @@ -0,0 +1,17 @@ + + */ +class TestTask extends BaseTask +{ + public function run() + { + echo '测试' . $this->params['value'] . '执行成功'; + echo PHP_EOL; + } +} \ No newline at end of file From f0a8b6bc3b39773031114b4161ea2fcc5e5d1d09 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sun, 28 Jun 2020 17:05:11 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 8 ++++++++ Application/Admin/Controller/MarketController.class.php | 2 +- Application/Admin/Controller/MemberController.class.php | 9 ++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index ac8a86f56..edca2eb7d 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2474,6 +2474,11 @@ function getMarketGroupIds() return ['11', '12']; } +function getAdmins() +{ + return M('ucenter_member', 'sys_')->select(); +} + function getMarketAdmins() { $ids = getMarketGroupIds(); @@ -2483,6 +2488,9 @@ function getMarketAdmins() function getMarketAdminsByPromoteIds($promoteIds) { + if (count($promoteIds) == 0) { + return []; + } $promotes = M('promote', 'tab_')->field(['id', 'chain'])->where(['id' => ['in', $promoteIds]])->select(); $resultMap = []; foreach ($promotes as $promote) { diff --git a/Application/Admin/Controller/MarketController.class.php b/Application/Admin/Controller/MarketController.class.php index cae762737..f0a69f1de 100644 --- a/Application/Admin/Controller/MarketController.class.php +++ b/Application/Admin/Controller/MarketController.class.php @@ -218,7 +218,7 @@ class MarketController extends ThinkController ->where(['level' => 1, 'company_id' => $companyId, 'admin_id' => ['gt', 0]]) ->select(); - $marketAdmins = index_by_column('id', getMarketAdmins()); + $marketAdmins = index_by_column('id', getAdmins()); $records = []; foreach ($promotes as $promote) { diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index bbee60d51..cedaf1bd2 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -182,7 +182,7 @@ class MemberController extends ThinkController if(empty($viplevel)) {$viplevel = false;} } - $adminUsernameList = getAdminUsernameList(array_column($data, 'admin_id')); + $adminList = getMarketAdminsByPromoteIds(array_column($data, 'promote_id')); foreach ($data as $k => &$v) { $v['register_type'] = get_registertype($v['register_type']); if(!$isadmin){ @@ -212,7 +212,7 @@ class MemberController extends ThinkController $v['lock_status'] = get_info_status($v['lock_status'],4); $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑"; $v['is_repeat'] = $v['is_repeat']==1 ? "是" :"否"; - $v['market_admin_username'] = $adminUsernameList[$v['admin_id']] ?? '无'; + $v['market_admin_username'] = isset($adminList[$v['promote_id']]) && $adminList[$v['promote_id']]['admin'] ? $adminList[$v['promote_id']]['admin']['username'] : '无'; } $field = array( @@ -230,11 +230,10 @@ class MemberController extends ThinkController )); data2csv($data,"玩家_玩家列表",$field); } - - $adminUsernameList = getAdminUsernameList(array_column($data, 'admin_id')); + $adminList = getMarketAdminsByPromoteIds(array_column($data, 'promote_id')); foreach ($data as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; - $value['market_admin_username'] = $adminUsernameList[$value['admin_id']] ?? '无'; + $value['market_admin_username'] = isset($adminList[$value['promote_id']]) && $adminList[$value['promote_id']]['admin'] ? $adminList[$value['promote_id']]['admin']['username'] : '无'; } //计算总人数 From 34691d6baac18f8888f8b2b254fc06ab8d8d88e4 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sun, 28 Jun 2020 17:56:38 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Market/rebind.html | 2 +- Application/Admin/View/Market/rebindRecords.html | 2 +- Application/Base/Service/MarketService.class.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/View/Market/rebind.html b/Application/Admin/View/Market/rebind.html index 0acbe4a10..b07c9a635 100644 --- a/Application/Admin/View/Market/rebind.html +++ b/Application/Admin/View/Market/rebind.html @@ -195,7 +195,7 @@