From d8a5d1eb366a79a00fe0d761a4299ddc8e1c5154 Mon Sep 17 00:00:00 2001
From: qianhy <git110@qhy>
Date: Tue, 4 Apr 2023 16:51:15 +0800
Subject: [PATCH] cost adjust load_srv about use paypay=0

---
 api/controllers/plan/Order.php           | 12 ++++++++----
 common/models/items/Items_cost_model.php |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/controllers/plan/Order.php b/api/controllers/plan/Order.php
index ec90c5a3..ad359046 100644
--- a/api/controllers/plan/Order.php
+++ b/api/controllers/plan/Order.php
@@ -546,8 +546,9 @@ class Order extends CI_Controller{
                     echo "biz_id: {$item['biz_id']}"."<br>";
                     echo "status: {$item['status']}"."<br>";
                     echo "if_usedcar: {$if_usedcar}"."<br>";
-                    var_dump($if_usedcar);echo "<br>";
                     echo "if_num: {$item['if_num']}"."<br>";
+                    echo "payway: {$item['payway']}"."<br>";
+                    var_dump($item['payway']);echo"<br>";
                     echo "if_insure: {$item['if_insure']}"."<br>";
                     echo "srv_ids: {$item['srv_ids']}"."<br>";
                     echo "<br>"."=====srv_ids====="."<br>";
@@ -922,10 +923,12 @@ class Order extends CI_Controller{
                         echo "<br>";
                     }
                 }
-                if(($biz['type']==1  && $srv_if_finance || $biz_type_force) && $money_json['price_loan']>0){
+                # 23-04-04: 不用管有没有; 可以换后期补; 先确认有没有该项业务，其次再确认有没有值，要分开判断跟取数，不能混在一起
+                #if(($biz['type']==1  && $srv_if_finance || $biz_type_force) && $money_json['price_loan']>0){
+                if(($biz['type']==1  && $srv_if_finance || $biz_type_force) && $item['payway']==0){
                     $biz_type_force && $srv_loan = 0;
                     $biz_type_force && $srv_json['srv_if_finance'] = 1;
-                    $srv_json['loan_price'] =  $money_json['price_loan'];
+                    $srv_json['loan_price'] =  $money_json['price_loan'] ? $money_json['price_loan'] : 0;
                     $loan_row = $this->order_loans_model->get(['o_id'=>$item['id']]);
                     if ($debug){
                         echo "get 贷款信息: <br>";
@@ -942,6 +945,7 @@ class Order extends CI_Controller{
                         $srv_json['loan_product'] = $finance_row ? $finance_row['title'] : '';
                     }
                     $srv_json['loan_num'] = $finance_num = $loan_row['num'] ? $loan_row['num'] : 36;
+                    $srv_json['loan_num'] = $srv_json['loan_product'] ? $srv_json['loan_num'] : 0;
                     if ($debug){
                         if ($finance_id){
                             echo $this->sys_supplier_model->db->last_query()."<br>";
@@ -988,7 +992,7 @@ class Order extends CI_Controller{
                             }
                         }
                         $fd_jsondata = json_decode($fd_row['jsondata'],true);
-                        $loan_fd = $fd_jsondata['rebate'] ? $fd_jsondata['rebate']:0;
+                        $loan_fd = $fd_jsondata['rebate'] && $money_json['price_loan'] ? $fd_jsondata['rebate']:0;
                         $profix_loan = $money_json['price_loan']*$loan_fd/100;
                     }
 
diff --git a/common/models/items/Items_cost_model.php b/common/models/items/Items_cost_model.php
index 4784c56f..5b7fbf1e 100644
--- a/common/models/items/Items_cost_model.php
+++ b/common/models/items/Items_cost_model.php
@@ -81,7 +81,7 @@ class Items_cost_model extends HD_Model
                     $biz_force = $this->biz_model->get(['city_id'=>$biz['city_id'], 'type'=>1, 'status'=>1]);
                     if ($biz_force){
                         //【按揭收入合计】（按揭综合服务费+按揭解抵服务费+利息补贴收入+金融公司手续费收入+其他收入-其他支出）
-                        $loan_price = $srv_json['loan_srv_price']+$srv_json['loan_offset_price']+$srv_json['loan_subsidy_price']+$srv_json['commission_price']+$srv_json['loan_in_price']-$srv_json['loan_out_price'];
+                        $loan_price = $srv_json['loan_srv_price']+$srv_json['loan_srv']+$srv_json['loan_offset_price']+$srv_json['loan_subsidy_price']+$srv_json['commission_price']+$srv_json['loan_in_price']-$srv_json['loan_out_price'];
                         //【水平业务总毛利】（保险收入合计+挂牌收入合计+按揭收入合计+其他收入-其他支出）
                         $srv_price = $insurance_price+$fee_carno_price+$loan_price+$srv_json['other_in_price']-$srv_json['other_out_price'];
                     }