From 0b54c71cb02ba5de2640eaffb64a3187be3160c7 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 8 Jul 2020 18:01:21 +0800 Subject: [PATCH 01/12] upt --- .../Controller/ExportController.class.php | 215 +++++++++------ .../Controller/PlatformController.class.php | 76 ++++- .../View/Platform/promote_statistics.html | 260 +++++++++++------- .../View/Platform/promotepay_statistics.html | 260 ++++++------------ 4 files changed, 446 insertions(+), 365 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 929355e79..3b6269a17 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3582,14 +3582,10 @@ class ExportController extends Controller } private function promote_statistics_export($p=0){ - $page = intval($p); - $page = $page ? $page : 1; //默认显示第一页数据 - $arraypage=$page; - $row = 10; - $user=M('User','tab_'); - if(isset($_REQUEST['timestart'])&&isset($_REQUEST['timeend'])){ - $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['timestart']),strtotime($_REQUEST['timeend'])+24*60*60-1)); - unset($_REQUEST['timestart']);unset($_REQUEST['timeend']); + if (!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { + $map['register_time'] = ['between', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 86399)]; + unset($_REQUEST['timestart']); + unset($_REQUEST['timeend']); } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) { $map['register_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())]; unset($_REQUEST['timestart']); @@ -3597,104 +3593,157 @@ class ExportController extends Controller $map['register_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399]; unset($_REQUEST['timeend']); } - -// if(isset($_REQUEST['start'])&&isset($_REQUEST['end'])){ -// $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1)); -// unset($_REQUEST['start']);unset($_REQUEST['end']); -// } - $play_info_map = ''; - + //TODO:应需求，取消玩家表，只要user表的fgame有就算注册无需在play表存在 + $play_map = false; if (isset($_REQUEST['game_name'])) { - $map['fgame_name'] = $_REQUEST['game_name']; - $play_info_map .= " and upi.game_name = '{$_REQUEST['game_name']}' "; - unset($_REQUEST['game_name']); + $map['fgame_name'] = ['like', "{$_REQUEST['game_name']}%"]; + // $play_map = " and up.game_name = '{$_REQUEST['game_name']}' "; } + $play_info_map = false; if (isset($_REQUEST['server_id'])) { - $play_info_map .= " and upi.server_name = '{$_REQUEST['server_id']}' "; + $play_map = false; //有区服就不检索玩家表,有区服一定已经选择游戏了 + $play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name like '{$_REQUEST['game_name']}%'"; } - $today=total(1); - $week=total(2); - $mounth=total(3); + + $today = total(1); + $week = total(2); + $mounth = total(3); + if (isset($_REQUEST['promote_id'])) { - $map['tp1.id'] = $_REQUEST['promote_id']; - } else { - $map['tp1.chain'] = '/'; + $promoter_ids = D("Promote")->where("chain like '%/{$_REQUEST['promote_id']}/%' or id={$_REQUEST['promote_id']}")->field('id')->select(); + if ($promoter_ids) { + $map['u.promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))]; + } + } + + if (!empty($_REQUEST['game_type'])) { + $map['tab_game.sdk_version'] = $_REQUEST['game_type']; } + //为数据权限添加 setPowerPromoteIds($map, 'u.promote_id'); - $data = M('promote', 'tab_')->alias('tp1')->field('tp1.account as promote_account,tp1.id, date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(u.id) as count, - count(IF(register_time ' . $today . ',1,null)) as today, - count(IF(register_time ' . $week . ',1,null)) as week, - count(IF(register_time ' . $mounth . ',1,null)) as mounth') - ->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left') - ->join("tab_user as u on tp2.id = u.promote_id", 'left') - ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) - ->where($map) - ->group('tp1.id') - ->order('count desc, register_time') - ->select(); - unset($map['tp1.id']); - unset($map['tp1.chain']); - $map['promote_id'] = 0; - //如果有官方渠道权限 - $user_auth_promote_ids = session('user_auth_promote_ids'); - if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { - //官方渠道数据添加 - $authorityData = M('user', 'tab_')->alias('u') - ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, - count(id) as count, - count(IF(register_time ' . $today . ',1,null)) as today, - count(IF(register_time ' . $week . ',1,null)) as week, - count(IF(register_time ' . $mounth . ',1,null)) as mounth') + + // 如果是市场专员那么只能看自己的 + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $map['tab_promote.admin_id'] = session('user_auth'); + } + + $data = M("User u","tab_") + ->field("count(u.id) as count,tab_game.relation_game_name,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") + ->join("tab_promote promote ON u.promote_id = promote.id","left") + ->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false) + ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) + ->join('tab_game on u.fgame_id = tab_game.id') ->where($map) - ->find(); + ->group('id, tab_game.relation_game_name') + ->order('count desc, register_time') + ->select(); + //今日/本周/本月不变 + $tmap = $map; + if(isset($tmap['register_time'])){ + //获取最大最小 + $tweek = total(2,false); + $tmonth = total(3,false); + //获取最小 + $tmin = 0; + if($tweek[1][0] < $tmonth[1][0]){ + $tmin = $tweek[1][0]; + }else{ + $tmin = $tmonth[1][0]; + } + $tmap['register_time'] = ['between', array($tmin,$tmonth[1][1])]; + } + + $tdata = M("User u","tab_") + ->field("count(IF(register_time {$today},1,null)) as today, + count(IF(register_time {$week},1,null)) as week, + count(IF(register_time {$mounth},1,null)) as mounth, + IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") + ->join("tab_promote promote ON u.promote_id = promote.id","left") + ->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false) + ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) + ->where($tmap) + ->group('id') + ->order('register_time') + ->select(); + $tmdata = []; + foreach($data as $k=>$v){ + $v['today'] = 0; + $v['week'] = 0; + $v['mounth'] = 0; + $tmdata[$v['id']] = $v; + } + if(!empty($tdata)){ + foreach ($tdata as $k => $v) { + $tmdata[$v['id']]['today'] = $v['today']; + $tmdata[$v['id']]['week'] = $v['week']; + $tmdata[$v['id']]['mounth'] = $v['mounth']; + $tmdata[$v['id']]['id'] = $v['id']; + } } - $authorityData['promote_account'] = C('OFFICIEL_CHANNEL'); - $authorityData['id'] = "1"; - if (isset($_REQUEST['promote_id'])||$authorityData['count']==0) { - $authorityData = []; - } else { - array_push($data, $authorityData); + if(count($tmdata) >0){ + //获取推广员 + $idstr = implode(",",array_keys($tmdata)); + $promoteRes = M("Promote","tab_")->field("id,account promote_account")->where("id in ({$idstr})")->select(); + foreach($promoteRes as $k=>$v){ + $tmdata[$v['id']]['promote_account'] = $v['promote_account']; + } } - -//数据排序 + $data = []; + foreach($tmdata as $k => $v){ + if($v['id'] == 0){ + $v['promote_account'] = C('OFFICIEL_CHANNEL'); + } + $data[] = $v; + } + unset($map['tp1.id']); + unset($map['tp1.chain']); + unset($tmap['tp1.id']); + unset($tmap['tp1.chain']); + $map['u.promote_id'] = 0; + $tmap['u.promote_id'] = 0; + $authorityData['count'] = 0; + //数据排序 $last_names = array_column($data,'count'); array_multisort($last_names,SORT_DESC,$data); -// var_dump($data);die(); - $count=count($data); + $count = count($data); foreach ($data as $key => $value) { - static $i=0; - $i++; - $data[$key]['rand']=$i; + static $i = 0; + $i++; + $data[$key]['rand'] = $i; } -// foreach ($data as $key => $value) { -// if($data[$key]['promote_id']==0){ -// unset($data[$key]); -// } -// } - $total=A('Platform')->data_total($data); - if($_REQUEST['data_order']!=''){ - $data_order=reset(explode(',',$_REQUEST['data_order'])); - $data_order_type=end(explode(',',$_REQUEST['data_order'])); - $this->assign('userarpu_order',$data_order); - $this->assign('userarpu_order_type',$data_order_type); - } - if($count > $row){ - $page = new \Think\Page($count, $row); - $page->setConfig('theme','%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%'); - $this->assign('_page', $page->show()); + $total = $this->data_total($data); + if ($_REQUEST['data_order'] != '') { + $data_order = reset(explode(',', $_REQUEST['data_order'])); + $data_order_type = end(explode(',', $_REQUEST['data_order'])); + $this->assign('userarpu_order', $data_order); + $this->assign('userarpu_order_type', $data_order_type); } - $data=my_sort($data,$data_order_type,(int)$data_order); - $size=$row;//每页显示的记录数 - $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 + + $data = my_sort($data, $data_order_type, (int)$data_order); //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) -// $data = array_slice($data, ($arraypage-1)*$size, $size); + + $companys = !empty($data) ? M('promote', 'tab_') + ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') + ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') + ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') + ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + $companys = $companys ? array_column($companys, null, 'id') : []; + foreach ($data as &$item) { + $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; + $item['admin_username'] = $companys[$item['id']]['admin_username'] ?? '无'; + } + $xlsName = $_REQUEST['xlsname']?$_REQUEST['xlsname']:'推广员注册统计'; $xlsCell = array( + array('company_name' , "公司"), array('promote_account', "推广员账号"), + array('admin_username' , "管理员"), + array('relation_game_name' , "游戏"), array('count' , "累计注册"), array('rand' , "排行榜"), array('today' , "今日注册"), diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index a63e42791..40f0095e2 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -437,13 +437,13 @@ class PlatformController extends ThinkController //TODO:应需求，取消玩家表，只要user表的fgame有就算注册无需在play表存在 $play_map = false; if (isset($_REQUEST['game_name'])) { - $map['fgame_name'] = $_REQUEST['game_name']; + $map['fgame_name'] = ['like', "{$_REQUEST['game_name']}%"]; // $play_map = " and up.game_name = '{$_REQUEST['game_name']}' "; } $play_info_map = false; if (isset($_REQUEST['server_id'])) { $play_map = false; //有区服就不检索玩家表,有区服一定已经选择游戏了 - $play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name = '{$_REQUEST['game_name']}'"; + $play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name like '{$_REQUEST['game_name']}%'"; } $today = total(1); @@ -456,15 +456,28 @@ class PlatformController extends ThinkController $map['u.promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))]; } } + + if (!empty($_REQUEST['game_type'])) { + $map['tab_game.sdk_version'] = $_REQUEST['game_type']; + } + //为数据权限添加 setPowerPromoteIds($map, 'u.promote_id'); + + // 如果是市场专员那么只能看自己的 + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $map['tab_promote.admin_id'] = session('user_auth'); + } + $data = M("User u","tab_") - ->field("count(u.id) as count,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") + ->field("count(u.id) as count,tab_game.relation_game_name,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") ->join("tab_promote promote ON u.promote_id = promote.id","left") ->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false) ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) + ->join('tab_game on u.fgame_id = tab_game.id') ->where($map) - ->group('id') + ->group('id, tab_game.relation_game_name') ->order('count desc, register_time') ->select(); //今日/本周/本月不变 @@ -539,7 +552,7 @@ class PlatformController extends ThinkController $count = count($data); foreach ($data as $key => $value) { static $i = 0; - $i++; + $i++; $data[$key]['rand'] = $i; } @@ -563,6 +576,17 @@ class PlatformController extends ThinkController $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) $data = array_slice($data, ($arraypage - 1) * $size, $size); + + $companys = !empty($data) ? M('promote', 'tab_') + ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') + ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') + ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') + ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + $companys = $companys ? array_column($companys, null, 'id') : []; + foreach ($data as &$item) { + $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; + $item['admin_username'] = $companys[$item['id']]['admin_username'] ?? '无'; + } $this->meta_title = '渠道注册统计列表'; $this->assign("is_admin",is_administrator()); $this->assign('list_data', $data); @@ -601,7 +625,7 @@ class PlatformController extends ThinkController $map['pay_time'] = ['between', array(0, time())]; // $pay_time = " between 0 and " . time(); } - $map1['pay_status'] = $map['pay_status'] = 1; + $map1['s.pay_status'] = $map['s.pay_status'] = 1; $today = total(1); $week = total(2); $mounth = total(3); @@ -626,23 +650,34 @@ class PlatformController extends ThinkController $map['tp1.chain'] = '/'; } - if (isset($_REQUEST['game_name'])) { - $map['s.game_name'] = $_REQUEST['game_name']; + $_REQUEST['game_name'] = "{$_REQUEST['game_name']}"; + $map['s.game_name'] = ['like', "{$_REQUEST['game_name']}%"]; if (isset($_REQUEST['server_id'])) { $map['s.server_id'] = $_REQUEST['server_id']; unset($_REQUEST['server_id']); } } - if (isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])) { + // 如果是市场专员那么只能看自己的 + $isMarketAdmin = isMarketAdmin(); + if ($isMarketAdmin) { + $map['s.market_admin_id'] = session('user_auth'); + } + + if (!empty($_REQUEST['game_type'])) { + $map['s.sdk_version'] = $_REQUEST['game_type']; + } + + if (isset($_REQUEST['sdk_version'])||isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])) { $data = M('promote', 'tab_')->alias('tp1') - ->field('tp1.account as promote_account,tp1.id, + ->field('tp1.account as promote_account,tp1.id,g.relation_game_name, 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 use INDEX(search) on tp2.id = s.promote_id", 'left') + ->join("tab_game as g on g.id = s.game_id", 'left') ->where($map) - ->group('tp1.id') + ->group('tp1.id, g.relation_game_name') ->order('count desc') ->select(); } else { @@ -658,14 +693,15 @@ class PlatformController extends ThinkController $tmap['pay_time'] = ['between', array($tmin,$tmonth[1][1])]; } $tdata = M('promote', 'tab_')->alias('tp1') - ->field('tp1.account as promote_account,tp1.id, + ->field('tp1.account as promote_account,tp1.id,g.relation_game_name, floor(sum(IF(s.pay_time ' . $today . ',pay_amount,0))*100) as today, floor(sum(IF(s.pay_time ' . $week . ',pay_amount,0))*100) as week, floor(sum(IF(s.pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') ->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') + ->join("tab_game as g on g.id = s.game_id", 'left') ->where($tmap) - ->group('tp1.id') + ->group('tp1.id, g.relation_game_name') ->select(); $tmdata = []; foreach($data as $k=>$v){ @@ -761,6 +797,17 @@ class PlatformController extends ThinkController $size = $row;//每页显示的记录数 $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 + $companys = !empty($data) ? M('promote', 'tab_') + ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') + ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') + ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') + ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + $companys = $companys ? array_column($companys, null, 'id') : []; + foreach ($data as &$item) { + $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; + $item['admin_username'] = $companys[$item['id']]['admin_username'] ?? '无'; + } + if(isset($_REQUEST['export'])){ $GetData = $_GET; @@ -769,7 +816,10 @@ class PlatformController extends ThinkController addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出推广员充值统计','url'=>U('Platform/promotepay_statistics',$GetData),'menu'=>'统计-统计-推广员统计-推广员充值统计']); data2csv($data,'推广员充值统计',array( + 'company_name' => '公司', "promote_account"=>"推广员账号", + 'admin_username' => '管理员', + 'relation_game_name' => '游戏', "count"=>"累计充值", "rand"=>"排行榜", "today"=>"今日充值", diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 1c3959f93..0e76202ae 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -27,33 +27,32 @@ .select2-results__option[aria-selected] {font-size:12px;} +
- 推广员注册统计 - 推广员充值统计 + 推广员注册统计 + 推广员充值统计
-

推广员注册统计

-

说明：此列表数据以点击推广链接下载游戏注册数量为统计基数

+ +

推广员充值统计

+

说明：针对所有推广员下的充值金额，进行充值排行统计：游戏、平台币、绑币的现金充值总额

-
- -
- +  -  -
- +
+
+
-
- - - + +
+
+ +
- 搜索 + 搜索 +
@@ -88,12 +95,32 @@ + + + - + + + + @@ -130,30 +157,25 @@ - + - - + + + + + - - + @@ -166,9 +188,8 @@
- 导出 + 导出 {$_page|default=''}
@@ -199,6 +220,7 @@ if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} + var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); @@ -218,19 +240,18 @@ $("#search").click(); } }); - // $(".ljzc").click(function(){ + // $(".ljcz").click(function(){ // var id = $(this).attr('data-value'); // var game_name = "{:I('game_name')}"; // var server_name = "{:I('server_id')}"; - // var urlr = window.location.host; // layer.open({ // type: 2, - // title: '注册记录', + // title: '游戏消费记录', // shadeClose: true, // shade: 0.8, // area: ['70%', '80%'], - // content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); + // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url + // }); // }); $(".paixu").click(function(){ var that=$(this); @@ -248,6 +269,70 @@ $("#search").click(); } }); + // $(".paixu").click(function(){ + // $ddd=$(this).attr('date-url'); + // $lzhuce="{:I('lzhuce')}"; + // $phb = "{:I('phb')}"; + // $dzhuce = "{:I('dzhuce')}"; + // $wzhuce = "{:I('wzhuce')}"; + // $mzhuce = "{:I('mzhuce')}"; + // // $sss="{:I('group')}"; + // if($ddd=='lzhuce'){ + // if($lzhuce==1){ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='phb'){ + // if($phb==1){ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='dzhuce'){ + // if($dzhuce==1){ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='wzhuce'){ + // if($wzhuce==1){ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='mzhuce'){ + // if($mzhuce==1){ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // }) //点击排序 $('.list_sort').click(function(){ var url = $(this).attr('url'); @@ -267,63 +352,38 @@ } }); // var date="{$setdate}"; - $('#time-start').datetimepicker({ - format: 'yyyy-mm-dd', - language:"zh-CN", - minView:2, - autoclose:true, - // endDate:date - }); + $('#time-start, #time-end').each(function(){ + laydate.render({ + elem: this, //指定元素, + type : 'date' + }); + }); - $('#datetimepicker').datetimepicker({ - format: 'yyyy-mm-dd', - language:"zh-CN", - minView:2, - autoclose:true, - pickerPosition:'bottom-left', - // endDate:date + var game_server = "{:I('server_id')}"; + $("#game_type").change(function(){ + $.ajax({ + url:"{:U('Ajax/getGmeServer')}", + type:"post", + data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); + } }) + }); - $("#game_id").change(function(){ - $.ajax({ - url:"{:U('getSpendServer')}", - type:"post", - data:{game_id:$("#game_id option:selected").attr('game-id')}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); - - } - }) - }); - var game_id = "{:I('game_name')}"; - var game_server = "{:I('server_id')}"; - if(game_id){ - $.ajax({ - url:"{:U('getSpendServer')}", - type:"post", - data:{game_name:game_id}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); + $("#game_name").change(function(){ + $("#game_type").change(); + }); - } - }) - } + $("#game_name").change(); }) diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index fcf74cf17..a7d7a7497 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -27,32 +27,33 @@ .select2-results__option[aria-selected] {font-size:12px;} -
- 推广员注册统计 - 推广员充值统计 + 推广员注册统计 + 推广员充值统计
- -

