From f38b9026b55ebda6acd3720d237a238a6579cbbd Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 30 Oct 2020 10:46:38 +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 --- .../Controller/CompanyStatementSetController.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 82ae9213f..2ef0335fb 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1305,6 +1305,7 @@ class CompanyStatementSetController extends Controller { unset($tmpp); $this->getPuPromoteSpend($pc,array_unique(array_keys($pc)),$begintime,$endtime); +// dump($pc);die(); $StatementDb = M("CompanyStatement","tab_"); $statement_begin_time = date("Y.m.d",$begintime); @@ -1368,7 +1369,8 @@ class CompanyStatementSetController extends Controller { $tratio =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); $tratio += $company_ratio; }elseif($type == 0){ - $tratio = $tmp_game_ratio['ratio']; + $tratio =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); +// $tratio = $tmp_game_ratio['ratio']; }else{ //补点 $tratio1 =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); @@ -1400,7 +1402,8 @@ class CompanyStatementSetController extends Controller { $tratio =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); $tratio += $company_ratio; }elseif($type == 0){ - $tratio = $tmp_game_ratio['ratio']; + $tratio =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']); +// $tratio = $tmp_game_ratio['ratio']; }else{ //补点 $tratio1 =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);