Merge branch 'release' of wmtx/platform into master

市场专员/推广员信息显示通过权限控制
master
廖金灵 4 years ago committed by Gogs
commit 1784e361fa

@ -1585,7 +1585,7 @@ function getGameList($partner_id) {
function getAdminData ($uid) {
$adminData = M('auth_group_access')
->field('data_empower_type,data_president,show_data')
->field('data_empower_type,data_president,show_data,show_market_admin,show_promote')
->join('left join sys_auth_group on sys_auth_group_access.group_id=sys_auth_group.id')
->where(array('uid'=>$uid))->find();

@ -527,12 +527,14 @@ class AuthManagerController extends AdminController{
$auth_group = M('AuthGroup')->where( array('status'=>array('egt','0'),'module'=>'admin','type'=>AuthGroupModel::TYPE_ADMIN) )
->getfield('id,id,title,rules');
// var_dump($auth_group);die();
$empower_type = M('AuthGroup')->field('data_empower_type,show_data')->where(array('id'=>$_GET['group_id']))->find();
$empower_type = M('AuthGroup')->field('data_empower_type,show_data,show_market_admin,show_promote')->where(array('id'=>$_GET['group_id']))->find();
// var_dump($empower_type);die();
$this->assign('data_empower_type', $empower_type['data_empower_type']);
$this->assign('show_data', $empower_type['show_data']);
$this->assign('auth_group', $auth_group);
$this->assign('show_market_admin', $empower_type['show_market_admin']);
$this->assign('show_promote', $empower_type['show_promote']);
$this->display();
}
@ -542,6 +544,8 @@ class AuthManagerController extends AdminController{
$gid = I('group_id');
$data_empower_type = I('data_empower_type');
$show_data = I('show_data');
$show_market_admin = I('show_market_admin');
$show_promote = I('show_promote');
$promoteData = I('promote_data');
// dump(json_decode($promoteData,true));
@ -567,9 +571,11 @@ class AuthManagerController extends AdminController{
}
if ($AuthGroup->where("id = {$gid}")->save(array(
'data_empower_type'=>$data_empower_type,
'data_president'=>$promoteData,
'show_data'=>$show_data
'data_empower_type' => $data_empower_type,
'data_president' => $promoteData,
'show_data' => $show_data,
'show_market_admin' => $show_market_admin,
'show_promote' => $show_promote,
))) {
resetUserAuth();

@ -55,19 +55,30 @@ class ExportController extends Controller
$xlsName = $_REQUEST['xlsname'];
switch ($id) {
case 1:
// $xlsCell = array(
// array('user_account', "玩家账号"),
// array('game_name', "游戏名称"),
// array('server_name', L('Game_area_clothing')),
// array('role_name', "角色名"),
// array('role_level', "游戏等级"),
// array('play_time', "最后登录时间", 'time_format', '*'),
// array('play_ip', "最后登录ip"),
// );
$xlsCell = array(
"创建时间","玩家账号", "游戏名称","游戏区服", L('Game_area_clothing'), "角色ID", "角色名", "游戏等级","推广员ID", "所属推广员",
"最后登录时间", '最后登录ip','所属市场专员'
);
$showMarketAdmin = session('user_auth')['show_market_admin'];
$showPromote = session('user_auth')['show_promote'];
$headers = [
'create_time' => '创建时间',
'user_account' => '玩家账号',
'game_name' => '游戏名称',
'server_id' => '游戏区服',
'server_name' => L('Game_area_clothing'),
'role_id' => '角色ID',
'role_name' => '角色名',
'role_level' => '游戏等级',
'promote_id' => '所属市场专员',
'promote_account' => '所属推广员',
'play_time' => '最后登录时间',
'play_ip' => '最后登录ip',
];
if ($showMarketAdmin == 0) {
unset($headers['promote_id']);
}
if ($showPromote == 0) {
unset($headers['promote_account']);
}
$xlsCell = array_values($headers);
$fields = array_keys($headers);
if (isset($_REQUEST['game_name'])) {
$map['game_name'] = ['like', trim($_REQUEST['game_name'])."%"];
unset($_REQUEST['game_name']);
@ -95,14 +106,6 @@ class ExportController extends Controller
$map = withMarketAdminCondition($map, I('market_admin_id', 0));
// $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);
// }
setPowerPromoteIds($map,'promote_id');
if (isset($_REQUEST['promote_id'])) {
@ -140,26 +143,30 @@ class ExportController extends Controller
->where($map)
->order('play_time desc')
->count();
// $accessNum =$accessNum['count'];
$perSize = 5000;//每次查询的条数
$pages = ceil($accessNum / $perSize);
$lastId = 0;
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_id,promote_account,play_time,play_ip")
->field($fields)
->where($map)
->limit(($i-1)*$perSize ,$perSize)
->order('play_time desc')
->select();
$adminList = getMarketAdminsByPromoteIds(array_column($xlsData, 'promote_id'));
if ($showMarketAdmin == 1) {
$adminList = getMarketAdminsByPromoteIds(array_column($xlsData, 'promote_id'));
}
foreach($xlsData as $value) {
($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'] : '无';
if ($showPromote == 1) {
($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
}
if ($showMarketAdmin == 1) {
$value['promote_id'] = 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);
@ -1149,14 +1156,6 @@ class ExportController extends Controller
$map['market_admin_id'] = $userAuth['uid'];
}
// $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);
// }
setPowerPromoteIds($map,'promote_id');
if (isset($_REQUEST['promote_id'])) {
@ -1204,11 +1203,42 @@ class ExportController extends Controller
// var_dump($total);die();
$total=$total?$total:0;
$showMarketAdmin = session('user_auth')['show_market_admin'];
$showPromote = session('user_auth')['show_promote'];
$headers = [
'pay_order_number' => '支付订单号',
'extend' => 'CP订单号',
'pay_time' => '充值时间',
'payed_time' => '支付时间',
'user_account' => '玩家账号',
'game_name' => '游戏名称',
'promote_account' => L('Subordinate_channel'),
'0 as company_name' => '所属推广公司',
'market_admin_id' => '所属市场专员',
'merchant_id' => '所属商户',
'spend_ip' => '充值ip',
'server_id' => '区服ID',
'server_name' => '游戏区服',
'game_player_id' => '角色ID',
'game_player_name' => '角色名称',
'cost' => '订单金额',
'pay_amount' => '实付金额',
'pay_way' => '充值方式',
'pay_status' => L('Order_status'),
'pay_game_status' => '游戏通知状态',
'promote_id' => "消费"."{$total}",
];
$xlsCell = array(
"支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员","所属商户", "充值ip","区服ID", "游戏区服",
"角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}"
);
if ($showMarketAdmin == 0) {
unset($headers['market_admin_id']);
}
if ($showPromote == 0) {
unset($headers['promote_account']);
}
$xlsCell = array_values($headers);
$fields = array_keys($headers);
$csvFileName = $xlsName.'.csv';
//设置好告诉浏览器要下载excel文件的headers
@ -1232,20 +1262,14 @@ class ExportController extends Controller
// var_dump($count);die();
for($i = 1; $i <= $pages; $i++) {
$xlsData = D('Spend')
// ->field('pay_order_number,extend,pay_time,user_account,game_name,promote_account,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status')
// ->where($map)
// ->limit(($i-1)*$perSize ,$perSize)
// ->join($tab_promote_join)
// ->order('pay_time DESC')
// ->select();
->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,merchant_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
// ->join('tab_promote on tab_promote.id = tab_spend.promote_id', 'left')
// ->join('tab_promote_company on tab_promote_company.id and tab_promote.company_id', 'left')
->field($fields)
->where($map)
->limit(($i-1)*$perSize ,$perSize)
->order($order ? $order : 'pay_time desc')
->select();
$adminUsernameList = getAdminUsernameList(array_column($xlsData, 'market_admin_id'));
if ($showMarketAdmin == 1) {
$adminUsernameList = getAdminUsernameList(array_column($xlsData, 'market_admin_id'));
}
$promoters = D('Promote')->where(['id'=>['in', array_unique(array_column($xlsData, 'promote_id'))]])->field('id, company_id')->select();
$promoters = $promoters ? array_column($promoters, 'company_id', 'id') : [];
$companys = $promoters ? M('promote_company', 'tab_')->where(['id'=>['in', array_unique(array_values($promoters))]])->field('id, company_name')->select() : [];
@ -1262,13 +1286,17 @@ class ExportController extends Controller
}
$value['merchant_id'] = getMerchantName($value['merchant_id']);
checkEncryptionAuth($value['user_account'],'spend_lists');
// $value['user_account'] = encryption($value['user_account']);
($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
if ($showPromote == 1) {
($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
}
$value['extend'] = $value['extend'].'`';
$value['pay_way'] = get_pay_way($value['pay_way']);
$value['pay_status'] = get_info_status($value['pay_status'],9);
$value['pay_game_status'] = get_info_status($value['pay_game_status'],14);
$value['market_admin_id'] = $adminUsernameList[$value['market_admin_id']] ?? '无';
if ($showMarketAdmin == 1) {
$value['market_admin_id'] = $adminUsernameList[$value['market_admin_id']] ?? '无';
}
mb_convert_variables('GBK', 'UTF-8', $value);
fputcsv($fp, $value);
}
@ -4152,6 +4180,16 @@ class ExportController extends Controller
['retention_day30', '30日留存'],
];
if (session('user_auth')['show_promote'] == 0) {
foreach ($xlsCell as $key => $item) {
if ($item[0] == 'promote_name') {
unset($xlsCell[$key]);
break;
}
}
$xlsCell = array_values($xlsCell);
}
$GetData = $_GET;
unset($GetData['xlsname']);

@ -984,6 +984,10 @@ class FinanceController extends ThinkController
$map['promote_id'] = $_REQUEST['root_id'];
}
if ($_REQUEST['merchant_id']){
$map['merchant_id'] = $_REQUEST['merchant_id'];
}
$promote_id = implode(',',$promote_id);
if ($promote_id) {
$map['promote_id'] = ['in',$promote_id];
@ -1007,7 +1011,7 @@ class FinanceController extends ThinkController
$map['game_player_name'] = array('like',I("user_nickname").'%');
}
// var_dump($map);die();
$field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version";
$field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,sdk_version,merchant_id";
$group = "";
$order = "payed_time DESC";
@ -1017,7 +1021,18 @@ class FinanceController extends ThinkController
$data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
}
$merchant_data = M("payment_merchant","tab_")
->field("id,name")
->where("1=1")
->select();
$handle_merchant = [];
foreach ($merchant_data as $key => $value) {
$handle_merchant[$value['id']] = $value['name'];
}
foreach($data as $key => $value) {
$data[$key]['merchant_name'] = $handle_merchant[$value['merchant_id']];
$data[$key]['pay_way'] = getPayType($value['pay_way']);
$data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
$data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
@ -1044,7 +1059,8 @@ class FinanceController extends ThinkController
"game_player_name"=>"角色名称",
"cost"=>"订单金额",
"pay_amount"=>"实付金额",
"pay_way"=>"充值方式"
"pay_way"=>"充值方式",
"merchant_name"=>"所属商户"
);
addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"充值-财务管理-游戏统计-订单查看-导出"]);
data2csv($data,"游戏统计订单查看",$dcop);

@ -784,7 +784,12 @@ class FinancePromoteController extends AdminController
if (!empty(I('user_nickname'))) {
$map['game_player_name'] = array('like',I("user_nickname").'%');
}
$field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,market_admin_id";
if ($_REQUEST['merchant_id']){
$map['merchant_id'] = $_REQUEST['merchant_id'];
}
$field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,market_admin_id,merchant_id";
$group = "";
$order = "pay_time DESC";
if(isset($_REQUEST['export'])){
@ -798,7 +803,18 @@ class FinancePromoteController extends AdminController
$marketAdmins = getAdminUsernameList(array_column($data, 'market_admin_id'));
}
$merchant_data = M("payment_merchant","tab_")
->field("id,name")
->where("1=1")
->select();
$handle_merchant = [];
foreach ($merchant_data as $key => $value) {
$handle_merchant[$value['id']] = $value['name'];
}
foreach($data as $key => $value) {
$data[$key]['merchant_name'] = $handle_merchant[$value['merchant_id']];
$data[$key]['pay_way'] = getPayType($value['pay_way']);
$data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
$data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
@ -831,6 +847,7 @@ class FinancePromoteController extends AdminController
"cost"=>"订单金额",
"pay_amount"=>"实付金额",
"pay_way"=>"充值方式",
"merchant_name"=>"所属商户",
));
}
$totalData = self::totalGameStatisticsData($map, false);

@ -170,7 +170,8 @@ class MemberController extends ThinkController
foreach ($data as $key=>$value ) {
($data[$key]['promote_account']=='官方渠道'||$data[$key]['promote_account']=='自然注册')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
}
// dump($data);die();
$showMarketAdmin = session('user_auth')['show_market_admin'];
$showPromote = session('user_auth')['show_promote'];
if(isset($_REQUEST['export'])){
$isadmin = is_administrator();
//获取等级
@ -221,6 +222,12 @@ class MemberController extends ThinkController
"small_count"=>"小号","vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间",
"device_number"=>"设备号","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态"
);
if ($showMarketAdmin == 0) {
unset($field['market_admin_username']);
}
if ($showPromote == 0) {
unset($field['promote_account']);
}
//操作日志
unset($_GET['export']);
addOperationLog(array(
@ -282,7 +289,8 @@ class MemberController extends ThinkController
$this->assign('marketAdmins', getMarketAdmins());
$this->assign('repeat_count',$repeat_count);
$this->assign('no_repeat_count',$no_repeat_count);
$this->assign('showMarketAdmin', $showMarketAdmin);
$this->assign('showPromote', $showPromote);
$this->assign('user_count',$user_count);
$this->assign('now_count', $userDbRes['recharge_total']);
$page = set_pagination($user_count, $row);

@ -152,6 +152,7 @@ class RechargeSumController extends ThinkController
$this->checkListOrCountAuthRestMap($map,[]);
$this->assign('showPromote', session('user_auth')['show_promote']);
$this->assign('meta_title', "充值汇总");
$this->assign('list_data', $data);
$this->assign('total', $total);
@ -178,6 +179,15 @@ class RechargeSumController extends ThinkController
array('newAddPay', "新增玩家付费"),
array('accumulated', '本日累计'),
);
if (session('user_auth')['show_promote'] == 0) {
foreach ($expCellName as $key => $row) {
if ($row[0] == 'promote_id') {
unset($expCellName[$key]);
break;
}
}
$expCellName = array_values($expCellName);
}
$expTableData = $data;
$export->exportExcel($exptitle, $expCellName, $expTableData);
}

@ -149,6 +149,8 @@ class SpendController extends ThinkController
$value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无';
}
$this->assign('showMarketAdmin', session('user_auth')['show_market_admin']);
$this->assign('showPromote', session('user_auth')['show_promote']);
$this->assign('isMarketAdmin', $isMarketAdmin);
$this->assign('marketAdmins', getMarketAdmins());
$this->assign('startDate', $startDate);

@ -235,6 +235,7 @@ class StatController extends ThinkController
$this->assign('baseGames', $baseGames);
$this->checkListOrCountAuthRestMap($map,[]);
$this->assign('showPromote', session('user_auth')['show_promote']);
$this->assign('data', $data);
$this->assign('order_type', $orderType);
$this->assign('order_column', $orderColumn);
@ -843,6 +844,7 @@ AND UNIX_TIMESTAMP(
$this->checkListOrCountAuthRestMap($map,[]);
$this->meta_title = 'ARPU统计';
$this->assign('showPromote', session('user_auth')['show_promote']);
$this->assign('baseGames', $baseGames);
$this->assign('records', $rows);
$this->assign('order', $order);

@ -750,6 +750,8 @@ class UserController extends AdminController
$value['market_admin_username'] = isset($adminList[$value['promote_id']]) && $adminList[$value['promote_id']]['admin'] ? $adminList[$value['promote_id']]['admin']['username'] : '无';
}
$this->assign('showPromote', session('user_auth')['show_promote']);
$this->assign('showMarketAdmin', session('user_auth')['show_market_admin']);
$this->assign('list', $list);
$this->meta_title = '角色数据';

@ -82,6 +82,8 @@ class MemberModel extends Model {
'data_empower_type'=>$adminData['data_empower_type'],
'data_president'=>$adminData['data_president'],
'show_data'=>$adminData['show_data'],
'show_market_admin'=>$adminData['show_market_admin'],
'show_promote'=>$adminData['show_promote'],
);
//登录有效时间改为1小时
$expireTime = 3600;

@ -45,18 +45,18 @@
<tr>
<td class="l" style="padding-left: 15px;">数据授权类型:</td>
<td class="r table_radio">
<span class="form_radio table_btn" style="width: auto">
<label >
<input type="radio" value="1" name="data_empower_type" <eq name="data_empower_type" value="1">checked="checked"</eq>>可查看全部数据
</label >
<label >
<input type="radio" value="2" name="data_empower_type" <eq name="data_empower_type" value="2">checked="checked"</eq>>可查看部分数据
</label>
<label >
<input type="radio" value="3" name="data_empower_type" <eq name="data_empower_type" value="3">checked="checked"</eq>>只能查看自己创建的会长数据
</label>
</span>
<!-- <span class="notice-text">锁定状态下,推广员账号则无法登录</span>-->
<span class="form_radio table_btn" style="width: auto">
<label >
<input type="radio" value="1" name="data_empower_type" <eq name="data_empower_type" value="1">checked="checked"</eq>>可查看全部数据
</label >
<label >
<input type="radio" value="2" name="data_empower_type" <eq name="data_empower_type" value="2">checked="checked"</eq>>可查看部分数据
</label>
<label >
<input type="radio" value="3" name="data_empower_type" <eq name="data_empower_type" value="3">checked="checked"</eq>>只能查看自己创建的会长数据
</label>
</span>
<!-- <span class="notice-text">锁定状态下,推广员账号则无法登录</span>-->
<input type="hidden" name="group_id" id="group_id" value="{$_GET['group_id']}">
<input type="hidden" name="promote_data" id="promote_data" value="[]">
</td>
@ -65,16 +65,50 @@
<tr>
<td class="l noticeinfo" style="padding-left: 15px;">数据展示权限:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="show_data"
<if condition="$show_data==1"> checked </if>> 是
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="show_data"
<if condition="$show_data==0"> checked </if>> 否
</label>
</span>
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="show_data"
<if condition="$show_data==1"> checked </if>> 是
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="show_data"
<if condition="$show_data==0"> checked </if>> 否
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>
<tr>
<td class="l noticeinfo" style="padding-left: 15px;">是否显示市场专员:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="show_market_admin"
<if condition="$show_market_admin==1"> checked </if>> 是
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="show_market_admin"
<if condition="$show_market_admin==0"> checked </if>> 否
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>
<tr>
<td class="l noticeinfo" style="padding-left: 15px;">是否显示推广员:</td>
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="1" name="show_promote"
<if condition="$show_promote==1"> checked </if>> 是
</label>
<label>
<input type="radio" class="inp_radio" value="0" name="show_promote"
<if condition="$show_promote==0"> checked </if>> 否
</label>
</span>
<span class="notice-text"></span>
</td>
</tr>

@ -88,6 +88,15 @@
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"
@ -131,6 +140,8 @@
<th >实付金额</th>
<th >充值方式</th>
<th >所属商户</th>
</tr>
</thead>
<!-- 列表 -->
@ -160,11 +171,12 @@
<td >{$data.cost}</td>
<td >{$data.pay_amount}</td>
<td >{$data.pay_way}</td>
<td >{$data.merchant_name}</td>
</tr>
</volist>
<tr>
<td ><span>总计</span></td>
<td colspan="11" ><span><if condition="$sumAll neq ''">累计充值:{$sumAll}<else/>0</if>
<td colspan="12" ><span><if condition="$sumAll neq ''">累计充值:{$sumAll}<else/>0</if>
(现金金额:{$sumCash} 平台币:{$sumBalance} 绑币:{$sumInside}
</span></td>
</tr>

@ -234,13 +234,13 @@
<td >{$data.game_name}</td>
<td >{$data.sdk_version}</td>
<td >{$data.cash_count}</td>
<td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>0,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],p=>1,row=>10]))}">{$data.balance_coin_count}</td>
<td class="coin-detail" data-pay_type="-1" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>-1,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],p=>1,row=>10]))}">
<td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>0,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],'p'=>1,'row'=>10]))}">{$data.balance_coin_count}</td>
<td class="coin-detail" data-pay_type="-1" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>-1,'promote_id'=>$data['p_id'],'game_id'=>$data['game_id'],'p'=>1,'row'=>10]))}">
{$data.inside_cash_count}
</td>
<td >{$data.all_cash_count}</td>
<td >
<a href="{:U('FinancePromote/gameStatisticsDetail',array_merge(I('get.'),['game_id'=>$data['game_id'],'promote_id'=>$data['p_id'],'game_name'=>$data['game_name'],'promote_level'=>$promote_level]))}" >订单查看</a>
<a href="{:U('FinancePromote/gameStatisticsDetail',array_merge(I('get.'),['game_id'=>$data['game_id'],'promote_id'=>$data['p_id'],'game_name'=>$data['game_name'],'promote_level'=>$promote_level,'p'=>1,'row'=>10]))}" >订单查看</a>
</td>
</tr>
</volist>
@ -251,7 +251,7 @@
<td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>
<td><if condition="$sumAll neq ''">{$sumAll}<else/>0</if></td>
<td>
<a href="{:U('FinancePromote/gameStatisticsDetail',array_merge(I('get.'),['promote_level'=>1]))}" >订单查看</a>
<a href="{:U('FinancePromote/gameStatisticsDetail',array_merge(I('get.'),['promote_level'=>1,'p'=>1,'row'=>10]))}" >订单查看</a>
</td>
</tr>
</notemtpy>

