Merge branch 'hotfix/market_percentage' of wmtx/platform into release

比例格式修正

Application/Admin/Controller/PartnerController.class.php

@@ -133,6 +133,7 @@ class PartnerController extends ThinkController
                     $val['name']="月流水＞".$val['begin_total_amount'];
                 }
             }
+            $val['ratio'] = floatval($val['ratio']);
             $parseGameRadiores[$val['game_id']][] = $val;
         }
         $myGameRadiores = $parseGameRadiores;//我方分成比例

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -1459,7 +1459,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;
     }
@@ -1467,11 +1467,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'){