Merge remote-tracking branch 'origin/dev' into dev

master
liuweiwen 5 years ago
commit afa5310526

@ -596,4 +596,13 @@ function encryptStr($str) {
$stars_str = $stars_str."*";
}
return substr_replace($str, $stars_str, 3, $length-6);
}
function encryptIdCard($str) {
$length = strlen($str);
$stars_str = "";
if($length>=4){
$stars_str = "****";
}
return substr_replace($str, $stars_str, $length-4, 4);
}

@ -51,6 +51,12 @@ class BehaviorLogController extends ThinkController
}
}
$data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select();
foreach($data as $k => $v) {
if(empty($v['extend'])) {
$data[$k]['extend'] = $v['order_id'];
}
}
$count = M('pay_info', 'tab_')->where($map)->count();
$page = set_pagination($count, $row);
if ($page) {

@ -6981,5 +6981,84 @@ if ($key == 'model'){
return $data;
}
/**
* 推广补链
* @author 鹿文学
*/
public function Support_list() {
$xlsName = $_REQUEST['xlsname'];
$model = M('user','tab_');
$xlsCell = array(
'一级渠道','玩家账号','游戏名称','区服','角色名','申请额度','扶持类型','备注','申请时间','可用额度','实际发放额度','状态'
);
if(I('promote_id')){
$map['promote_id']=I('promote_id');
}
if(I('game_id')){
$map['game_id']=I('game_id');
}
if(!empty(I('apply_type')) || I('apply_type')==='0'){
$map['apply_type']=I('apply_type');
}
//
if(!empty(I('apply_status')) || I('apply_status')==='0'){
$map['apply_status']=I('apply_status');
}
$csvFileName = $xlsName.'.csv';
//设置好告诉浏览器要下载excel文件的headers
header('Content-Description: File Transfer');
header('Content-Type: application/vnd.ms-excel');
header('Content-Disposition: attachment; filename="'. $csvFileName .'"');
header('Expires: 0');
header('Cache-Control: must-revalidate');
header('Pragma: public');
$fp = fopen('php://output', 'a');//打开output流
mb_convert_variables('GBK', 'UTF-8', $xlsCell);
fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中
$accessNum=M('test_resource','tab_')->where($map)->count();
$perSize = 5000;//每次查询的条数
$pages = ceil($accessNum / $perSize);
for($i = 1; $i <= $pages; $i++) {
/* 获取频道列表 */
$xlsData = M('test_resource','tab_')
->field('promote_account,user_account,game_name,server_name,role_name,
apply_resource,apply_type,apply_remark,create_time,id as max_quota,verify_resource,apply_status')
->where($map)
->order('id desc')
->select();
foreach($xlsData as $key => $value) {
$value['create_time'] = date("Y-m-d H:i:s", $value['create_time']);
$value['max_quota'] = max_quota($value['game_id'],$value['promote_id']);
$value['apply_type'] = $value['apply_type']==0?'新增扶持':'后续扶持';
if($value['apply_status'] == 1) {
$value['apply_status'] = '拒绝';
} else if ($value['apply_status'] == 2) {
$value['apply_status'] = '通过';
} else {
$value['apply_status'] = '待审核';
}
mb_convert_variables('GBK', 'UTF-8', $value);
fputcsv($fp, $value);
}
unset($xlsData);//释放变量的内存
//刷新输出缓冲到浏览器
ob_flush();
flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。
}
fclose($fp);
exit();
}
}

@ -113,7 +113,7 @@
<tr>
<td class="l">身份证号</td>
<td class="r">
<input type="text" class="txt" value="{$data['idcard']|encryptStr}" readonly>
<input type="text" class="txt" value="{$data['idcard']|encryptIdCard}" readonly>
<span id="idcard" class="table_click"><span class="table_click_text inner-click-text">点击修改</span></span>
</td>
</tr>

@ -119,7 +119,7 @@
<select id="game_name" name="game_name" class="select_gallery" >
<option value="">游戏名称</option>
<volist name=":getAllGame()" id="vo">
<option value="{$vo.game_name}" <?php echo $vo.relation_game_name == I('game_name') ? 'selected':''; ?> >{$vo.game_name}</option>
<option value="{$vo.game_name}" <if condition="$vo.game_name eq I('game_name')">selected</if> >{$vo.game_name}</option>
</volist>
</select>
</div>
@ -475,12 +475,14 @@ $(function(){
})
var game_server = "{:I('server_name')}";
$("#game_type").change(function(){
console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()})
$.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 = "<option value=''>请选择区服</option>";
for (var i in data){
str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"

@ -170,6 +170,7 @@
</div>
</div>
<div class="page">
<a class="sch-btn" href="{:U('Export/Support_list',array_merge(array('xlsname'=>'扶持发放'),I('get.')))}">导出</a>
{$_page|default=''}
</div>
</block>

@ -1897,7 +1897,6 @@ class QueryController extends BaseController
$list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account'];
}
}
$games = get_promote_serach_game();
$this->assign('games', $games);