推广员充值统计

-

说明：针对所有推广员下的充值金额，进行充值排行统计：游戏、平台币、绑币的现金充值总额

+

推广员注册统计

+

说明：此列表数据以点击推广链接下载游戏注册数量为统计基数

+
+ +
- +  -  -
- +
+
-
+
- - - + +
+
+ +
- 搜索 - + 搜索
@@ -88,26 +95,18 @@
公司推广员账号累计注册▲ - 累计注册▼ - 累计注册 + 管理员游戏累计充值▲ + 累计充值▼ + 累计充值 排行榜▲ @@ -102,22 +129,22 @@ - 今日注册▲ - 今日注册▼ - 今日注册 + 今日充值▲ + 今日充值▼ + 今日充值 - 本周注册▲ - 本周注册▼ - 本周注册 + 本周充值▲ + 本周充值▼ + 本周充值 - 本月注册▲ - 本月注册▼ - 本月注册 + 本月充值▲ + 本月充值▼ + 本月充值
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
- {$data['promote_account']} - - {$data.count}{$data['company_name']}{$data['promote_account']}{$data['admin_username']}{$data['relation_game_name']}{$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today} {$data.week} {$data.mounth}
汇总汇总 {$total.sum_count} --- {$total.sum_today}
- - - + - @@ -144,22 +143,33 @@ - + - - + + + + + + - + @@ -172,8 +182,9 @@
- 导出 + 导出 {$_page|default=''}
@@ -204,7 +215,6 @@ if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} - var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); @@ -224,18 +234,19 @@ $("#search").click(); } }); - // $(".ljcz").click(function(){ + // $(".ljzc").click(function(){ // var id = $(this).attr('data-value'); // var game_name = "{:I('game_name')}"; // var server_name = "{:I('server_id')}"; + // var urlr = window.location.host; // layer.open({ // type: 2, - // title: '游戏消费记录', + // title: '注册记录', // shadeClose: true, // shade: 0.8, // area: ['70%', '80%'], - // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); + // content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url + // }); // }); $(".paixu").click(function(){ var that=$(this); @@ -253,70 +264,6 @@ $("#search").click(); } }); - // $(".paixu").click(function(){ - // $ddd=$(this).attr('date-url'); - // $lzhuce="{:I('lzhuce')}"; - // $phb = "{:I('phb')}"; - // $dzhuce = "{:I('dzhuce')}"; - // $wzhuce = "{:I('wzhuce')}"; - // $mzhuce = "{:I('mzhuce')}"; - // // $sss="{:I('group')}"; - // if($ddd=='lzhuce'){ - // if($lzhuce==1){ - // $(".sortBy").attr('name','lzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','lzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='phb'){ - // if($phb==1){ - // $(".sortBy").attr('name','phb'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','phb'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='dzhuce'){ - // if($dzhuce==1){ - // $(".sortBy").attr('name','dzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','dzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='wzhuce'){ - // if($wzhuce==1){ - // $(".sortBy").attr('name','wzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','wzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='mzhuce'){ - // if($mzhuce==1){ - // $(".sortBy").attr('name','mzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','mzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // }) //点击排序 $('.list_sort').click(function(){ var url = $(this).attr('url'); @@ -336,64 +283,39 @@ } }); // var date="{$setdate}"; - $('#time-start').datetimepicker({ - format: 'yyyy-mm-dd', - language:"zh-CN", - minView:2, - autoclose:true, - // endDate:date - }); + $('#time-start, #time-end').each(function(){ + laydate.render({ + elem: this, //指定元素, + type : 'date' + }); + }); - $('#datetimepicker').datetimepicker({ - format: 'yyyy-mm-dd', - language:"zh-CN", - minView:2, - autoclose:true, - pickerPosition:'bottom-left', - // endDate:date + var game_server = "{:I('server_id')}"; + $("#game_type").change(function(){ + $.ajax({ + url:"{:U('Ajax/getGmeServer')}", + type:"post", + data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); + } }) - $("#game_id").change(function(){ - console.log($("#game_id option:selected").attr('game-id')); - $.ajax({ - url:"{:U('getSpendServer')}", - type:"post", - data:{game_id:$("#game_id option:selected").attr('game-id')}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); + }); - } - }) - }); - var game_name = "{:I('game_name')}"; - var game_server = "{:I('server_id')}"; - if(game_name){ - console.log({game_name:game_name}) - $.ajax({ - url:"{:U('getSpendServer')}", - type:"post", - data:{game_name:game_name}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); + $("#game_name").change(function(){ + $("#game_type").change(); + }); - } - }) - } + $("#game_name").change(); + }) From 5e5aa8ca3f6543616fab9c027e891b940df8a5be Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 8 Jul 2020 18:07:30 +0800 Subject: [PATCH 02/12] upt --- .../View/Platform/promote_statistics.html | 158 +++++------------- .../View/Platform/promotepay_statistics.html | 156 ++++++++++++----- 2 files changed, 157 insertions(+), 157 deletions(-) diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 0e76202ae..badc4bb01 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -27,32 +27,33 @@ .select2-results__option[aria-selected] {font-size:12px;} -
- 推广员注册统计 - 推广员充值统计 + 推广员注册统计 + 推广员充值统计
- -

