diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 345c47ce2..60c63486b 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -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(); diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index cbd5bd396..e9577cb24 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -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(); diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 9ba1a1aa9..fc122fa71 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -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']); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 293b449c1..6245f8322 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -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); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 66bb88351..894738ec6 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -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); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 60ec6ad34..5e38df6c1 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -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); diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 615d32a6d..05a34ef18 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -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); } diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 270745826..fad764a01 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -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); diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index c9d6b9b03..f63b9f943 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -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); diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 9f4bcf646..6d3013b5f 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -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 = '角色数据'; diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index 9469f49c3..52d3e1591 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -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; diff --git a/Application/Admin/View/AuthManager/dataempower.html b/Application/Admin/View/AuthManager/dataempower.html index 2237a2e47..a016a6dab 100644 --- a/Application/Admin/View/AuthManager/dataempower.html +++ b/Application/Admin/View/AuthManager/dataempower.html @@ -45,18 +45,18 @@ 数据授权类型： - - - - - - + + + + + + @@ -65,16 +65,50 @@ 数据展示权限： - - - - + + + + + + + + + + 是否显示市场专员： + + + + + + + + + + + 是否显示推广员： + + + + + diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index b3ff89c42..6db8d3462 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -88,6 +88,15 @@ +
+ +
+
实付金额 充值方式 + + 所属商户 @@ -160,11 +171,12 @@ {$data.cost} {$data.pay_amount} {$data.pay_way} + {$data.merchant_name} 总计 - 累计充值：{$sumAll}0 + 累计充值：{$sumAll}0 （现金金额：{$sumCash} 平台币：{$sumBalance} 绑币：{$sumInside}） diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index b1f47860f..099aee315 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -234,13 +234,13 @@ {$data.game_name} {$data.sdk_version} {$data.cash_count} - {$data.balance_coin_count} - + {$data.balance_coin_count} + {$data.inside_cash_count} {$data.all_cash_count} - 订单查看 + 订单查看 @@ -251,7 +251,7 @@ {$sumInside}0 {$sumAll}0 - 订单查看 + 订单查看 diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index 24799c82c..abc2f689f 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -148,6 +148,15 @@
+
+ +
+
实付金额 充值方式 + + 所属商户 @@ -216,11 +227,12 @@ {$data.cost} {$data.pay_amount} {$data.pay_way} + {$data.merchant_name} 总计 - 累计充值：{$sumAll}0 + 累计充值：{$sumAll}0 （现金金额：{$sumCash} 平台币：{$sumBalance} 绑币：{$sumInside}） diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index d5b8ca482..cba880772 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -146,6 +146,7 @@
+
- + +
+
+
搜索
@@ -114,7 +116,9 @@ 日期 + 渠道来源 + 游戏名称 新增人数 活跃人数 @@ -133,7 +137,9 @@ {$data.date} + {$data.promote_id} + {$data.game_id} {$data.registerNum} {$data.livenNum} diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 65650d778..7bfdae2c8 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -113,6 +113,8 @@
+ +
- + + +
+
+
搜索 diff --git a/Application/Admin/View/Stat/userretention.html b/Application/Admin/View/Stat/userretention.html index 714745428..fabef79ec 100644 --- a/Application/Admin/View/Stat/userretention.html +++ b/Application/Admin/View/Stat/userretention.html @@ -59,6 +59,7 @@
+
+
搜索 @@ -84,7 +86,9 @@ 日期 游戏名称 + 渠道名称 + 新增玩家 1日留存 @@ -117,7 +121,9 @@ {$vo.date} {$vo.game_name} + {$vo.promote_name} + {$vo.register_count} 0):?> {$vo['retention_day1']}% diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 88f36ce8e..5fd4918ae 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -82,6 +82,7 @@
+
+
 -  @@ -108,7 +110,7 @@
- +