@ -80,11 +80,6 @@
var videoWidth = $('.video-js').width();
$('.video-js').height(videoWidth * 0.562295082);
var myPlayer = videojs('example_video_1');
myPlayer.ready(function(){
this.play();
});
$('.down-link').on('click', function () {
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
@ -94,6 +89,7 @@
if ($('.bn-rule').length > 0) {
$('.bn-rule').css('display','block')
$('.bn-rule').css('z-index','12')
$('video').hide();
return
}
if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) {

@ -21,6 +21,9 @@
.trunk-search .select-time .txt {
width: 100px;
}
.title-cursor-pointer {
cursor: pointer;
}
</style>
</block>
<block name="body">
@ -95,13 +98,13 @@
<div class="trunk-list list_normal">
<table class="table normal_table">
<tr class="odd">
<th>玩家账号</th>
<th>游戏名称</th>
<th>平台</th>
<th>游戏区服</th>
<th>角色名</th>
<th>等级</th>
<th class="sort" sort-name="recharge_cost">充值总额
<th class="title-cursor-pointer" title="平台用户的账号">玩家账号</th>
<th class="title-cursor-pointer" title="玩家所产生消费的游戏">游戏名称</th>
<th class="title-cursor-pointer" title="设备类型安卓或者ios">平台</th>
<th class="title-cursor-pointer" title="游戏内区服">游戏区服</th>
<th class="title-cursor-pointer" title="游戏角色">角色名</th>
<th class="title-cursor-pointer" title="游戏区服内等级">等级</th>
<th class="sort" sort-name="recharge_cost" class="title-cursor-pointer" title="该游戏区服 内的充值总额">充值总额
<if condition="'recharge_cost' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -112,7 +115,7 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th class="sort" sort-name="recharge_count">充值次数
<th class="sort" sort-name="recharge_count" class="title-cursor-pointer" title="在游戏区服内的充值次数">充值次数
<if condition="'recharge_count' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -123,7 +126,7 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th class="sort" sort-name="recharge_cost_today">昨日充值
<th class="sort" sort-name="recharge_cost_today" class="title-cursor-pointer" title="玩家昨日游戏区服的充值总额">昨日充值
<if condition="'recharge_cost_today' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -134,7 +137,7 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th class="sort" sort-name="unlogin_day">未登录天数
<th class="sort" sort-name="unlogin_day" class="title-cursor-pointer" title="玩家该角色未登录天数">未登录天数
<if condition="'unlogin_day' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -145,7 +148,7 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th class="sort" sort-name="user_game_login_count" title="玩家在该游戏累计登陆的天数(不分区服)">游戏累计登录天数
<th class="sort" sort-name="user_game_login_count" class="title-cursor-pointer" title="游戏累计登陆天数:玩家在该游戏累计登陆的天数(不分区服)">游戏累计登录天数
<if condition="'user_game_login_count' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -156,7 +159,7 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th class="sort" sort-name="create_time" title="账号在该游戏的创角时间">注册时间
<th class="sort" sort-name="create_time" class="title-cursor-pointer" title="账号所注册的时间">注册时间
<if condition="'create_time' == I('sort_name', '')">
<if condition="1 == $sort">
<i class="iconfont iconsort-down"></i>
@ -167,8 +170,8 @@
<i class="iconfont iconsort"></i>
</if>
</th>
<th>最后登录时间</th>
<th>推广员账号</th>
<th class="title-cursor-pointer" title="玩家角色上次登录的时间">最后登录时间</th>
<th class="title-cursor-pointer" title="对应推广员的账号">推广员账号</th>
</tr>
<empty name="records">
<tr><td colspan="12" style="text-align: center;height: 45vh;"><img src="__IMG__/20180207/icon_wushujv2.png"/><p style="line-height: 40px;color: #A5A5A5;">暂无数据</p></td></tr>

@ -686,7 +686,7 @@ CREATE TABLE `tab_server_union` (
KEY `create_time` (`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表';
-- 用户行为
-- 用户行为 tping
ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号';
ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称';
ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称';
@ -703,6 +703,11 @@ ALTER TABLE `tab_pay_info`
ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`,
ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`;
-- 苹果内购 tping
ALTER TABLE `tab_spend_distinction`
MODIFY COLUMN `extend` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '通知游戏方扩展(一般是游戏方透传)' AFTER `game_name`;
-- 菜单(游戏充值预下单)
INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);

Loading…
Cancel
Save