From 746322230894724b3ec44ef6283f67756d223000 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 30 Oct 2020 11:13:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E6=8E=A8=E5=B9=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementSetController.class.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index e4dd85e72..2811ede41 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -734,7 +734,14 @@ class CompanyStatementSetController extends Controller { $tratio =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); $tratio += $company_ratio; }elseif($type == 0){ - $tratio = $tmp_game_ratio['ratio']; +// $tratio = $tmp_game_ratio['ratio']; + $turnover_type = $this->getTurnoverType($t_game_id,$k,$begintime,$endtime); + + if ($turnover_type == 2) { + $tratio =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); + } else { + $tratio = $tmp_game_ratio['ratio']; + } }else{ //补点 $tratio1 =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); @@ -767,7 +774,14 @@ class CompanyStatementSetController extends Controller { $tratio =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); $tratio += $company_ratio; }elseif($type == 0){ - $tratio = $t_game_ratio['ratio']; +// $tratio = $t_game_ratio['ratio']; + $turnover_type = $this->getTurnoverType($t_game_id,$k,$begintime,$endtime); + + if ($turnover_type == 2) { + $tratio =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); + } else { + $tratio = $tmp_game_ratio['ratio']; + } }else{ //补点 $tratio1 =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);