elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

市场结算管理bug修改

Browse Source
master
zhengyongxing 4 years ago
parent 8c237e19fe
commit 9a722d5b45
6 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File

7
Application/Admin/Controller/MarketPercentageController.class.php
Unescape Escape View File

@ -19,6 +19,7 @@ class MarketPercentageController extends ThinkController
$_REQUEST['promote_id']?($map['promote_id'] = $_REQUEST['promote_id']):'';
$_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
$_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
$_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id;
@ -515,13 +516,13 @@ class MarketPercentageController extends ThinkController
// $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
// $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
$_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):'';
($_REQUEST['status']||$_REQUEST['status']=='0')?($map['status'] = $_REQUEST['status']):'';
($_REQUEST['status']||$_REQUEST['status']=='0')?($map['tab_market_altogether.status'] = $_REQUEST['status']):'';
if($_REQUEST['status']||$_REQUEST['status']=='0') {
if( $_REQUEST['status'] == '1') {
$map['status'] = ['egt',1];
$map['tab_market_altogether.status'] = ['egt',1];
} else {
$map['status'] = $_REQUEST['status'];
$map['tab_market_altogether.status'] = $_REQUEST['status'];
}
}

2
Application/Admin/Controller/TimingController.class.php
Unescape Escape View File

@ -785,7 +785,7 @@ class TimingController extends AdminController {
CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,pay_way,market_admin_id")
->join("left join tab_promote on tab_spend.promote_id = tab_promote.id")
->join("left join tab_game game on game.id=tab_spend.game_id")
->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',1]])
->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',0]])
->where($spend_map)
->group("tab_spend.id")
->select(false);

10
Application/Admin/View/MarketPercentage/index.html
Unescape Escape View File

@ -43,7 +43,7 @@
<div class="tools">
<if condition="$caculate_check eq true">
<empty name="show_status">
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}"><span class="button_icon button_icon1"></span>重算</a>
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}" style="width: 60px;text-align: center;padding-right: 0;margin-right: 0;">重算</a>
</empty>
</if>
</div>
@ -77,6 +77,14 @@
</volist>
</select>
</div>
<div class="input-list input-list-parent search_label_rehab">
<select id="admin_id" name="admin_id" class="select_gallery" style="width:120px;">
<option value="">请选择人员</option>
<volist name=":getMarketAdmin()" id="vo">
<option value="{$vo.uid}" <if condition="$vo.uid eq $_GET['admin_id']">selected=selected</if>>{$vo.real_name}</option>
</volist>
</select>
</div>
<div class="input-list input-list-game search_label_rehab">
<select id="relation_game_id" name="relation_game_id" class="select_gallery" style="width:120px;">
<option value="" selected="">请选择游戏</option>

14
Application/Admin/View/MarketPercentage/marketstaffsettle.html
Unescape Escape View File

@ -44,7 +44,7 @@
<div class="tools">
<if condition="$caculate_check eq true">
<empty name="show_status">
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}"><span class="button_icon button_icon1"></span>重算</a>
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}" style="width: 60px;text-align: center;padding-right: 0;margin-right: 0;">重算</a>
</empty>
</if>
</div>
@ -138,8 +138,16 @@
</tr>
</volist>
<td colspan="3">合计</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>'1,2'))}" >{$sum['performance_revenue']|default="0.00"}</a></td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>3))}" >{$sum['appraisal_bonuses']|default='0.00'}</a></td>
<td>
<!-- <a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>'1,2'))}">-->
{$sum['performance_revenue']|default="0.00"}
<!-- </a>-->
</td>
<td>
<!-- <a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time,'develop_type'=>3))}" >-->
{$sum['appraisal_bonuses']|default='0.00'}
<!-- </a>-->
</td>
<td>{$sum['performance_commission']|default='0.00'}</td>
<td>{$sum['achievement_bonus']|default='0.00'}</td>
<td>{$sum['commission']|default='0.00'}</td>

2
Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
Unescape Escape View File

@ -41,7 +41,7 @@
<div class="fl button_list">
<div class="tools">
<if condition="$caculate_check eq true">
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}"><span class="button_icon button_icon1"></span>重算</a>
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}" style="width: 60px;text-align: center;padding-right: 0;margin-right: 0;">重算</a>
</if>
</div>
</div>

8
Application/Admin/View/MarketPercentage/showbonuslist.html
Unescape Escape View File

@ -42,7 +42,7 @@
<div class="fl button_list">
<div class="tools">
<empty name="show_status">
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}"><span class="button_icon button_icon1"></span>重算</a>
<a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}" style="width: 60px;text-align: center;padding-right: 0;margin-right: 0;">重算</a>
</empty>
</div>
</div>
@ -140,7 +140,11 @@
</tr>
</volist>
<td colspan="3">合计</td>
<td><a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['pay_amount']|default="0.00"}</a></td>
<td>
<!-- <a href="{:U('FinancePromote/index',array('time_start'=>$start_time,'time_end'=>$end_time))}" >-->
{$sum['pay_amount']|default="0.00"}
<!-- </a>-->
</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end']))}" >{$sum['commission']|default="0.00"}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'status'=>1))}" >{$sum['extend_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$_REQUEST['time_start'],'time_end'=>$_REQUEST['time_end'],'status'=>0))}" >{$sum['wait_commission']|default='0.00'}</a></td>

Write Preview
Loading…
Cancel
Save