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

11月功能提交

Browse Source
master
zhengyongxing 4 years ago
parent d6b1916a5d
commit 4eff2f0aaa
8 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
Application/Admin/Controller/CompanyGameRatioController.class.php
Unescape Escape View File

@ -137,6 +137,10 @@ class CompanyGameRatioController extends AdminController
$v["turnover_types"][$tk] = "月流水";
} elseif($turnover_type[$tk] == 2) {
$v["turnover_types"][$tk] = "历史流水";
} elseif($turnover_type[$tk] == 3) {
$v["turnover_types"][$tk] = "cp月流水";
} elseif($turnover_type[$tk] == 4) {
$v["turnover_types"][$tk] = "cp历史流水";
}
}
@ -281,6 +285,10 @@ class CompanyGameRatioController extends AdminController
$v["turnover_types"] = "月流水";
} elseif($v["turnover_type"] == 2) {
$v["turnover_types"] = "历史流水";
} elseif($v["turnover_type"] == 3) {
$v["turnover_types"] = "cp月流水";
} elseif($v["turnover_type"] == 4) {
$v["turnover_types"] = "cp历史流水";
}

10
Application/Admin/Controller/CompanyStatementSetController.class.php
Unescape Escape View File

@ -765,7 +765,9 @@ class CompanyStatementSetController extends Controller {
$game['sum_money']=round($game['pay_amount']*$tratio*(100-$fax_ratio)/(100*100),2);//结算金额=平台总额*（分成比例+补点比例）*(1-税费费率)
$add_data['statement_money'] += $game['sum_money'];
if ($game['pay_amount'] != '0') {
$add_data['statement_info'][] = $game;
}
}else{
// dd($t_game_ratio);
for ($i=0; $i < count($t_game_ratio); $i++) {
@ -808,10 +810,12 @@ class CompanyStatementSetController extends Controller {
}
$temp_game['sum_money']=round($temp_game['pay_amount']*$tratio*(100-$fax_ratio)/(100*100),2);//结算金额=平台总额*（分成比例+补点比例）*(1-税费费率)
$add_data['statement_money'] += $temp_game['sum_money'];
if ($temp_game['pay_amount'] != '0') {
$add_data['statement_info'][] = $temp_game;
}
}
}
}
$add_data['platform_amount'] = $add_data['pay_amount'];
if($type < 2){
//非补点计算奖罚
@ -874,7 +878,7 @@ class CompanyStatementSetController extends Controller {
$is_continue = false;
$statement_data = $add_data['statement_info'];
foreach ($statement_data as $skey => $sval) {
if ($sval['game_list']) {
if ($sval) {
$is_continue = true;
}
}
@ -1054,8 +1058,9 @@ class CompanyStatementSetController extends Controller {
* 返回结算流水类型
*/
public function getTurnoverType($relation_game_id = 0, $company_id = 0, $begin_time = 0, $end_time = 0){
$company_belong = M("promote_company","tab_")->field("company_belong")->where(['id'=>$company_id])->find();
$turnover_where = [
"company_belong"=>$company_belong['company_belong'],
"relation_game_id"=>$relation_game_id,
"company_id"=>$company_id,
"_string"=>"begin_time <={$end_time} AND ( end_time = 0 OR end_time >= {$begin_time})"
@ -1064,7 +1069,6 @@ class CompanyStatementSetController extends Controller {
//判断特殊比例是否存在，存在直接返回结算流水类型
if (!$turnover_type) {
$company_belong = M("promote_company","tab_")->field("company_belong")->where(['id'=>$company_id])->find();
//判断公司内外团类型是否存在，不存在直接返回0
if (!$company_belong) {
return 0;

4
Application/Admin/Controller/GameRatioMouldController.class.php
Unescape Escape View File

@ -66,6 +66,10 @@ class GameRatioMouldController extends AdminController
$v["turnover_types"][$tk] = "月流水";
} elseif($turnover_type[$tk] == 2) {
$v["turnover_types"][$tk] = "历史流水";
} elseif($turnover_type[$tk] == 3) {
$v["turnover_types"][$tk] = "cp月流水";
} elseif($turnover_type[$tk] == 4) {
$v["turnover_types"][$tk] = "cp历史流水";
}

2
Application/Admin/View/CompanyGameRatio/addRatio.html
Unescape Escape View File

@ -154,6 +154,8 @@
<select id="turnover_type" name="turnover_type" class="select_gallery">
<option value="1">月流水</option>
<option value="2">历史流水</option>
<option value="3">cp月流水</option>
<option value="4">cp历史流水</option>
</select>
</td>
</tr>

2
Application/Admin/View/CompanyGameRatio/edit.html
Unescape Escape View File

@ -138,6 +138,8 @@
<select id="turnover_type" name="turnover_type" class="select_gallery">
<option value="1" <if condition="$data['turnover_type'] eq 1">selected</if>>月流水</option>
<option value="2" <if condition="$data['turnover_type'] eq 2">selected</if>>历史流水</option>
<option value="3" <if condition="$data['turnover_type'] eq 3">selected</if>>cp月流水</option>
<option value="4" <if condition="$data['turnover_type'] eq 4">selected</if>>cp历史流水</option>
</select>
</td>
</tr>

2
Application/Admin/View/CompanyGameRatio/editRatio.html
Unescape Escape View File

@ -134,6 +134,8 @@
<select id="turnover_type" name="turnover_type" class="select_gallery">
<option value="1" <if condition="$data['turnover_type'] eq 1">selected</if>>月流水</option>
<option value="2" <if condition="$data['turnover_type'] eq 2">selected</if>>历史流水</option>
<option value="3" <if condition="$data['turnover_type'] eq 3">selected</if>>cp月流水</option>
<option value="4" <if condition="$data['turnover_type'] eq 4">selected</if>>cp历史流水</option>
</select>
</td>
</tr>

2
Application/Admin/View/GameRatioMould/add.html
Unescape Escape View File

@ -150,6 +150,8 @@
<select id="turnover_type" name="turnover_type" class="select_gallery">
<option value="1">月流水</option>
<option value="2">历史流水</option>
<option value="3">cp月流水</option>
<option value="4">cp历史流水</option>
</select>
</td>
</tr>

2
Application/Admin/View/GameRatioMould/edit.html
Unescape Escape View File

@ -134,6 +134,8 @@
<select id="turnover_type" name="turnover_type" class="select_gallery">
<option value="1" <if condition="$data['turnover_type'] eq 1">selected</if>>月流水</option>
<option value="2" <if condition="$data['turnover_type'] eq 2">selected</if>>历史流水</option>
<option value="3" <if condition="$data['turnover_type'] eq 3">selected</if>>cp月流水</option>
<option value="4" <if condition="$data['turnover_type'] eq 4">selected</if>>cp历史流水</option>
</select>
</td>
</tr>

Write Preview
Loading…
Cancel
Save