From 1c08d1a221715acee39943b12b7efb00c3664c9b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 28 Aug 2020 20:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E4=BE=8B=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PartnerController.class.php | 1 + .../Admin/Controller/PromoteCompanyController.class.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index c08502c33..725d3c733 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -128,6 +128,7 @@ class PartnerController extends ThinkController $val['name']="月流水>".$val['begin_total_amount']; } } + $val['ratio'] = floatval($val['ratio']); $parseGameRadiores[$val['game_id']][] = $val; } $myGameRadiores = $parseGameRadiores;//我方分成比例 diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index fb6f58fd9..ab032fd72 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -1321,7 +1321,7 @@ class PromoteCompanyController extends ThinkController $val['name']="月流水>".$val['begin_total_amount']; } } - $parseGameRadiores[$val['game_id']][] =['name'=>$val['name'],"ratio"=>$val['ratio']]; + $parseGameRadiores[$val['game_id']][] =['name'=>$val['name'],"ratio"=>floatval($val['ratio'])]; } return $parseGameRadiores; } @@ -1329,11 +1329,11 @@ class PromoteCompanyController extends ThinkController protected function setPromoteRadio(&$v){ $turnover_ratio = json_decode($v['turnover_ratio'],true); $v['turnover_ratio'] = array( - array("ratio"=>$v['ratio']."%","name"=>"默认比例") + array("ratio"=>floatval($v['ratio'])."%","name"=>"默认比例") ); foreach($turnover_ratio as $ke=>$va){ - $t=array("ratio"=>$va["ratio"]."%"); + $t=array("ratio"=>floatval($va["ratio"])."%"); if(array_key_exists("instanceof",$va)){ //存在 if($va['instanceof']=='1'){