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

Merge pull request 'hotfix/admin_department_search' (#514) from hotfix/admin_department_search into master

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/514
master
廖金灵 4 years ago
parent 5cf324d8c4 e4ebf3218e
commit 5f6c10bcc1
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File

19
Application/Admin/Controller/CompanyStatementController.class.php
Unescape Escape View File

@ -1199,6 +1199,7 @@ class CompanyStatementController extends ThinkController
$count = [];
$week_line = 2;
$withdraw_type = false;
//获取对接人
foreach($infolist as $k=>&$v){
$infolist[$k]['reward'] = 0;
@ -1239,6 +1240,9 @@ class CompanyStatementController extends ThinkController
$row += count($va['game_list']);
foreach($va['game_list'] as $key=>&$val){
if(!$withdraw_type){
$withdraw_type = $v['withdraw_type'];
}
$line ++;
if($v['withdraw_type'] != 3) {
if(isset($val['ratio'])){
@ -1250,12 +1254,12 @@ class CompanyStatementController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
$val['sum_money'] = "=ROUND((K{$line}-L{$line})*(M{$line}+N{$line}),2)";
$val['sum_money'] = "=ROUND((L{$line}-M{$line})*(N{$line}+O{$line}),2)";
} else {
$val['sum_money'] = "=ROUND((K{$line}-L{$line})*(N{$line}),2)";
$val['sum_money'] = "=ROUND((L{$line}-M{$line})*(O{$line}),2)";
}
// $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
$v['statement_money'] .= "S{$line}+";
$v['statement_money'] .= "T{$line}+";
}else{
$count['platform_amount'] += $val['pay_amount'];
$count['sum_money'] += $val['sum_money'];
@ -1274,14 +1278,17 @@ class CompanyStatementController extends ThinkController
}
if($is_export){
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(T2:T".$line."),2)";
$count["platform_amount"] = "=ROUND(SUM(L2:L".$line."),2)";
$count["week_money"] = "=ROUND(SUM(T2:T".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(U2:U".$line."),2)";
}
$this->assign("data",$infolist);
$this->assign("count",$count);
$this->assign("is_export",$is_export);
$this->assign("withdraw_type",$withdraw_type);
// dd($infolist);
$this->display("CompanyStatementPool/viewPuPool");
}

