Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

master
zhanglingsheng 5 years ago
commit 8a9e0a9a8b

@ -3522,11 +3522,14 @@ class ExportController extends Controller
// }
$map = " 1=1 ";
$game_map = "";
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
if (isset($_REQUEST['server_id'])) {
$game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
$map .= " AND server_id = '{$_REQUEST['server_id']}' ";
};
$game_map .= ") ";
} else if (isset($_REQUEST['game_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));

@ -432,7 +432,7 @@ class PlatformController extends ThinkController
unset($_REQUEST['game_name']);
}
if (isset($_REQUEST['server_id'])) {
$play_info_map .= " and upi.server_name = '{$_REQUEST['server_id']}' ";
$play_info_map .= " and upi.server_id = '{$_REQUEST['server_id']}' ";
}
$today = total(1);
@ -489,6 +489,7 @@ class PlatformController extends ThinkController
->group('tp1.id')
->order('register_time')
->select();
// dd($tdata);die();
$tmdata = [];
foreach($data as $k=>$v){
@ -497,19 +498,18 @@ class PlatformController extends ThinkController
$v['mounth'] = 0;
$tmdata[$v['id']] = $v;
}
foreach ($tdata as $k => $v) {
$tmdata[$v['id']]['today'] = $v['today'];
$tmdata[$v['id']]['week'] = $v['week'];
$tmdata[$v['id']]['mounth'] = $v['mounth'];
if (!$tmdata[$v['id']]['promote_account']) {
$tmdata[$v['id']]['promote_account'] = $v['promote_account'];
$tmdata[$v['id']]['count'] = 0;
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'];
if (!$tmdata[$v['id']]['promote_account']) {
$tmdata[$v['id']]['promote_account'] = $v['promote_account'];
$tmdata[$v['id']]['count'] = 0;
}
}
}
$data = [];
foreach($tmdata as $k => $v){
$data[] = $v;
@ -519,7 +519,8 @@ class PlatformController extends ThinkController
unset($map['tp1.chain']);
unset($tmap['tp1.chain']);
unset($tmap['tp1.chain']);
$map['promote_id'] = 0;
$map['u.promote_id'] = 0;
$tmap['u.promote_id'] = 0;
$authorityData['count'] = 0;
//如果有官方渠道权限
@ -527,7 +528,8 @@ class PlatformController extends ThinkController
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')
->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(u.id) as count')
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->find();
$tauthorityData = M('user', 'tab_')->alias('u')
@ -536,6 +538,7 @@ class PlatformController extends ThinkController
count(IF(register_time ' . $week . ',1,null)) as week,
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->where($tmap)
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->find();
$authorityData['today'] = $tauthorityData['today'];
$authorityData['week'] = $tauthorityData['week'];

@ -146,6 +146,10 @@ class PromoteGameRatioController extends ThinkController
if (empty($promoteGameRatio)) {
$this->error('参数异常');
}
$promoteId = $promoteGameRatio['promote_id'];
$this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
if ($promoteGameRatio['status'] == 1) {
$save['last_ratio'] = $promoteGameRatio['ratio'];
$save['last_ratio_status'] = 1;
@ -161,6 +165,7 @@ class PromoteGameRatioController extends ThinkController
}
$promoteId = intval($params['promote_id']);
$gameId = intval($params['game_id']);
$this->isWithdraw($promoteId, $save['begin_time']);//是否存在开始时间后已提现数据
$promote = M('promote', 'tab_')->find($promoteId);
if (empty($promote) || $promote['level'] != 1) {
@ -217,6 +222,26 @@ class PromoteGameRatioController extends ThinkController
}
}
private function isWithdraw($promoteId, $beginTime)
{
$promote = M('promote', 'tab_')->find($promoteId);
if (empty($promote)) {
$this->error("数据异常");
}
if ($promote['level'] != 1) {
$this->error("该推广员不是会长账号,无法执行此操作");
}
$withdrawMap['promote_id'] = $promoteId;
$withdrawMap['status'] = ['neq', -2];
$withdrawMap['settlement_end_time'] = ['egt', $beginTime];
$withdraw = M('withdraw', 'tab_')->where($withdrawMap)->order('create_time desc')->find();
if (!empty($withdraw) && $withdraw['status'] != -2) {
$time = date('Y-m-d', $withdraw['create_time']);
$this->error("{$time}之前的订单已经申请提现, 无法变更分成比例,请重新选择开始时间");
}
}
public function setStatus($status)
{
$params = I('post.');
@ -228,6 +253,7 @@ class PromoteGameRatioController extends ThinkController
if (empty($status) || !in_array($status, [-1, 1])) {
$this->error('操作失败');
}
$time = time();
$map['id'] = ['in', $ids];
$map['status'] = 0;
@ -240,6 +266,32 @@ class PromoteGameRatioController extends ThinkController
}
$result = D(self::MODEL_NAME)->where($map)->save($save);
if ($result) {
if ($status == 1) {
foreach ($ids as $id) {
$promoteGameRatio = D(self::MODEL_NAME)->find($id);
if (!empty($promoteGameRatio)) {
if ($promoteGameRatio['begin_time'] <= strtotime(date('Y-m-d', time()))) {
$promoteId = $promoteGameRatio['promote_id'];
$promoteMap['chain'] = ['like', "/{$promoteId}/%"];
$promoteIds = M('promote', 'tab_')->where($promoteMap)->getField('id', true);
$promoteIds[] = $promoteId;
$spendMap['promote_id'] = ['in', $promoteIds];
$spendMap['game_id'] = $promoteGameRatio['game_id'];
if ($promoteGameRatio['end_time'] > 0) {
$spendMap['pay_time'] = ['between', [$promoteGameRatio['begin_time'], $promoteGameRatio['end_time'] + 3600 * 24 - 1]];
} else {
$spendMap['pay_time'] = ['egt', $promoteGameRatio['begin_time']];
}
$spendMap['pay_status'] = 1;
$spendMap['selle_status'] = 0;
$spendSave['selle_ratio'] = $promoteGameRatio['ratio'];
M('spend', 'tab_')->where($spendMap)->save($spendSave);
}
}
}
}
$this->success('操作成功');
} else {
$this->error('操作失败');

@ -1035,11 +1035,14 @@ class StatisticsController extends ThinkController {
$map = " 1=1 ";
$game_map = "";
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
$map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
if (isset($_REQUEST['server_id'])) {
$game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' ";
$map .= " AND server_id = '{$_REQUEST['server_id']}' ";
};
$game_map .= ") ";
} else if (isset($_REQUEST['game_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));

@ -286,14 +286,15 @@
$("#game_id").change(function(){
$.ajax({
url:"{:U('Ajax/getUserServer')}",
url:"{:U('getSpendServer')}",
type:"post",
data:{game_id:$("#game_id option:selected").attr('game-id')},
dataType:'json',
success:function(data){
console.log(data)
str = "<option value=''>请选择区服</option>";
for (var i in data){
str += "<option value='"+data[i].server_name+"'>"+data[i].server_name+"</option>"
str += "<option value='"+data[i].server_id+"'>"+data[i].server_name+"</option>"
}
$("#server_id").empty();
$("#server_id").append(str);
@ -306,14 +307,15 @@
var game_server = "{:I('server_id')}";
if(game_id){
$.ajax({
url:"{:U('Ajax/getUserServer')}",
url:"{:U('getSpendServer')}",
type:"post",
data:{game_id:game_id,type:2},
data:{game_name:game_id},
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>"
str += "<option value='"+data[i].server_id+"' "+(game_server && data[i].server_id == game_server?'selected':'')+">"+data[i].server_name+"</option>"
}
$("#server_id").empty();
$("#server_id").append(str);

@ -32,9 +32,9 @@
<div class="fr">
</div>
<h3 class="page_title">下载链接</h3>
<h3 class="page_title">链接归属查询</h3>
<p class="description_text">说明:下载链接信息解析</p>
<p class="description_text">说明:链接归属信息解析</p>
</div>
@ -53,10 +53,10 @@
<div class="jssearch fl cf search_list">
<div class="input-list search-title-box">
<label>下载链接:</label>
<label>链接归属</label>
</div>
<div class="input-list">
<input type="text" name="link" placeholder="下载链接" value="">
<input type="text" name="link" placeholder="链接归属" value="">
</div>

@ -112,7 +112,7 @@
<input type="hidden" name="id" id="id" value="{$record['id']|default=''}" />
<div class="form-item cf">
<button class="submit_btn ajax-post mlspacing" id="submit" type="submit" target-form="form-horizontal">
<button class="submit_btn mlspacing" id="submit" type="submit" target-form="form-horizontal">
保存
</button>
<a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
@ -203,7 +203,42 @@ $(function(){
});
}
$('submit')
$('#submit').click(function (e) {
var target = $('form').get(0).action;
var query = $('form').serialize();
var that = this;
$(that).addClass('disabled').attr('autocomplete','off').prop('disabled',true);
$.post(target,query).success(function(data){
if(layer) {layer.closeAll('loading');}
if (data.status==1) {
if (data.url) {
updateAlert(data.info + ' 页面即将自动跳转~');
}else{
updateAlert(data.info);
}
setTimeout(function(){
$(that).removeClass('disabled').prop('disabled',false);
if (data.url) {
location.href=data.url;
}else if( $(that).hasClass('no-refresh')){
$('#tip').find('.tipclose').click();
}else{
location.reload();
}
},1500);
}else{
updateAlert(data.info,'tip_error');
setTimeout(function(){
$(that).removeClass('disabled').prop('disabled',false);
if (data.url) {
location.href=data.url;
}else{
$('#tip').find('.tipclose').click();
}
},3000);
}
});
});
});
</script>
</block>

@ -64,7 +64,7 @@
</select>
</div>
<div class="input-list input-list-server search_label_rehab">
<select id="server_name" name="server_name" class="select_gallery" >
<select id="server_id" name="server_id" class="select_gallery" >
<option value="">区服名称</option>
</select>
</div>
@ -128,7 +128,7 @@
'end'=>I('end',date('Y-m-d',strtotime('-1 day'))),
'game_name'=>I('game_name'),
'game_type'=>I('game_type'),
'server_name'=>I('server_name'),
'server_id'=>I('server_id'),
'xlsname'=>'统计_ltv统计'
),false)}">导出</a>
{$_page|default=''}
@ -222,7 +222,7 @@ $(function(){
pickerPosition:'bottom-right'
});
var game_server = "{:I('server_name')}";
var game_server = "{:I('server_id')}";
$("#game_type").change(function(){
console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()})
$.ajax({
@ -234,11 +234,11 @@ $(function(){
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>"
str += "<option value='"+data[i].server_id+"' "+(game_server && data[i].server_id == game_server?'selected':'')+">"+data[i].server_name+"</option>"
}
$("#server_name").empty();
$("#server_name").append(str);
$("#server_name").select2();
$("#server_id").empty();
$("#server_id").append(str);
$("#server_id").select2();
}
})
});

@ -6,6 +6,7 @@
<meta name="description" itemprop="description" content="{$game['features']}"/>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width" name="viewport">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
<script src="__JS__/jquery-1.11.3.min.js"></script>
@ -467,7 +468,7 @@
<div class="register-forget">
<div>
<div style="color:#292929;font-size: 0.22rem;">注册即表示同意</div>
<span><a href="/mobile.php?s=/News/protocol.html">《用户协议》</a></span>
<span><a href="/mobile.php?s=/News/protocol.html" style="color: #21B1EB;">《用户协议》</a></span>
</div>
<div class="phoneCut">
<img src="__IMG__/20191225/qiehuan.png" alt="">

@ -440,7 +440,7 @@
width: 4.40rem;
height:0.7rem;
margin: 0.15rem 0;
background:linear-gradient(0deg,rgba(210,211,211,1),rgba(209,209,209,1));
background:linear-gradient(0deg,rgba(196,196,196,1),rgba(217,218,218,1));
box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17);
border-radius:0.35rem;
text-align: center;
@ -588,7 +588,7 @@
}
.register-box{
width: 6rem;
height: 7.2rem;
height: 7.4rem;
background-color: #fff;
border-radius: 0.3rem;
}
@ -624,7 +624,7 @@
.input-box{
display: flex;
align-items: center;
width: 4.6rem;
width: 4.4rem;
border-bottom: 1px solid #C9C9C9;
padding-bottom: 0.14rem;
margin-bottom: 0.51rem;
@ -638,9 +638,10 @@
border: 0;
outline: 0;
font-size: 0.24rem;
width: 4rem;
}
.input-code{
width: 4.6rem;
width: 4.4rem;
display: flex;
align-items: flex-end;
justify-content: space-between;
@ -689,7 +690,7 @@
line-height: 0.7rem;
}
.register-forget{
width: 5.4rem;
width: 4.8rem;
display: flex;
align-items: center;
justify-content: space-between;
@ -782,6 +783,7 @@
color: #292929;
font-size: 0.28rem;
font-weight: bold;
width: 4.6rem;
}
.title-one>img{
width: 0.3rem;
@ -801,7 +803,7 @@
font-weight: 400;
}
.mounting-btn{
width:4.4rem;
width:4.6rem;
height:0.7rem;
background:linear-gradient(0deg,rgba(33,177,235,1),rgba(88,197,240,1));
box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17);
@ -813,10 +815,11 @@
margin-top: 0.46rem;
}
.title-two{
margin-top: 0.77rem;
margin-top: 0.67rem;
color: #292929;
font-size: 0.28rem;
font-weight: bold;
width: 4.6rem;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Loading…
Cancel
Save