推广员充值统计

-

说明：针对所有推广员下的充值金额，进行充值排行统计：游戏、平台币、绑币的现金充值总额

+

推广员注册统计

+

说明：此列表数据以点击推广链接下载游戏注册数量为统计基数

+
+ +
- +  -  -
- +
+
-
+
- 搜索 - + 搜索
@@ -95,20 +95,6 @@
推广员账号游戏累计充值▲ - 累计充值▼ - 累计充值 + 累计注册▲ + 累计注册▼ + 累计注册 排行榜▲ @@ -116,22 +115,22 @@ - 今日充值▲ - 今日充值▼ - 今日充值 + 今日注册▲ + 今日注册▼ + 今日注册 - 本周充值▲ - 本周充值▼ - 本周充值 + 本周注册▲ + 本周注册▼ + 本周注册 - 本月充值▲ - 本月充值▼ - 本月充值 + 本月注册▲ + 本月注册▼ + 本月注册
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
{$data['promote_account']}{$data.count}{$data['company_name']} + {$data['promote_account']} + + {$data['admin_username']}{$data['relation_game_name']}{$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today} {$data.week} {$data.mounth}
汇总汇总 {$total.sum_count} --- {$total.sum_today}
- @@ -118,9 +104,9 @@ - @@ -157,20 +143,28 @@ - + - + - + + @@ -188,8 +182,9 @@
- 导出 + 导出 {$_page|default=''}
@@ -220,7 +215,6 @@ if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} - var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); @@ -240,18 +234,19 @@ $("#search").click(); } }); - // $(".ljcz").click(function(){ + // $(".ljzc").click(function(){ // var id = $(this).attr('data-value'); // var game_name = "{:I('game_name')}"; // var server_name = "{:I('server_id')}"; + // var urlr = window.location.host; // layer.open({ // type: 2, - // title: '游戏消费记录', + // title: '注册记录', // shadeClose: true, // shade: 0.8, // area: ['70%', '80%'], - // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); + // content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url + // }); // }); $(".paixu").click(function(){ var that=$(this); @@ -269,70 +264,6 @@ $("#search").click(); } }); - // $(".paixu").click(function(){ - // $ddd=$(this).attr('date-url'); - // $lzhuce="{:I('lzhuce')}"; - // $phb = "{:I('phb')}"; - // $dzhuce = "{:I('dzhuce')}"; - // $wzhuce = "{:I('wzhuce')}"; - // $mzhuce = "{:I('mzhuce')}"; - // // $sss="{:I('group')}"; - // if($ddd=='lzhuce'){ - // if($lzhuce==1){ - // $(".sortBy").attr('name','lzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','lzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='phb'){ - // if($phb==1){ - // $(".sortBy").attr('name','phb'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','phb'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='dzhuce'){ - // if($dzhuce==1){ - // $(".sortBy").attr('name','dzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','dzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='wzhuce'){ - // if($wzhuce==1){ - // $(".sortBy").attr('name','wzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','wzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // if($ddd=='mzhuce'){ - // if($mzhuce==1){ - // $(".sortBy").attr('name','mzhuce'); - // $(".sortBy").attr('value',2); - // $("#search").click(); - // }else{ - // $(".sortBy").attr('name','mzhuce'); - // $(".sortBy").attr('value',1); - // $("#search").click(); - // } - // } - // }) //点击排序 $('.list_sort').click(function(){ var url = $(this).attr('url'); @@ -384,6 +315,7 @@ }); $("#game_name").change(); + }) - + \ No newline at end of file diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index a7d7a7497..0e76202ae 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -27,33 +27,32 @@ .select2-results__option[aria-selected] {font-size:12px;} +
- 推广员注册统计 - 推广员充值统计 + 推广员注册统计 + 推广员充值统计
-

