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

master
zhengyongxing 5 years ago
commit 932958a071

@ -4,8 +4,8 @@ class FinancialSummaryController extends AdminController
{
public $keyname=array(
"cash_spend"=>"现金充值收入",
"balance_coin_spend"=>"平台币充值收入",
"balance_coin_income"=>"平台币消耗",
"balance_coin_spend"=>"平台币消耗",
"balance_coin_income"=>"平台币充值收入",
"game_supersign_income"=>"超级签购买收入",
"test_user_income"=>"测试收入",
"reward_count"=>"奖励",

@ -414,8 +414,8 @@ class FinancialSummarySetController extends \Think\Controller
")
->where($map)
->find();
$moneyarry['wx'] += $dbres['wx_count'];
$moneyarry['gfzfb'] += $dbres['zfb_count'];
$moneyarry['wx'] += $dbres['wx_count']*100;
$moneyarry['gfzfb'] += $dbres['zfb_count']*100;
}
//玩家购买平台币
protected function getDepositPayWay(&$moneyarry)
@ -454,8 +454,8 @@ class FinancialSummarySetController extends \Think\Controller
")
->where($map)
->find();
$moneyarry['wx'] += $dbres['wx_count'];
$moneyarry['gfzfb'] += $dbres['zfb_count'];
$moneyarry['wx'] += $dbres['wx_count']*100;
$moneyarry['gfzfb'] += $dbres['zfb_count']*100;
}
public function addDb()
{

@ -16,6 +16,17 @@ class ToolController extends ThinkController {
$config = I('config');
$data = array('config'=>json_encode($config),'template'=>$_POST['template'],'status'=>$_POST['status']);
$map['name']=$name;
$day_pay = $config['day_pay_limit'];
$month_pay = $config['month_pay_limit'];
if(!empty($day_pay) && !empty($month_pay)) {
if($month_pay / date('t') > $day_pay) {
$this->error('月支付限量较日支付限量过大');
} elseif ($month_pay < $day_pay) {
$this->error('月支付限量不能小于日支付限量');
}
}
if($_POST['status']==1&&$name=="weixin"){
$map_['name']=array("in",'wei_xin,wei_xin_app,weixin_gf');
M('tool','tab_')->where($map_)->setField('status','0');

@ -25,7 +25,7 @@
</style>
<style>
.select2-container--default .select2-selection--single {
color: #000;
color: #000;
resize: none;
border-width: 1px;
border-style: solid;
@ -41,7 +41,7 @@
height:26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height:26px;line-height:26px;font-size:12px;
height:26px;line-height:26px;font-size:12px;
}
.select2-results__option[aria-selected] {font-size:12px;}
</style>
@ -62,22 +62,28 @@
charset="UTF-8"></script>
<form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
class="form-horizontal form_info_ml" id="form">
class="form-horizontal form_info_ml" id="form">
<div class="formtitle"><span>奖惩编辑</span></div>
<ul class="form_info ">
<input type="hidden" name="id" value="{$data.id}" />
<li>
<label>奖惩类型</label>
<select id="reward_type" name="reward_type" class="select_gallery">
<option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
<option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
<?php if ($_GET['id']):?>
<input type="hidden" name="reward_type" value="{$data['reward_type']}">
<?php endif;?>
<select id="reward_type" name="reward_type" class="select_gallery" <?php if ($_GET['id']):?> disabled<?php endif;?>>
<option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
<option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
</select>
</li>
<li>
<label>公司类型</label>
<select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()">
<option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
<option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
<?php if ($_GET['id']):?>
<input type="hidden" name="company_type" value="{$data['company_type']}">
<?php endif;?>
<select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()" <?php if ($_GET['id']):?> disabled<?php endif;?>>
<option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
<option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
</select>
</li>
<li>
@ -93,22 +99,22 @@
<?php foreach ($data['accounts'] as $k => $account):?>
<?php if ($k == 0):?>
<li class="user-account">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
<option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
<button type="button" class="bnt_add"></button>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
<button type="button" class="bnt_add"></button>
</li>
<?php else:?>
<li class="user-account">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<label>涉及账号</label>
<select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
<option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
<option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
</select>
<input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
<button type="button" class="bnt_remove"></button>
</li>
<?php endif;?>
@ -149,76 +155,76 @@
<button class="submit_btn ajax-post" id="submit" type="submit" target-form="form-horizontal">
确认保存
</button>
<input type="button" value="返 回" target-form="form-horizontal" class="form_btn ajax-post" onclick="javascript:void(window.history.go(-1))">
<input type="button" value="返 回" target-form="form-horizontal" class="form_btn" onclick="javascript:void(window.history.go(-1))">
</li>
</ul>
</form>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="AuthManager/index">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="AuthManager/index">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">
<script type="text/javascript">
highlight_subnav('{:U('StatementMangement/rewardManageList')}');
$(".bnt_add").bind("click",function(){
highlight_subnav('{:U('StatementMangement/rewardManageList')}');
$(".bnt_add").bind("click",function(){
var a= '<li class="user-account"><label>涉及账号</label><select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)"><option value="1">推广员</option><option value="2">玩家</option></select><input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号"><button type="button" class="bnt_remove"></button>';
$(".user-account:last").after(a);
});
$(document).on('click', '.bnt_remove', function(){
$(this).parents('li').remove();
});
var date = new Date();
var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
$("#reward_time").datetimepicker({
format : "yyyy-mm-dd hh:ii",
autoclose : true,
todayBtn : true,
todayHighlight : true,
startDate : monthStart,
language : 'zh-CN',
startView : 2,//月视图
showMeridian : true,
pickerPosition : "bottom-left",
minuteStep : 5
});
/* $('#reward_time').datetimepicker({
language:"zh-CN",
hour: 13,
minute: 15,
setStartDate:'2020-02-01',
todayHighlight : true,
todayBtn:true
});*/
var company_id = '{$data["company_id"]}';
function companyTypeChange()
{
var companyType = $('#company_type').val();
$.ajax({
url:"{:U('StatementMangement/getCompanys')}",
dataType:'JSON',
data: {'type':companyType},
success:function(response){
var companyData = '';
$.each(response.info, function(index, item){
if (company_id == item.id) {
companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
} else {
companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
}
});
$('#company_id').html(companyData);
}
$(document).on('click', '.bnt_remove', function(){
$(this).parents('li').remove();
});
}
var date = new Date();
var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
$("#reward_time").datetimepicker({
format : "yyyy-mm-dd hh:ii",
autoclose : true,
todayBtn : true,
todayHighlight : true,
startDate : monthStart,
language : 'zh-CN',
startView : 2,//月视图
showMeridian : true,
pickerPosition : "bottom-left",
minuteStep : 5
});
/* $('#reward_time').datetimepicker({
language:"zh-CN",
hour: 13,
minute: 15,
setStartDate:'2020-02-01',
todayHighlight : true,
todayBtn:true
});*/
var company_id = '{$data["company_id"]}';
function companyTypeChange()
{
var companyType = $('#company_type').val();
$.ajax({
url:"{:U('StatementMangement/getCompanys')}",
dataType:'JSON',
data: {'type':companyType},
success:function(response){
var companyData = '';
$.each(response.info, function(index, item){
if (company_id == item.id) {
companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
} else {
companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
}
});
$('#company_id').html(companyData);
}
});
}
companyTypeChange();
companyTypeChange();
</script>
</block>

@ -243,6 +243,33 @@
<span class="notice-text">控制SDK内的支付宝支付方式默认是APP支付当选择WAP支付时在SDK支付页面选择“支付宝”进行付款时采用支付宝的WAP支付</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">日支付限量</td>
<td class="r table_radio">
<input name="config[day_pay_limit]" type="text" value="{$alipay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">月支付限量</td>
<td class="r table_radio">
<input name="config[month_pay_limit]" type="text" value="{$alipay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
@ -348,6 +375,36 @@
</tr>
<tr>
<td class="l noticeinfo">日支付限量</td>
<td class="r table_radio">
<input name="config[day_pay_limit]" type="text" value="{$wei_xin['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">月支付限量</td>
<td class="r table_radio">
<input name="config[month_pay_limit]" type="text" value="{$wei_xin['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">启用状态</td>
@ -453,6 +510,8 @@
</tr>
<tr>
<td class="l noticeinfo">启用状态</td>
@ -1363,7 +1422,33 @@
</td>
</tr>
<tr>
<td class="l noticeinfo">日支付限量</td>
<td class="r table_radio">
<input name="config[day_pay_limit]" type="text" value="{$sqpay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">月支付限量</td>
<td class="r table_radio">
<input name="config[month_pay_limit]" type="text" value="{$sqpay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
@ -1467,6 +1552,34 @@
</tr>
<tr>
<td class="l noticeinfo">日支付限量</td>
<td class="r table_radio">
<input name="config[day_pay_limit]" type="text" value="{$heepay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">月支付限量</td>
<td class="r table_radio">
<input name="config[month_pay_limit]" type="text" value="{$heepay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
<span class="notice-text">当额度达到限制额度时,隐藏支付方式</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">启用状态</td>

@ -1015,7 +1015,7 @@ class PromoteService {
if (!$record) {
return false;
}
if ($record['status'] != 1) {
if (!in_array($record['status'], [1, 2])) {
return false;
}
}

@ -132,6 +132,15 @@ class ApplyController extends BaseController
}
}
break;
case 0:
$applyService = new ApplyService();
$gameIdList = $applyService->getSociatyGameIds($loginPromote);
if (count($gameIdList) > 0) {
$gameIds = implode(',', $gameIdList);
$map['tab_game.id'] = ['in', $gameIds];
} else {
$map = '1 = 2';
}
}
$page = intval(I('get.p', 0));
@ -615,8 +624,13 @@ class ApplyController extends BaseController
$promoteId = $_REQUEST['promote_id'];
}
$applyService = new ApplyService();
$gameIdList = $applyService->getSociatyGameIds($loginPromote);
$applyMap['promote_id'] = $promoteId;
$applyMap['offline_status'] = 0;
$applyMap['game_id'] = ['in', $gameIdList];
$gameIds = M('Apply', 'tab_')->where($applyMap)->getField('game_id', true);
$gameIds = implode(',', $gameIds);
@ -1795,7 +1809,7 @@ class ApplyController extends BaseController
$promoteId = $promote['id'];
}
$apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
$game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
$game = M('game', 'tab_')->field(['id', 'icon', 'apply_auth'])->where(['id' => $gameId])->find();
if ($apply == null) {
$this->ajaxReturn([
'status' => 0,
@ -1805,6 +1819,16 @@ class ApplyController extends BaseController
]);
}
$applyService = new ApplyService();
if (!$applyService->checkSociatyPerm($promote, $game)) {
$this->ajaxReturn([
'status' => 0,
'message' => '该游戏未授权',
'data' => [
]
]);
}
$promoteService = new PromoteService();
if (!$promoteService->canPresidentApplyGame($promote)) {
$this->ajaxReturn([
@ -1817,7 +1841,6 @@ class ApplyController extends BaseController
$icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
$applyService = new ApplyService();
$result = $applyService->checkApplyStatus($apply);
if (!$result['status']) {
$this->ajaxReturn([
@ -1847,7 +1870,8 @@ class ApplyController extends BaseController
}
$apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
$game = M('game', 'tab_')->field(['icon'])->where(['id' => $gameId])->find();
$game = M('game', 'tab_')->field(['icon', 'apply_auth', 'id'])->where(['id' => $gameId])->find();
if ($apply == null) {
$this->ajaxReturn([
'status' => 1,
@ -1857,6 +1881,16 @@ class ApplyController extends BaseController
]);
}
$applyService = new ApplyService();
if (!$applyService->checkSociatyPerm($promote, $game)) {
$this->ajaxReturn([
'status' => 0,
'message' => '该游戏未授权',
'data' => [
]
]);
}
$promoteService = new PromoteService();
if (!$promoteService->canPresidentApplyGame($promote)) {
$this->ajaxReturn([
@ -1869,7 +1903,6 @@ class ApplyController extends BaseController
$icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
$applyService = new ApplyService();
$result = $applyService->checkApplyStatus($apply);
if (!$result['status']) {
$this->ajaxReturn([

Loading…
Cancel
Save