From 5db1f7ce2489f8bb2fca650f0565b2daf5289901 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 18:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AF=94=E4=BE=8B=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 8 ++++---- .../Controller/CompanyStatementSetController.class.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 4038d7417..2035dca2b 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1925,12 +1925,12 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ if($value['first_ratio'] == 0){ $value['first_ratio'] = 0; }else{ - $value['first_ratio'] = number_format($value['first_ratio'], 2); + $value['first_ratio'] = number_format($value['first_ratio']); } if($value['second_ratio'] == 0) { $value['second_ratio'] = 0; }else{ - $value['second_ratio'] = number_format($value['second_ratio'], 2); + $value['second_ratio'] = number_format($value['second_ratio']); } if($value['promote_ratio'] == 0) $value['promote_ratio'] = 0; if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; @@ -2041,12 +2041,12 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al if($value['increment_ratio'] == 0){ $value['increment_ratio'] = 0; }else{ - $value['increment_ratio'] = number_format($value['first_ratio'], 2); + $value['increment_ratio'] = number_format($value['first_ratio']); } if($value['ratio'] == 0) { $value['ratio'] = 0; }else{ - $value['ratio'] = number_format($value['ratio'], 2); + $value['ratio'] = number_format($value['ratio']); } if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 1bb986703..9eaafb685 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -327,11 +327,11 @@ class CompanyStatementSetController extends Controller { } } if($v['first_company_type'] == 1){ - $game['first_ratio']=$tratio; + $game['first_ratio']=$tratio-0; $game['second_ratio']=100-$tratio; }else{ $game['first_ratio']=100-$tratio; - $game['second_ratio']=$tratio; + $game['second_ratio']=$tratio-0; } $add_data['pay_amount'] += $va['pay_money']; @@ -634,7 +634,7 @@ class CompanyStatementSetController extends Controller { $tratio = $tratio1-$tratio2+$company_ratio; if($tratio <= 0){ continue;} } - + $tratio = $tratio-0; if($v['type'] == 2){ $game['increment_ratio']=$tratio; }else{