From 9d9eae85ecca3e7e52c5694ab3adeaa000375cbe Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 4 Aug 2020 16:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 5 ++--- .../Admin/Controller/CompanyStatementSetController.class.php | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 087110f61..da39793d0 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2121,10 +2121,10 @@ function getPromoteCompanyList() { //获取游戏cp分成比例 $type=false时返回最低分成比例 function getGameCpRadio($game_id,$amount,$type) { if (!$type) { - $data = M('cp_game_ratio','tab_')->where(['game_id'=>$game_id])->order('begin_total_amount asc')->find(); + $data = M('cp_game_ratio','tab_')->where(['game_id'=>$game_id,'is_del'=>0])->order('begin_total_amount asc')->find(); } else { //取两条 - $ladderData = M('cp_game_ratio','tab_')->where(['game_id'=>$game_id,'begin_total_amount'=>['elt',$amount]])->limit(0,2)->order('begin_total_amount desc')->select(); + $ladderData = M('cp_game_ratio','tab_')->where(['game_id'=>$game_id,'begin_total_amount'=>['elt',$amount],'is_del'=>0])->limit(0,2)->order('begin_total_amount desc')->select(); // dump($ladderData);die(); @@ -2141,7 +2141,6 @@ function getGameCpRadio($game_id,$amount,$type) { } } - return $data['ratio']?$data['ratio']:0; } diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index a3720268f..59b9f567f 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -323,7 +323,6 @@ class CompanyStatementSetController extends Controller { if($tratio <= 0){continue;} } } - if($v['first_company_type'] == 1){ $game['first_ratio']=$tratio; $game['second_ratio']=100-$tratio;