推广员注册统计

-

说明：此列表数据以点击推广链接下载游戏注册数量为统计基数

+ +

推广员充值统计

+

说明：针对所有推广员下的充值金额，进行充值排行统计：游戏、平台币、绑币的现金充值总额

-
- -
- +  -  -
- +
+
+
-
- 搜索 + 搜索 +
@@ -95,6 +95,20 @@
公司游戏累计充值▲ - 累计充值▼ - 累计充值 + 累计注册▲ + 累计注册▼ + 累计注册 排行榜▲ @@ -129,22 +115,22 @@ - 今日充值▲ - 今日充值▼ - 今日充值 + 今日注册▲ + 今日注册▼ + 今日注册 - 本周充值▲ - 本周充值▼ - 本周充值 + 本周注册▲ + 本周注册▼ + 本周注册 - 本月充值▲ - 本月充值▼ - 本月充值 + 本月注册▲ + 本月注册▼ + 本月注册
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
{$data['company_name']}{$data['promote_account']} + {$data['promote_account']} + + {$data['admin_username']} {$data['relation_game_name']}{$data.count}{$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today} {$data.week} {$data.mounth}
+ @@ -104,9 +118,9 @@ - @@ -143,28 +157,20 @@ - + - + - + - @@ -182,9 +188,8 @@
- 导出 + 导出 {$_page|default=''}
@@ -215,6 +220,7 @@ if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} + var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); @@ -234,19 +240,18 @@ $("#search").click(); } }); - // $(".ljzc").click(function(){ + // $(".ljcz").click(function(){ // var id = $(this).attr('data-value'); // var game_name = "{:I('game_name')}"; // var server_name = "{:I('server_id')}"; - // var urlr = window.location.host; // layer.open({ // type: 2, - // title: '注册记录', + // title: '游戏消费记录', // shadeClose: true, // shade: 0.8, // area: ['70%', '80%'], - // content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); + // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url + // }); // }); $(".paixu").click(function(){ var that=$(this); @@ -264,6 +269,70 @@ $("#search").click(); } }); + // $(".paixu").click(function(){ + // $ddd=$(this).attr('date-url'); + // $lzhuce="{:I('lzhuce')}"; + // $phb = "{:I('phb')}"; + // $dzhuce = "{:I('dzhuce')}"; + // $wzhuce = "{:I('wzhuce')}"; + // $mzhuce = "{:I('mzhuce')}"; + // // $sss="{:I('group')}"; + // if($ddd=='lzhuce'){ + // if($lzhuce==1){ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','lzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='phb'){ + // if($phb==1){ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','phb'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='dzhuce'){ + // if($dzhuce==1){ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','dzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='wzhuce'){ + // if($wzhuce==1){ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','wzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // if($ddd=='mzhuce'){ + // if($mzhuce==1){ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',2); + // $("#search").click(); + // }else{ + // $(".sortBy").attr('name','mzhuce'); + // $(".sortBy").attr('value',1); + // $("#search").click(); + // } + // } + // }) //点击排序 $('.list_sort').click(function(){ var url = $(this).attr('url'); @@ -315,7 +384,6 @@ }); $("#game_name").change(); - }) From 80597c48945e7910279e3397d4aa28eb8438ca27 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 10:16:26 +0800 Subject: [PATCH 03/12] upt --- .../Controller/ExportController.class.php | 2 +- .../Controller/PlatformController.class.php | 31 ++++++++++++++----- .../View/Platform/promote_statistics.html | 11 ++++++- .../View/Platform/promotepay_statistics.html | 9 ++++++ 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 3b6269a17..b847ea327 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3731,7 +3731,7 @@ class ExportController extends Controller ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') - ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + ->where("tab_promote.id in (".implode(',', array_column($data, 'id')).")")->select() : []; $companys = $companys ? array_column($companys, null, 'id') : []; foreach ($data as &$item) { $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 40f0095e2..8cbe9c793 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -446,6 +446,10 @@ class PlatformController extends ThinkController $play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name like '{$_REQUEST['game_name']}%'"; } + if (!empty($_REQUEST['admin_id'])) { + $map['promote.admin_id'] = $_REQUEST['admin_id']; + } + $today = total(1); $week = total(2); $mounth = total(3); @@ -467,7 +471,7 @@ class PlatformController extends ThinkController // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $map['tab_promote.admin_id'] = session('user_auth'); + $map['promote.admin_id'] = session('user_auth'); } $data = M("User u","tab_") @@ -504,6 +508,7 @@ class PlatformController extends ThinkController ->join("tab_promote promote ON u.promote_id = promote.id","left") ->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false) ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) + ->join('tab_game on u.fgame_id = tab_game.id') ->where($tmap) ->group('id') ->order('register_time') @@ -581,7 +586,7 @@ class PlatformController extends ThinkController ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') - ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + ->where("tab_promote.id in (".implode(',', array_column($data, 'id')).")")->select() : []; $companys = $companys ? array_column($companys, null, 'id') : []; foreach ($data as &$item) { $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; @@ -590,6 +595,7 @@ class PlatformController extends ThinkController $this->meta_title = '渠道注册统计列表'; $this->assign("is_admin",is_administrator()); $this->assign('list_data', $data); + $this->assign('admin_users', M('member')->field('uid,nickname')->select()); $this->assign('total', $total); $this->display(); } @@ -645,7 +651,12 @@ class PlatformController extends ThinkController setPowerPromoteIds($map, 'tp1.id'); if (isset($_REQUEST['promote_id'])) { - $map['tp1.id'] = $_REQUEST['promote_id']; + //$map['tp1.id'] = $_REQUEST['promote_id']; + $promoter_ids = D("Promote")->where("chain like '%/{$_REQUEST['promote_id']}/%' or id={$_REQUEST['promote_id']}")->field('id')->select(); + if ($promoter_ids) { + $map['tp1.id'] = $_REQUEST['promote_id']; + $map['tp2.id'] = ['in', implode(',', array_column($promoter_ids, 'id'))]; + } } else { $map['tp1.chain'] = '/'; } @@ -669,6 +680,10 @@ class PlatformController extends ThinkController $map['s.sdk_version'] = $_REQUEST['game_type']; } + if (!empty($_REQUEST['admin_id'])) { + $map['s.market_admin_id'] = $_REQUEST['admin_id']; + } + if (isset($_REQUEST['sdk_version'])||isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])) { $data = M('promote', 'tab_')->alias('tp1') ->field('tp1.account as promote_account,tp1.id,g.relation_game_name, @@ -719,16 +734,18 @@ class PlatformController extends ThinkController $tmdata[$v['id']]['promote_account'] = $v['promote_account']; $tmdata[$v['id']]['count'] = 0; } + + $tmdata[$v['id']]['id'] = $v['id']; } $data = []; foreach($tmdata as $k => $v){ $data[] = $v; } // dd($data); - unset($map['tp1.id']); + unset($map['tp1.id'], $map['tp2.id']); unset($map['tp1.chain']); unset($tmap['tp1.id']); - unset($tmap['tp1.chain']); + unset($tmap['tp1.chain'], $tmap['tp2.id']); $map['s.promote_id'] = 0; $tmap['s.promote_id'] = 0; $authorityData['count'] = 0; @@ -796,12 +813,11 @@ class PlatformController extends ThinkController $data = my_sort($data, $data_order_type, (int)$data_order); $size = $row;//每页显示的记录数 - $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 $companys = !empty($data) ? M('promote', 'tab_') ->field('tab_promote.id, company_name, sys_member.nickname as admin_username') ->join("tab_promote_company on tab_promote.company_id = tab_promote_company.id", 'left') ->join('sys_member on tab_promote.admin_id = sys_member.uid', 'left') - ->where("tab_promote.id in ('".implode(',', array_column($data, 'id'))."')")->select() : []; + ->where("tab_promote.id in (".implode(',', array_column($data, 'id')).")")->select() : []; $companys = $companys ? array_column($companys, null, 'id') : []; foreach ($data as &$item) { $item['company_name'] = $companys[$item['id']]['company_name'] ?? '无'; @@ -833,6 +849,7 @@ class PlatformController extends ThinkController $data = array_slice($data, ($arraypage - 1) * $size, $size); $this->meta_title = '渠道充值统计列表'; $this->assign('list_data', $data); + $this->assign('admin_users', M('member')->field('uid,nickname')->select()); $this->assign("is_admin",is_administrator()); $this->display(); diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index badc4bb01..80e24e4f9 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -61,6 +61,15 @@ +
+ + +
+
+ + +
- +
- +
- - - + +
-
- -
- - - @@ -178,7 +168,7 @@ - + @@ -299,32 +289,46 @@ }); }); - var game_server = "{:I('server_id')}"; - $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGmeServer')}", - type:"post", - data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); - } - }) - }); + $("#game_id").change(function(){ + $.ajax({ + url:"{:U('getSpendServer')}", + type:"post", + data:{game_id:$("#game_id option:selected").attr('game-id')}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); - $("#game_name").change(function(){ - $("#game_type").change(); - }); + } + }) + }); + var game_id = "{:I('game_name')}"; + var game_server = "{:I('server_id')}"; + if(game_id){ + $.ajax({ + url:"{:U('getSpendServer')}", + type:"post", + data:{game_name:game_id}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); - $("#game_name").change(); - + } + }) + } }) \ No newline at end of file diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index 3a7047c7e..11a64e4e8 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -54,14 +54,14 @@
- +
- - - + +
-
- -
- + - - - + - @@ -184,7 +174,7 @@ - + @@ -368,31 +358,48 @@ }); }); - var game_server = "{:I('server_id')}"; - $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGmeServer')}", - type:"post", - data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, - dataType:'json', - success:function(data){ - console.log(data) - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); - } - }) - }); + $("#game_id").change(function(){ + console.log($("#game_id option:selected").attr('game-id')); + $.ajax({ + url:"{:U('getSpendServer')}", + type:"post", + data:{game_id:$("#game_id option:selected").attr('game-id')}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); - $("#game_name").change(function(){ - $("#game_type").change(); - }); + } + }) + }); + var game_name = "{:I('game_name')}"; + var game_server = "{:I('server_id')}"; + if(game_name){ + console.log({game_name:game_name}) + $.ajax({ + url:"{:U('getSpendServer')}", + type:"post", + data:{game_name:game_name}, + dataType:'json', + success:function(data){ + console.log(data) + str = ""; + for (var i in data){ + str += "" + } + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); - $("#game_name").change(); + } + }) + } }) - + \ No newline at end of file From b9dfe0817785731419f04025deb90c98aa88ce40 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 12:03:29 +0800 Subject: [PATCH 05/12] upt --- .../Admin/Controller/ExportController.class.php | 4 ++-- .../Admin/Controller/PlatformController.class.php | 15 ++++++++------- .../Admin/View/Platform/promote_statistics.html | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 6bf24fe3f..2f9d589e1 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -157,8 +157,8 @@ class ExportController extends Controller $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['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + $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); @@ -3626,7 +3626,7 @@ class ExportController extends Controller // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $map['promote.admin_id'] = session('user_auth'); + $map['promote.admin_id'] = is_login(); } $data = M("User u","tab_") diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 09a7a2366..165d5e918 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -461,15 +461,16 @@ class PlatformController extends ThinkController } } - //为数据权限添加 - setPowerPromoteIds($map, 'u.promote_id'); - // 如果是市场专员那么只能看自己的 + // 如果是市场专员那么只能看自己的会长信息 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $map['promote.admin_id'] = session('user_auth'); + $map['promote.admin_id'] = is_login(); } + //为数据权限添加 + setPowerPromoteIds($map, 'u.promote_id'); + $data = M("User u","tab_") ->field("count(u.id) as count,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',u.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") ->join("tab_promote promote ON u.promote_id = promote.id","left") @@ -672,10 +673,10 @@ class PlatformController extends ThinkController // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $map['s.market_admin_id'] = session('user_auth'); + $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); } - if (isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])) { + if (isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])||isset($_REQUEST['admin_id'])||isset($_REQUEST['admin_user_id'])) { $data = M('promote', 'tab_')->alias('tp1') ->field('tp1.account as promote_account,tp1.id, floor(sum(pay_amount)*100) as count') @@ -734,7 +735,7 @@ class PlatformController extends ThinkController $data[] = $v; } //dd($data); - unset($map['tp1.id'], $map['tp2.id']); + unset($map['tp1.id'], $map['tp2.id'], $map['tp2.admin_id']); unset($map['tp1.chain']); unset($tmap['tp1.id']); unset($tmap['tp1.chain'], $tmap['tp2.id']); diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index f3f3e0850..7d09bfc3d 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -102,7 +102,7 @@ - + - +
公司游戏累计注册▲ - 累计注册▼ - 累计注册 + 累计充值▲ + 累计充值▼ + 累计充值 排行榜▲ @@ -115,22 +129,22 @@ - 今日注册▲ - 今日注册▼ - 今日注册 + 今日充值▲ + 今日充值▼ + 今日充值 - 本周注册▲ - 本周注册▼ - 本周注册 + 本周充值▲ + 本周充值▼ + 本周充值 - 本月注册▲ - 本月注册▼ - 本月注册 + 本月充值▲ + 本月充值▼ + 本月充值
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
{$data['company_name']} - {$data['promote_account']} - - {$data['promote_account']} {$data['admin_username']} {$data['relation_game_name']}{$data.count}{$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today} {$data.week} {$data.mounth}
管理员游戏累计注册▲ 累计注册▼ 累计注册 @@ -167,7 +158,6 @@ --> {$data['admin_username']}{$data['relation_game_name']} {$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today}
汇总汇总 {$total.sum_count} --- {$total.sum_today}
公司推广员账号会长账号管理员游戏市场专员 累计充值▲ 累计充值▼ @@ -174,7 +165,6 @@ {$data['company_name']} {$data['promote_account']} {$data['admin_username']}{$data['relation_game_name']} {$data.count} {$data.rand}{$data.rand}{$data.rand}{$data.rand} {$data.today}
汇总汇总 {$total.sum_count} --- {$total.sum_today}推广员账号管理员市场专员 累计注册▲ 累计注册▼ From 51a1c9c707b0b55160c4c117e0993ef5a7e0d565 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 13:51:05 +0800 Subject: [PATCH 06/12] upt --- .../View/Platform/promote_statistics.html | 22 ++++++++++++++----- .../View/Platform/promotepay_statistics.html | 21 +++++++++++++----- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 7d09bfc3d..c8942ea10 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -282,12 +282,22 @@ } }); // var date="{$setdate}"; - $('#time-start, #time-end').each(function(){ - laydate.render({ - elem: this, //指定元素, - type : 'date' - }); - }); + $('#time-start').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView:2, + autoclose:true, + // endDate:date + }); + + $('#datetimepicker').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView:2, + autoclose:true, + pickerPosition:'bottom-left', + // endDate:date + }) $("#game_id").change(function(){ $.ajax({ diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index 11a64e4e8..23f019da4 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -351,13 +351,22 @@ } }); // var date="{$setdate}"; - $('#time-start, #time-end').each(function(){ - laydate.render({ - elem: this, //指定元素, - type : 'date' - }); - }); + $('#time-start').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView:2, + autoclose:true, + // endDate:date + }); + $('#datetimepicker').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView:2, + autoclose:true, + pickerPosition:'bottom-left', + // endDate:date + }) $("#game_id").change(function(){ console.log($("#game_id option:selected").attr('game-id')); $.ajax({ From aa77fb78214cc77300402549e5a5fbda5bb4a2c8 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 15:53:54 +0800 Subject: [PATCH 07/12] upt --- .../Admin/Controller/PlatformController.class.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 165d5e918..33f198070 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -673,7 +673,7 @@ class PlatformController extends ThinkController // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); + $statisticsMap['tab_promote.admin_id'] = $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); } if (isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])||isset($_REQUEST['admin_id'])||isset($_REQUEST['admin_user_id'])) { @@ -689,7 +689,13 @@ class PlatformController extends ThinkController ->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(); + setPowerPromoteIds($statisticsMap, 'tab_promote.id'); + $data = M('promote_statistics', 'tab_') + ->field("promote_account,promote_id as id,sum(count) count") + ->join('tab_promote on tab_promote.id = tab_promote_statistics.promote_id', 'left') + ->where($statisticsMap) + ->group("promote_id") + ->select(); } From 7fc6609d7823fc95a58f029ecc49772566332b6c Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 16:16:35 +0800 Subject: [PATCH 08/12] upt --- .../Controller/PlatformController.class.php | 59 +++++++++++-------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 33f198070..eafe81835 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -673,30 +673,41 @@ class PlatformController extends ThinkController // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $statisticsMap['tab_promote.admin_id'] = $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); - } - - if (isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])||isset($_REQUEST['admin_id'])||isset($_REQUEST['admin_user_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 use INDEX(search) on tp2.id = s.promote_id", 'left') - ->join("tab_game as g on g.id = s.game_id", 'left') - ->where($map) - ->group('tp1.id') - ->order('count desc') - ->select(); - } else { - $statisticsMap['time'] =$map['pay_time']; - setPowerPromoteIds($statisticsMap, 'tab_promote.id'); - $data = M('promote_statistics', 'tab_') - ->field("promote_account,promote_id as id,sum(count) count") - ->join('tab_promote on tab_promote.id = tab_promote_statistics.promote_id', 'left') - ->where($statisticsMap) - ->group("promote_id") - ->select(); - } + $map['s.market_admin_id'] = $statisticsMap['tab_promote.admin_id'] = $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); + } + + $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 use INDEX(search) on tp2.id = s.promote_id", 'left') + ->join("tab_game as g on g.id = s.game_id", 'left') + ->where($map) + ->group('tp1.id') + ->order('count desc') + ->select(); + + // if (isset($_REQUEST['server_id'])||isset($_REQUEST['game_name'])||isset($_REQUEST['promote_id'])||isset($_REQUEST['admin_id'])||isset($_REQUEST['admin_user_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 use INDEX(search) on tp2.id = s.promote_id", 'left') + // ->join("tab_game as g on g.id = s.game_id", 'left') + // ->where($map) + // ->group('tp1.id') + // ->order('count desc') + // ->select(); + // } else { + // $statisticsMap['time'] =$map['pay_time']; + // setPowerPromoteIds($statisticsMap, 'tab_promote.id'); + // $data = M('promote_statistics', 'tab_') + // ->field("promote_account,promote_id as id,sum(count) count") + // ->join('tab_promote on tab_promote.id = tab_promote_statistics.promote_id', 'left') + // ->where($statisticsMap) + // ->group("promote_id") + // ->select(); + // } // var_dump($data);die(); From 52b478f570b84e2eb09885c188eb6e57466a325c Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 16:37:48 +0800 Subject: [PATCH 09/12] upt --- Application/Admin/Controller/PlatformController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index eafe81835..897d53b6d 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -673,7 +673,7 @@ class PlatformController extends ThinkController // 如果是市场专员那么只能看自己的 $isMarketAdmin = isMarketAdmin(); if ($isMarketAdmin) { - $map['s.market_admin_id'] = $statisticsMap['tab_promote.admin_id'] = $_REQUEST['admin_user_id'] = $map['tp2.admin_id'] = is_login(); + $map['s.market_admin_id'] = is_login(); } $data = M('promote', 'tab_')->alias('tp1') From 96327507f42e9d6a01910299f729ae435e3095ee Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 16:54:08 +0800 Subject: [PATCH 10/12] upt --- .../Controller/PlatformController.class.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 897d53b6d..287f59b2e 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -643,9 +643,6 @@ class PlatformController extends ThinkController }else{ $tmin = $tmonth[1][0]; } - - //为数据权限添加 - setPowerPromoteIds($map, 'tp1.id'); if (isset($_REQUEST['promote_id'])) { //$map['tp1.id'] = $_REQUEST['promote_id']; @@ -666,14 +663,13 @@ class PlatformController extends ThinkController } } - if (!empty($_REQUEST['admin_id'])) { - $map['s.market_admin_id'] = $_REQUEST['admin_id']; - } - - // 如果是市场专员那么只能看自己的 - $isMarketAdmin = isMarketAdmin(); - if ($isMarketAdmin) { + if (isMarketAdmin()) { $map['s.market_admin_id'] = is_login(); + } else if (!empty($_REQUEST['admin_id'])) { + $map['s.market_admin_id'] = $_REQUEST['admin_id']; + } else { + //为数据权限添加 + setPowerPromoteIds($map, 'tp1.id'); } $data = M('promote', 'tab_')->alias('tp1') From 6390d680ec4bfd7357e198e622b7dd93f2221a30 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 16:57:57 +0800 Subject: [PATCH 11/12] upt --- Application/Admin/Controller/PlatformController.class.php | 2 +- Application/Admin/View/Platform/promotepay_statistics.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 287f59b2e..23e3acf2c 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -839,7 +839,7 @@ class PlatformController extends ThinkController data2csv($data,'推广员充值统计',array( 'company_name' => '公司', - "promote_account"=>"推广员账号", + "promote_account"=>"当前推广员账号", 'admin_username' => '管理员', "count"=>"累计充值", "rand"=>"排行榜", diff --git a/Application/Admin/View/Platform/promotepay_statistics.html b/Application/Admin/View/Platform/promotepay_statistics.html index 23f019da4..1ba329b87 100644 --- a/Application/Admin/View/Platform/promotepay_statistics.html +++ b/Application/Admin/View/Platform/promotepay_statistics.html @@ -61,7 +61,7 @@
- +
会长账号市场专员当前市场专员 累计充值▲ 累计充值▼ From 64bb801be2bf369d197cdb2c38b12fe6fcaa2293 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Thu, 9 Jul 2020 17:20:24 +0800 Subject: [PATCH 12/12] 1 --- Application/Admin/Controller/PlatformController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 23e3acf2c..1236ffafd 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -839,8 +839,8 @@ class PlatformController extends ThinkController data2csv($data,'推广员充值统计',array( 'company_name' => '公司', - "promote_account"=>"当前推广员账号", - 'admin_username' => '管理员', + "promote_account"=>"会长账号", + 'admin_username' => '当前市场专员', "count"=>"累计充值", "rand"=>"排行榜", "today"=>"今日充值",