From cf98a1e59f6c04316d6f9ff4e60ccb6986a48654 Mon Sep 17 00:00:00 2001 From: lccsw <805383944@qq.com> Date: Thu, 15 Sep 2022 15:48:50 +0800 Subject: [PATCH] edit-biz-brand_static --- admin/controllers/biz/Settle.php | 2 +- api/controllers/plan/Biz.php | 4 ++-- common/libraries/receiver/Settle_entity.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php index c2412e4b..49e8815a 100644 --- a/admin/controllers/biz/Settle.php +++ b/admin/controllers/biz/Settle.php @@ -149,7 +149,7 @@ class Settle extends HD_Controller 'srv_json' => $srv_loan, 'profix_fine' => $v['profix_fine'], 'sum_srv' => $sum_srv, - 'sum_srv_after' => sprintf("%.2f",$sum_srv/1.06), + 'sum_srv_after' => $params['_biz_type']==1 ? sprintf("%.2f",$sum_srv/1.13) : sprintf("%.2f",$sum_srv/1.06), 'price_trucking' => $v['price_trucking'], 'name' => $v['name'], 'mobile' => $v['mobile'], diff --git a/api/controllers/plan/Biz.php b/api/controllers/plan/Biz.php index 12b48387..28161fbf 100644 --- a/api/controllers/plan/Biz.php +++ b/api/controllers/plan/Biz.php @@ -477,9 +477,9 @@ class Biz extends HD_Controller $data = [ 'profix_car_after' => sprintf("%.2f",$val['profix_car']/1.13), ]; - $data['price_total'] = $val['price_all']+$data['profix_car_after']; + $data['price_total'] = sprintf("%.2f",$val['price_all']/1.13)+$data['profix_car_after']; $biz_info = $this->biz_info_model->get(['biz_id'=>$val['biz_id']]); - $price_need = $data['price_total'] + $money_json['biz_price']; + $price_need = $data['price_total'] - $money_json['biz_price']; $partner_rate = $biz_info['rate']/100; $liche_rate = (100-$biz_info['rate'])/100; $data['profix_liche'] = $price_need*$liche_rate; diff --git a/common/libraries/receiver/Settle_entity.php b/common/libraries/receiver/Settle_entity.php index 90f818b5..ecac4b98 100644 --- a/common/libraries/receiver/Settle_entity.php +++ b/common/libraries/receiver/Settle_entity.php @@ -68,10 +68,10 @@ class Settle_entity{ $data['profix_car'] = $sum_profix_car['profix_car']; $data['price_all'] = $sum_profix_insure['profix_insure']+$sum_profix_loan['profix_loan']+$sum_profix_carno['profix_carno']+$sum_profix_fine['profix_fine']; $data['profix_car_after'] = sprintf("%.2f",$data['profix_car']/1.13); - $data['price_total'] = $data['price_all']+$data['profix_car_after']; + $data['price_total'] = sprintf("%.2f",$data['price_all']/1.13)+$data['profix_car_after']; //计算分润 $biz_info = $this->ci->biz_info_model->get(['biz_id'=>$static_row['biz_id']]); - $price_need = $data['price_total'] + $biz_price - $all_other; + $price_need = $data['price_total'] - $biz_price - $all_other; $partner_rate = $biz_info['rate']/100; $liche_rate = (100-$biz_info['rate'])/100; $data['profix_liche'] = $price_need*$liche_rate-$liche_other;