From 3a192b1f2ba665b4d149f35c1576707a7e140064 Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Mon, 13 Dec 2021 13:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteLimitRuleController.class.php | 140 +++++++-- .../Admin/View/PromoteLimitRule/form.html | 297 +++++++++++++----- .../Admin/View/PromoteLimitRule/records.html | 122 ++++--- .../Base/Service/PromoteService.class.php | 61 ++-- Data/update.sql | 6 +- 5 files changed, 470 insertions(+), 156 deletions(-) diff --git a/Application/Admin/Controller/PromoteLimitRuleController.class.php b/Application/Admin/Controller/PromoteLimitRuleController.class.php index 8246a553e..38ab43f62 100644 --- a/Application/Admin/Controller/PromoteLimitRuleController.class.php +++ b/Application/Admin/Controller/PromoteLimitRuleController.class.php @@ -17,14 +17,22 @@ class PromoteLimitRuleController extends ThinkController $row = I('row', 10); $companyId = I('company_id', 0); $promoteId = I('promote_id', 0); + $account = I('account', ''); + $baseGameId = I('base_game_id', -1); + $batchNo = I('batch_no', ''); - $conditions = []; + $conditions = ['_string' => '1=1']; $promoteIds = []; - if ($promoteId !== 0) { - $promoteIds = [$promoteId]; + if ($account != '') { + $promote = M('promote', 'tab_')->field(['id'])->where(['account' => $account])->find(); + if ($promote) { + $promoteIds = [$promote['id']]; + } else { + $conditions['_string'] .= ' and 1=0'; + } } if ($companyId !== 0) { - $companyPromoteIds = M('promote', 'tab_')->field(['id'])->where(['company_id' => $companyId, 'level' => 1])->getField('id', true); + $companyPromoteIds = M('promote', 'tab_')->field(['id'])->where(['company_id' => $companyId])->getField('id', true); if (count($companyPromoteIds) > 0) { $promoteIds = count($promoteIds) ? array_intersect($companyPromoteIds, $promoteIds) : $companyPromoteIds; $promoteIds[] = 0; @@ -35,10 +43,16 @@ class PromoteLimitRuleController extends ThinkController if (count($promoteIds)) { $conditions['promote_id'] = ['in', $promoteIds]; } + if ($baseGameId != -1) { + $conditions['base_game_id'] = $baseGameId; + } + if ($batchNo != '') { + $conditions['batch_no'] = $batchNo; + } $query = M('promote_limit_rules', 'tab_')->where($conditions); $countQuery = clone $query; - $rules = $query->page($page, $row)->select(); + $rules = $query->order('id desc')->page($page, $row)->select(); $count = $countQuery->count(); $recordPromotes = []; @@ -49,8 +63,12 @@ class PromoteLimitRuleController extends ThinkController if (count($recordCompanyIds) > 0) { $recordCompanys = M('promote_company', 'tab_')->field(['id', 'company_name', 'company_belong'])->where(['id' => ['in', $recordCompanyIds]])->select(); } + + $baseGames = M('base_game', 'tab_')->where(['id' => ['in', array_column($rules, 'base_game_id')]])->select(); + $recordPromotes = index_by_column('id', $recordPromotes); $recordCompanys = index_by_column('id', $recordCompanys); + $baseGames = index_by_column('id', $baseGames); } @@ -63,6 +81,9 @@ class PromoteLimitRuleController extends ThinkController 'promote_account' => $recordPromotes[$rule['promote_id']]['account'], 'company_name' => $recordCompanys[$recordPromotes[$rule['promote_id']]['company_id']]['company_name'], 'company_belong' => $companyTypes[$recordCompanys[$recordPromotes[$rule['promote_id']]['company_id']]['company_belong']], + 'base_game_name' => $rule['base_game_id'] > 0 ? $baseGames[$rule['base_game_id']]['name'] : '所有游戏', + 'with_sub' => $rule['with_sub'] == 1 ? '是' : '否', + 'batch_no' => $rule['batch_no'], 'limit_rule' => $this->getDisplayRule($rule), ]; } @@ -72,6 +93,9 @@ class PromoteLimitRuleController extends ThinkController if($page) { $this->assign('_page', $page); } + $baseGames = M('base_game', 'tab_')->select(); + + $this->assign('baseGames', $baseGames); $this->assign('records', $records); $this->assign('companys', $companys); $this->display(); @@ -102,6 +126,10 @@ class PromoteLimitRuleController extends ThinkController $promote = M('promote', 'tab_')->where(['id' => $record['promote_id']])->field(['id', 'company_id', 'account'])->find(); $company = M('promote_company', 'tab_')->where(['id' => $promote['company_id']])->field(['id', 'company_name'])->find(); } + + $baseGames = M('base_game', 'tab_')->select(); + + $this->assign('baseGames', $baseGames); $this->assign('promote', $promote); $this->assign('company', $company); $this->assign('companys', $companys); @@ -112,7 +140,11 @@ class PromoteLimitRuleController extends ThinkController public function save() { $id = I('id', 0); - $promoteId = I('promote_id', 0); + $baseGameId = I('base_game_id', 0); + $account = I('account', ''); + $accountsStr = I('accounts', ''); + $limitType = I('limit_type', 1); + $withSub = I('with_sub', 1); $startedAt = I('started_at', ''); $endedAt = I('ended_at', ''); @@ -124,62 +156,122 @@ class PromoteLimitRuleController extends ThinkController } $record = null; + $promotes = []; if ($id > 0) { $record = M('promote_limit_rules', 'tab_')->where(['id' => $id])->find(); if (!$record) { return $this->error('修改记录不存在'); } } else { - if (empty($promoteId)) { - return $this->error('请选择会长'); - } - $promoteRecord = M('promote_limit_rules', 'tab_')->where(['promote_id' => $promoteId])->find(); - if ($promoteRecord) { - return $this->error('该会长已经设定限制规则，请前往更新'); + try { + $accounts = []; + if ($limitType == 1) { + $accounts = [$account]; + } else { + $accounts = $this->parseAccountsStr($accountsStr); + } + $promotes = $this->getPromotes($accounts); + } catch (\Exception $e) { + return $this->error($e->getMessage()); } } if ($record) { + + $promote = M('promote', 'tab_')->field(['id'])->where(['account' => $account])->find(); + $data = []; + $data['promote_id'] = $promote['id']; + $data['base_game_id'] = $baseGameId; + $data['with_sub'] = $withSub; $data['started_at'] = $startedAt; $data['ended_at'] = $endedAt; $data['update_time'] = time(); M('promote_limit_rules', 'tab_')->where(['id' => $id])->save($data); - addOperationLog([ - 'op_type' => 1, - 'key'=> $promoteId . '/' . $startedAt . '/' . $endedAt, - 'op_name' => '修改推广限制', - 'url' => U('PresidentDeposit/edit', ['id'=>$id]), 'menu'=>'推广员-推广员管理-推广限制-修改推广限制' - ]); } else { $data = []; - $data['promote_id'] = $promoteId; + $data['base_game_id'] = $baseGameId; + $data['with_sub'] = $withSub; $data['started_at'] = $startedAt; $data['ended_at'] = $endedAt; + $data['batch_no'] = date('Ymdhis') . rand(1000, 9999); $data['create_time'] = time(); $data['update_time'] = time(); - M('promote_limit_rules', 'tab_')->add($data); + + $records = []; + foreach ($promotes as $promote) { + $records[] = array_merge($data, ['promote_id' => $promote['id']]); + } + M('promote_limit_rules', 'tab_')->addAll($records); + } + + if ($id > 0) { + addOperationLog([ + 'op_type' => 1, + 'key'=> '', + 'op_name' => '修改推广限制', + 'url' => U('PromoteLimitRule/save'), 'menu'=>'推广员-推广员管理-推广限制-修改推广限制', + 'content' => json_encode(I('post.')) + ]); + } else { addOperationLog([ 'op_type' => 0, - 'key'=> $promoteId . '/' . $startedAt . '/' . $endedAt, + 'key'=> '', 'op_name' => '新增推广限制', - 'url' => U('PresidentDeposit/edit', ['promote_id'=>$promoteId]), 'menu'=>'推广员-推广员管理-推广限制-新增推广限制' + 'url' => U('PromoteLimitRule/save'), 'menu'=>'推广员-推广员管理-推广限制-新增推广限制', + 'content' => json_encode(I('post.')) ]); } return $this->success('保存成功', U('records')); } + + private function parseAccountsStr($accountsStr) + { + if ($accountsStr == '') { + throw new \Exception('推广员账号数量不能为0'); + } + $accountArr = json_decode($accountsStr, true); + $accounts = []; + foreach ($accountArr as $key => $item) { + $accounts[] = trim($item['推广账号']); + } + return array_unique($accounts); + } + private function getPromotes($accounts) + { + $promotes = M('promote', 'tab_')->field(['id', 'account'])->where(['account' => ['in', $accounts]])->select(); + if (count($accounts) != count($promotes)) { + $promotes = index_by_column('account', $promotes); + $noExistAcounts = []; + foreach ($accounts as $account) { + if (!isset($promotes[$account])) { + $noExistAcounts[] = $account; + } + } + throw new \Exception('含有不存在的推广账号: ' . implode(',', $noExistAcounts)); + } + return $promotes; + } + public function delete() { $id = I('id', 0); - M('promote_limit_rules', 'tab_')->where(['id' => $id])->delete(); + $batchNo = I('batch_no', ''); + $conditions = []; + if ($id > 0) { + $conditions['id'] = $id; + } elseif ($batchNo != '') { + $conditions['batch_no'] = $batchNo; + } + M('promote_limit_rules', 'tab_')->where($conditions)->delete(); addOperationLog([ 'op_type' => 2, 'key' => $id, 'op_name' => '删除会长推广限制', - 'url' => U('PresidentDeposit/delete', ['id' => $id]), + 'url' => U('PresidentDeposit/delete', ['id' => $id, 'batch' => $batchNo]), 'menu' => '推广员-推广员管理-推广限制-删除推广限制' ]); diff --git a/Application/Admin/View/PromoteLimitRule/form.html b/Application/Admin/View/PromoteLimitRule/form.html index 2912f2344..f82893324 100644 --- a/Application/Admin/View/PromoteLimitRule/form.html +++ b/Application/Admin/View/PromoteLimitRule/form.html @@ -65,6 +65,14 @@ .iconfont-unselected:hover { background-color: #ababab; } + .data_list table th { + line-height: 30px; + height: 30px; + } + .data_list table td { + line-height: 30px; + height: 30px; + }

{$meta_title}

@@ -80,52 +88,100 @@
- - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + +
*推广公司： - - {$company.company_name} - -
*限制类型： + + + + +
*推广账号： + +
*限制游戏： + - -
*会长： - - {$promote.account} - - - -
开始时间： - -
结束时间： - -
*是否包含下级： + + + + +
开始时间： + +
结束时间： + +
+ + +
- @@ -151,6 +207,7 @@ if(C('COLOR_STYLE')=='blue_color') echo ''; + \ No newline at end of file diff --git a/Application/Admin/View/PromoteLimitRule/records.html b/Application/Admin/View/PromoteLimitRule/records.html index 80a197769..be84eb6f6 100644 --- a/Application/Admin/View/PromoteLimitRule/records.html +++ b/Application/Admin/View/PromoteLimitRule/records.html @@ -65,13 +65,20 @@
- +
+
+
+
+ +
搜索 添加 @@ -95,8 +102,11 @@ 推广公司 会长账号 + 是否包含下级 内外团 + 限制游戏 限制时间 + 批次号 操作 @@ -113,12 +123,16 @@ {$data.company_name} {$data.promote_account} + {$data.with_sub} {$data.company_belong} + {$data.base_game_name} {$data.limit_rule} + {$data.batch_no}
编辑 - 删除 + 删除 + 删除批次
@@ -183,21 +197,14 @@ $('#batch-delete-btn').on({ click: function() { var ids = getIds(); - $.ajax({ - url: '{:U("batchDelete")}', - type: 'post', - dataType: 'json', - data: {ids: ids}, - 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) - } - } + if (ids.length == 0) { + return layer.msg('未选中记录'); + } + layer.confirm('确定要删除这些记录吗？', { + title: '删除', + btn: ['确定'] + }, function(){ + batchDelete(ids) }) } }) @@ -210,25 +217,70 @@ } $('.delete-btn').on({ click: function() { - var id = $(this).parents('tr').eq(0).attr('data-id'); - $.ajax({ - url: '{:U("delete")}', - 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) - } + var val = $(this).attr('data-val') + var type = $(this).attr('data-type'); + var word = '确定要删除这条记录吗？'; + if (type == 'batch_no') { + word = '确定要删除批次[' + val + ']的所有记录吗？'; + } + layer.confirm(word, { + title: '删除', + btn: ['确定'] + }, function(){ + if (type == 'batch_no') { + deleteByBachNo(val) + } else { + deleteById(val) } }) } }) + + function batchDelete(ids) { + $.ajax({ + url: '{:U("batchDelete")}', + type: 'post', + dataType: 'json', + data: {ids: ids}, + 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) + } + } + }) + } + + function deleteById(id) { + deleteByData({id: id}) + } + + function deleteByBachNo(bachNo) { + deleteByData({batch_no: bachNo}) + } + + function deleteByData(data) { + $.ajax({ + url: '{:U("delete")}', + type: 'post', + dataType: 'json', + data: data, + 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/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 3c5290866..d542acc49 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -1208,36 +1208,51 @@ class PromoteService { public function checkPromoteLimitRule($promote, $gameId = 0) { - $accountString = 'wangshuai1,ouyangtianlin,zhangjiayuan02,zhangchuang,huangjian,lixiaojie01,youjinbo01,laijiansen,liutao001,huangdonyu,huangwenlu,qiujinwei,qiucanlon,panhailang,linzilun,xuechonbiao,chenfayun01,pengjun,shenyanwei,wusiju,kechengwei,linruidong,huzhoujian,linzelong,linwei1,zhanghanying,xushiming,linxuchen,zhengchengzhi,yaokaijie,wengyongbang,liaofaqian,zhangqing,liaojunwei,zhangming,zhaoxiaoyi01,zhongkaixin,zhangkaiyu,linwei01,dukunpeng,zhengjianzhou,wengshouxiong,caizhenxing,xiuguanxin,suyuelong,guozhijie,chenzhenghao,zhongyouling,linjian,xuwenye,zhengjinhe,huangyongqing,wangqiaozhen,jiangweihao,lijianfeng01,shaowenhui,huangyuhang,lianglingui,baoxiaohui,heyuming,linwanxi,jiangnan,ouzhijie,liguangcai,lican1,caiwenxin,xianggengyu,songzhibin,jinweiyuan,chenyixing,zhangxiang,denglan,yejiehui,wangbencai,huangzhenhon,liumeifu,xuliuyang,zhengmingquan,huangshengguang,liuweihuang,lixuemeng,xurongcheng,chenzhuo,caixiaodong,linhui,luwenjie,huangyonghao,xuguojin,ningyi01,zhouchongliang,chenshigang,chenyangwen,lijiayu,lanhua,zuojingjing,zhangxingliang,huangxinyu,pujianhao,zhengdongwei,xueyiqiang,lijiawei,tongqiang,huangxirui,wangjinfu,linhao01,chenlinzhi,zengjiawei,lijunjie01,xuwei01,diaowenfeng,guoyinzhen,chenzongda,luwujun,hongye,yangdegao,hehaiwei,zhangyutao,zhengxinyao,wangjunqi,wuyuze,linzejun,yangyunfeng,huangxiaojia,linqianyun,liyao01,huangkai,aihu01,wangshuai,zhangjiayuan01,youjinbo,zhangjiayuan,wengshouxion,ningyi,qcwljunbo,nolajhr'; - $accounts = explode(',', $accountString); - if (in_array($promote['account'], $accounts)) { + $baseGame = M('base_game', 'tab_')->where('android_game_id=' . $gameId . ' or ios_game_id=' . $gameId)->find(); + if (!$baseGame) { return false; } + $parentIds = $this->getIdsByChain($promote['chain']); + $ids = $parentIds; + $ids[] = $promote['id']; - $topPromote = $this->getTopPromote($promote); - - if (in_array($topPromote['account'], ['zhangle', 'changwanwl', 'youwan', 'youwan2022'])) { - if (in_array($gameId, [293, 294])) { - return false; + $access = true; + $rules = M('promote_limit_rules', 'tab_')->where(['promote_id' => ['in', $ids], 'base_game_id' => ['in', [0, $baseGame['id']]]])->order('created_at desc')->select(); + foreach ($rules as $rule) { + if ($this->isLimitRuleContains($rule, $promote) && $this->isLimitRuleEeffective($rule)) { + $access = false; } } + return $access; + } + + private function isLimitRuleContains($rule, $promote) + { + if ($rule['promote_id'] == $promote['id']) { + return true; + } + $parentIds = $this->getIdsByChain($promote['chain']); + if (in_array($rule['promote_id'], $parentIds) && $rule['with_sub'] == 1) { + return true; + } + return false; + } - $rule = M('promote_limit_rules', 'tab_')->where(['promote_id' => $topPromote['id']])->order('created_at desc')->limit(1)->find(); - if ($rule) { - if ($rule['started_at'] === null && $rule['ended_at'] === null) { + private function isLimitRuleEeffective($rule) + { + if ($rule['started_at'] === null && $rule['ended_at'] === null) { + return false; + } elseif ($rule['started_at'] === null && $rule['ended_at'] !== null) { + if (time() < strtotime($rule['ended_at'] . ' 23:59:59')) { + return false; + } + } elseif ($rule['started_at'] !== null && $rule['ended_at'] === null) { + if (time() >= strtotime($rule['started_at'] . ' 00:00:00')) { + return false; + } + } else { + if (time() >= strtotime($rule['started_at'] . ' 00:00:00') && time() < strtotime($rule['ended_at'] . ' 23:59:59')) { return false; - } elseif ($rule['started_at'] === null && $rule['ended_at'] !== null) { - if (time() < strtotime($rule['ended_at'] . ' 23:59:59')) { - return false; - } - } elseif ($rule['started_at'] !== null && $rule['ended_at'] === null) { - if (time() >= strtotime($rule['started_at'] . ' 00:00:00')) { - return false; - } - } else { - if (time() >= strtotime($rule['started_at'] . ' 00:00:00') && time() < strtotime($rule['ended_at'] . ' 23:59:59')) { - return false; - } } } return true; diff --git a/Data/update.sql b/Data/update.sql index eadb46846..63628fdfd 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2974,4 +2974,8 @@ CREATE TABLE `tab_rebate_times_setting` ( `max_times` int(11) NOT NULL DEFAULT '0' COMMENT '上限倍数', `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '生成时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='充值返利倍数设置'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='充值返利倍数设置'; + +alter table tab_promote_limit_rules add column with_sub tinyint(1) not null default 0 comment '是否包含下级' after promote_id; +alter table tab_promote_limit_rules add column base_game_id int(11) not null default 0 comment '限制游戏' after promote_id; +alter table tab_promote_limit_rules add column batch_no varchar(18) not null default '' comment '批次号' after with_sub;