36
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -818,14 +818,14 @@ class CompanyStatementPoolController extends ThinkController
}
}
if($is_export){
if($v['withdraw_type'] != 3) {
$val['sum_money'] = "=ROUND((K{$line}-L{$line})*(M{$line}+N{$line}),2)";
$val['sum_money'] = "=ROUND((L{$line}-M{$line})*(N{$line}+O{$line}),2)";
$v['statement_money'] .= "T{$line}+";
} else {
$val['sum_money'] = "=ROUND((K{$line}-L{$line})*(N{$line}),2)";
$val['sum_money'] = "=ROUND((L{$line}-M{$line})*(O{$line}),2)";
$v['statement_money'] .= "T{$line}+";
}
$v['statement_money'] .= "S{$line}+";
}else{
$count['platform_amount'] += $val['pay_amount'];
}
@ -867,16 +867,16 @@ class CompanyStatementPoolController extends ThinkController
$count["pool_week_count"] = $this->setWeekCount($line,true);
$count["pool_lack_count"] = $this->setlackCount($line,true);
//本周暂不结算合计
$count["st_lack_count"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"否"),2)';
$count["st_lack_count"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"否"),2)';
//本次应支付
$count["st_count"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是"),2)';
$count["st_count"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是"),2)';
$count["online_pay"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"是"),2)';
$count["offline_pay"] = '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"否"),2)';
$count["online_pay"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是",Y2:Y'.$line.',"是"),2)';
$count["offline_pay"] = '=ROUND(SUMIFS(U2:U'.$line.',Z2:Z'.$line.',"是",Y2:Y'.$line.',"否"),2)';
}
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(T2:T".$line."),2)";
$count["platform_amount"] = "=ROUND(SUM(L2:L".$line."),2)";
$count["week_money"] = "=ROUND(SUM(T2:T".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(U2:U".$line."),2)";
}
// die();
$this->assign("data",$infolist);
@ -895,16 +895,16 @@ class CompanyStatementPoolController extends ThinkController
$pool_week_line = 0;
}
if($pool_week_str == "="){
$pool_week_str .= "SUM(K{$line}:";
$pool_week_str .= "SUM(L{$line}:";
}else{
if($line - $pool_week_line > 1){
//不连续
$pool_week_str .= "K{$pool_week_line})+SUM(K{$line}:";
$pool_week_str .= "L{$pool_week_line})+SUM(L{$line}:";
}
}
$pool_week_line = $line;
if($return){
$data = $pool_week_str."K{$line})";
$data = $pool_week_str."L{$line})";
unset($pool_week_str,$pool_week_line);
return $data;
}
@ -918,16 +918,16 @@ class CompanyStatementPoolController extends ThinkController
$pool_lack_line = 0;
}
if($pool_lack_str == "="){
$pool_lack_str .= "SUM(K{$line}:";
$pool_lack_str .= "SUM(L{$line}:";
}else{
if($line - $pool_lack_line > 1){
//不连续
$pool_lack_str .= "K{$pool_lack_line})+SUM(K{$line}:";
$pool_lack_str .= "L{$pool_lack_line})+SUM(L{$line}:";
}
}
$pool_lack_line = $line;
if($return){
$data = $pool_lack_str."K{$line})";
$data = $pool_lack_str."L{$line})";
unset($pool_lack_str,$pool_lack_line);
return $data;
}
@ -1054,7 +1054,7 @@ class CompanyStatementPoolController extends ThinkController
$week_line += count($hv['game_list'])-1;
}
$handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line})+SUM(P{$old_line}:P{$week_line})-SUM(Q{$old_line}:Q{$week_line})-SUM(R{$old_line}:R{$week_line}),2)";
$handle_data[$hk]['week_amount'] = "=ROUND(SUM(P{$old_line}:P{$week_line})+SUM(Q{$old_line}:Q{$week_line})-SUM(R{$old_line}:R{$week_line})-SUM(S{$old_line}:S{$week_line}),2)";
if ($hk > 0) {
$handle_data[0]['week_amount'] = str_replace($old_line,$week_line,$handle_data[0]['week_amount']);

2
Application/Admin/View/CompanyStatement/viewPuComplementStatement.html
Unescape Escape View File

@ -178,7 +178,7 @@
</tr>
</foreach>
<tr>
<td colspan="4">合计</td>
<td colspan="5">合计</td>
<td></td>
<td>{$data.statement_count.pay_amount}</td>
<td></td>

2
Application/Admin/View/CompanyStatementPool/editPuPool.html
Unescape Escape View File

@ -421,7 +421,7 @@
</notempty>
</foreach>
<tr>
<td colspan=10 >合计:</td>
<td colspan=11 >合计:</td>
<td >{$count.platform_amount}</td>
<td></td>
<td></td>

2
Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html
Unescape Escape View File

@ -335,7 +335,7 @@
</notempty>
</foreach>
<tr>
<td colspan=10 >合计:</td>
<td colspan=11 >合计:</td>
<td >{$count.platform_amount}</td>
<td></td>
<td></td>

4
Application/Admin/View/CompanyStatementPool/viewPuPool.html
Unescape Escape View File

@ -318,7 +318,7 @@
</foreach>
<if condition="$withdraw_type LT 2">
<tr>
<td colspan="9" rowspan="3"></td>
<td colspan="10" rowspan="3"></td>
<td>上周数据合计:</td>
<td>{$count.pool_week_count}</td>
<td colspan="5" rowspan="3"></td>
@ -360,7 +360,7 @@
<else />
<tr>
<td colspan=10 >合计:</td>
<td colspan=11 >合计:</td>
<td>{$count.platform_amount}</td>
<td></td>
<td></td>

Write Preview
Loading…
Cancel
Save