@ -148,6 +148,15 @@
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('FinancePromote/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"
@ -186,6 +195,8 @@
<th >实付金额</th>
<th >充值方式</th>
<th >所属商户</th>
</tr>
</thead>
<!-- 列表 -->
@ -216,11 +227,12 @@
<td >{$data.cost}</td>
<td >{$data.pay_amount}</td>
<td >{$data.pay_way}</td>
<td >{$data.merchant_name}</td>
</tr>
</volist>
<tr>
<td ><span>总计</span></td>
<td colspan="12" ><span><if condition="$sumAll neq ''">累计充值:{$sumAll}<else/>0</if>
<td colspan="13" ><span><if condition="$sumAll neq ''">累计充值:{$sumAll}<else/>0</if>
(现金金额:{$sumCash} 平台币:{$sumBalance} 绑币:{$sumInside}
</span></td>
</tr>

@ -146,6 +146,7 @@
<option value="1" <?php echo I('is_repeat') && I('is_repeat') == 1 ? "selected" : ''?>>是</option>
</select>
</div>
<?php if($showPromote == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
@ -163,7 +164,8 @@
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>
<?php if(!$isMarketAdmin):?>
<?php endif;?>
<?php if(!$isMarketAdmin && $showMarketAdmin == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="market_admin_id" style="color:#444" class="select_gallery" id="market_admin_id">
<option value="0">所属市场专员</option>
@ -214,8 +216,12 @@
<else/>
<th>玩家账号</th>
</if>
<?php if($showPromote == 1):?>
<th>所属推广员</th>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<th>所属市场专员</th>
<?php endif;?>
<th>
<a class="paixu" data-order="{:I('balance_status',1)}" name="balance_status">
@ -284,6 +290,7 @@
<!--{$data.account}-->
</td>
</if>
<?php if($showPromote == 1):?>
<td >
<if condition="$data['promote_account'] eq '自然注册'">
{:C('OFFICIEL_CHANNEL')}
@ -298,7 +305,10 @@
</empty>
</if>
</td>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<td >{$data.market_admin_username}</td>
<?php endif;?>
<td >{$data.balance}</td>
<td >{$data.recharge_total}</td>
<td >{$data.gold_coin|default='0.00'}</td>

@ -85,6 +85,7 @@
<option value="">区服名称</option>
</select>
</div>
<?php if($showPromote == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
@ -100,6 +101,7 @@
<option value="">请选择推广员</option>
</select>
</div>
<?php endif;?>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('RechargeSum/summation',array('row'=>I('row')))}">搜索</a>
</div>
@ -114,7 +116,9 @@
<tr>
<th>日期</th>
<?php if($showPromote == 1):?>
<th>渠道来源</th>
<?php endif;?>
<th>游戏名称</th>
<th>新增人数</th>
<th>活跃人数</th>
@ -133,7 +137,9 @@
<tr>
<td>{$data.date}</td>
<?php if($showPromote == 1):?>
<td>{$data.promote_id}</td>
<?php endif;?>
<td>{$data.game_id}</td>
<td>{$data.registerNum}</td>
<td>{$data.livenNum}</td>

@ -113,6 +113,8 @@
</select>
</div>
<br>
<?php if($showPromote == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
@ -128,7 +130,9 @@
<option value="">请选择推广员</option>
</select>
</div>
<?php if(!$isMarketAdmin):?>
<?php endif;?>
<?php if(!$isMarketAdmin && $showMarketAdmin == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="market_admin_id" style="color:#444" class="select_gallery" id="market_admin_id">
<option value="0">所属市场专员</option>
@ -182,8 +186,12 @@
<th>支付时间</th>
<th>玩家账号</th>
<th>游戏名称</th>
<?php if($showPromote == 1):?>
<th>所属推广员</th>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<th>所属市场专员</th>
<?php endif;?>
<th>所属商户</th>
<th>充值ip</th>
<th>区服ID</th>
@ -238,6 +246,7 @@
</if>
<gt name="data.small_id" value="0"><neq name="data.small_id" value="$data.user_id">{$data.small_account}</neq></gt></td>
<td>{$data.game_name}</td>
<?php if($showPromote == 1):?>
<td>
<eq name="data.promote_id" value="-1">C('OFFICIEL_CHANNEL')<else/>
<!-- <if condition="$is_admin eq true ">
@ -249,7 +258,10 @@
<!-- {:get_promote_account($data['promote_id'])}-->
</eq>
</td>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<td >{$data.market_admin_username}</td>
<?php endif;?>
<td >{:getMerchantName($data['merchant_id'])}</td>
<td>{$data.spend_ip}</td>
<empty name='data.server_name'>

@ -117,6 +117,7 @@
<option value="ios" <?php if(I('device_type', '') == 'ios'):?>selected<?php endif;?>>IOS</option>
</select>
</div>
<?php if($showPromote == 1):?>
<div class="input-list input-list-promote search_label_rehab">
<select id="promote_id" name="promote_id" class="select_gallery" >
<option value="">推广员账号</option>
@ -125,6 +126,7 @@
</volist>
</select>
</div>
<?php endif;?>
<input type="hidden" name="" value="" class="sortBy">
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('stat/userarpu','model='.$model['name'].'&row='.I('row'),false)}">搜索</a>

@ -59,6 +59,7 @@
<option value="ios" <?php if(I('device_type', '') == 'ios'):?>selected<?php endif;?>>IOS</option>
</select>
</div>
<?php if($showPromote == 1):?>
<div class="input-list input-list-promote search_label_rehab">
<select id="promote_id" name="promote_id" class="select_gallery" >
<option value="">推广员账号</option>
@ -67,6 +68,7 @@
</volist>
</select>
</div>
<?php endif;?>
<input type="hidden" name="" value="" class="sortBy">
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('stat/userretention','model='.$model['name'].'&row='.I('row'),false)}">搜索</a>
@ -84,7 +86,9 @@
<tr>
<th ><a class="paixu" data-order='date'>日期 <?=$order_column=='date'?($order_type=='desc'?'▼':'▲'):$noOrder?></a></th>
<th>游戏名称</th>
<?php if($showPromote == 1):?>
<th>渠道名称</th>
<?php endif;?>
<th ><a class="paixu" data-order='register_count'>新增玩家 <?=$order_column=='register_count'?($order_type=='desc'?'▼':'▲'):$noOrder?></a></th>
<th ><a class="paixu" data-order='retention_day1'>1日留存 <?=$order_column=='retention_day1'?($order_type=='desc'?'▼':'▲'):$noOrder?></a></th>
@ -117,7 +121,9 @@
<tr>
<td>{$vo.date}</td>
<td>{$vo.game_name}</td>
<?php if($showPromote == 1):?>
<td>{$vo.promote_name}</td>
<?php endif;?>
<td>{$vo.register_count}</td>
<?php if ($vo['register_count']>0):?>
<td>{$vo['retention_day1']}%</td>

@ -82,6 +82,7 @@
<option value="">区服名称</option>
</select>
</div>
<?php if($showPromote == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
@ -100,6 +101,7 @@
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>
<?php endif;?>
<div class="input-list">
<input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="创角开始时间" />
&nbsp;-&nbsp;
@ -108,7 +110,7 @@
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<?php if(!$isMarketAdmin):?>
<?php if(!$isMarketAdmin && $showMarketAdmin == 1):?>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="market_admin_id" style="color:#444" class="select_gallery" id="market_admin_id">
<option value="0">所属市场专员</option>
@ -136,8 +138,12 @@
<th class="">角色ID</th>
<th class="">角色名</th>
<th class="">游戏等级</th>
<?php if($showPromote == 1):?>
<th class="">所属推广员</th>
<th class="">所属市场专员</th>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<th>所属市场专员</th>
<?php endif;?>
<th class="">最后登录时间</th>
<th class="">最后登录IP</th>
<!-- <th class="">操作</th> -->
@ -165,6 +171,7 @@
<td><span class="badge"> {$data['role_id']}</span></td>
<td><notempty name="rolename">{$rolename}<else /></notempty></td>
<td>{$data.role_level}</td>
<?php if($showPromote == 1):?>
<td>
<if condition="$show_data_power eq true ">
{$data.promote_account}
@ -172,7 +179,10 @@
{$data.promote_account|encryptStr}
</if>
</td>
<?php endif;?>
<?php if($showMarketAdmin == 1):?>
<td >{$data.market_admin_username}</td>
<?php endif;?>
<td><?= date('Y-m-d H:i:s', $data['play_time']) ?></td>
<td>{$data.play_ip}</td>
<!-- <td><a class="ajax-get" href="{:U('user_update',['ids'=>$data['id']])}">更新</a></td> -->

Loading…
Cancel
Save