master
sunke 5 years ago
parent c6779497c2
commit c3caed08b3

@ -107,12 +107,12 @@ class PromoteService {
];
}
if ($type == 1 && $balanceCoinMode == 0) {
/* if ($type == 1 && $balanceCoinMode == 0) {
return [
'status' => false,
'msg'=>'请选择平台币管理方式'
];
}
} */
if (count($shiftIds) > 15) {
return [
@ -206,7 +206,7 @@ class PromoteService {
'chain' => ['exp', 'REPLACE(chain, "/' . $fromPromote['id'] . '/","/' . $toPromote['id'] . '/")'],
]);
$status = M('ShiftTask')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
// $status = M('ShiftTask')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);
if (!$status) {
$model->rollback();
return ['status' => false, 'msg' => '系统异常,修改迁移任务状态失败'];

@ -649,22 +649,13 @@ class PromoteCoinController extends BaseController
$map = ['chain' => ['like', $promote['chain'] . $promote['id'] . '/%']];
$promoteIds = D('Promote')->field('id')->where($map)->getField('id', true);
$promoteIds[] = $id;
$rows = D('UserPlay')->field(['id', 'user_id'])->where(['promote_id' => ['in', $promoteIds]])->select();
$map = [];
$userIds = array_column($rows, 'user_id');
if (count($userIds) > 0) {
$map = ['id' => ['in', array_column($rows, 'user_id')]];
} else {
$map = ['_string' => '1<>1'];
}
if ($account) {
$map['account'] = ['like', '%' . $account . '%'];
}
if ($mobile) {
$map['mobile_phone'] = ['like', '%' . $mobile . '%'];
}
$map['promote_id'] = ['in',$promoteIds];
$query = M('User', 'tab_')->field(['id', 'phone', 'account', 'real_name'])->where($map);
list($users, $pagination, $count) = $this->paginate($query);

@ -134,10 +134,6 @@
<div class="trunk-search clearfix">
<!-- <form action="{:U('PromoteCoin/coinRecord',array('game_id'=>I('get.game_id')))}" method="post" enctype="multipart/form-data"-->
<!-- class="marg_top20">-->
<div class="form-group normal_space fr">
<input type="submit" class="submit" id='submit' url="{:U('PromoteCoin/coinDetails',array('model'=>$model['name'],'game_id'=>I('get.game_id')),false)}"
value="查询">
</div>
<div class="form-group normal_space fr">
<label>充值时间:</label>
<div class="select-time">
@ -166,15 +162,11 @@
</volist>
</select>
</div>
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">
<input type="text" readonly id="end_time" class="txt" name="end_time" placeholder="" value="{:I('end_time')}">
<div class="form-group normal_space fr">
<input type="submit" class="submit" id='submit' url="{:U('PromoteCoin/coinDetails',array('model'=>$model['name'],'game_id'=>I('get.game_id')),false)}"
value="查询">
</div>
</div>
<div class="form-group normal_space">
<input type="submit" class="submit" id='submit' url="{:U('PromoteCoin/coinDetails',array('model'=>$model['name'],'game_id'=>I('get.game_id')),false)}"
value="查询">
</div>
<!-- </form>-->
</div>
<div class="trunk-list">

@ -115,7 +115,6 @@
</eq>-->
<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
<?php if($loginer['level'] != 4):?>
<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
<div class="navContent jsnavContent">
<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
@ -124,7 +123,6 @@
<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
<?php endif;?>
</div>
<?php endif;?>
<!--<div class="subNav jssubNav"><i class="prev_icon icon_zhandian"></i><span>联盟站点</span><i class="arrow_icon"></i></div>-->
<!--<div class="navContent jsnavContent">-->
<!--<a href="{:U('SiteApply/index')}" class="<if condition='CONTROLLER_NAME eq SiteApply and ACTION_NAME eq index '>active</if> ">站点申请</a>-->

Loading…
Cancel
Save