diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php index 14f373059..943e02f3f 100644 --- a/Application/Admin/Controller/StatementWarningSetController.class.php +++ b/Application/Admin/Controller/StatementWarningSetController.class.php @@ -104,7 +104,7 @@ class StatementWarningSetController extends Controller { $this->setCompanyIsWm(); $this->getAllWmAmount(); - $this->cpStatement(); + // $this->cpStatement(); $this->pcStatement(); $this->puStatement(); @@ -317,7 +317,7 @@ class StatementWarningSetController extends Controller { 'company_belong'=>0 ])->getField("id company_id,company_name,develop_type",true); - $company = $this->getPromoteCompanyGameSpend($company); + $company = $this->getPromoteCompanyGameSpend($company,0); $pcStatementAmount = $this->addStatementWarningInfo($company,0); $savedata = [ 'type'=>2, @@ -334,7 +334,7 @@ class StatementWarningSetController extends Controller { $this->statementWarningModel->add($savedata); } } - private function getPromoteCompanyGameSpend($company) + private function getPromoteCompanyGameSpend($company,$companyBelong) { $where = [ 'tab_spend.is_check'=>1, @@ -356,7 +356,7 @@ class StatementWarningSetController extends Controller { foreach ($items as $key => $val) { $relationGameId = $games[$val['relation_game_name']]; - $radio = end($CompanyGameRatio->getGameRadio($val['company_id'],$relationGameId,0,$this->beginThismonth,$this->endThismonth)); + $radio = end($CompanyGameRatio->getGameRadio($val['company_id'],$relationGameId,$companyBelong,$this->beginThismonth,$this->endThismonth)); $radio = $CompanyGameRatio->getTurnoverRatio($val['amount'],$radio['ratio'],$radio['turnover_ratio']); $statementMoney =round($val['amount']*$radio/100,2); if(isset($company[$val['company_id']]['statement_money'])){ @@ -379,7 +379,7 @@ class StatementWarningSetController extends Controller { $puStatementAmount = 0; if($company) { - $company = $this->getPuSpecialStatement( $this->getPromoteCompanyGameSpend($company) ); + $company = $this->getPuSpecialStatement( $this->getPromoteCompanyGameSpend($company,1) ); foreach ($company as $key => $value) { if(!array_key_exists('statement_money',$value) ) { unset($company[$key]);