From 0f004e5c6fa2472e9ef111886c2255ae5949ae73 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 1 Jun 2023 16:37:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E6=88=90=E8=B4=AD?=
 =?UTF-8?q?=E8=BD=A6=E5=8D=8F=E8=AE=AE=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controllers/wxapp/liche/Protocol.php       | 10 +++++-----
 common/libraries/receiver/Orders_v2_entity.php |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/controllers/wxapp/liche/Protocol.php b/api/controllers/wxapp/liche/Protocol.php
index 2158bc54..d6a10ef0 100755
--- a/api/controllers/wxapp/liche/Protocol.php
+++ b/api/controllers/wxapp/liche/Protocol.php
@@ -70,11 +70,11 @@ require_once  APPPATH.'controllers/wxapp/Wxapp.php';
     <div>经充分协商，双方约定:</div>
     <div>{$fill_info['sa']}</div>";
         }
-        $show_car_pro = true;
-        if($this->order_row['brand_id'] == 4) { //除宁德哪吒需要购车合同
-            $this->load->model("biz/biz_model");
-            $biz = $this->biz_model->get(['id'=>$this->$row['biz_id']],'city_id');
-            $show_car_pro = $biz['city_id'] == '350900' ? true : false;
+        $show_car_pro = false;
+        if($this->order_row['brand_id'] == 1) { //除了东风，其他品牌都不用生成 购车协议
+//            $this->load->model("biz/biz_model");
+//            $biz = $this->biz_model->get(['id'=>$this->$row['biz_id']],'city_id');
+            $show_car_pro = true;
         }
         if($show_car_pro) {
             //2022-12-23至2023-01-01使用 car_tpl_tmp.pdf内容
diff --git a/common/libraries/receiver/Orders_v2_entity.php b/common/libraries/receiver/Orders_v2_entity.php
index e92f357c..6a47deda 100644
--- a/common/libraries/receiver/Orders_v2_entity.php
+++ b/common/libraries/receiver/Orders_v2_entity.php
@@ -598,10 +598,11 @@ class Orders_v2_entity{
         if($this->ci->receiver_order_contracts_model->count(['o_id'=>$oid,'status'=>1])){
             return ['code'=>1,'msg'=>'操作成功'];
         }
-        $need_sign = true;
-        if($this->order_row['brand_id'] == 4){ //除宁德哪吒需要购车合同
-            $biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'city_id');
-            $need_sign = $biz['city_id'] == '350900' ? true : false;
+        $need_sign = false;
+        if($this->order_row['brand_id'] == 1){ //除了东风，其他品牌都不用生成 购车协议
+//            $biz = $this->ci->biz_model->get(['id'=>$this->order_row['biz_id']],'city_id');
+//            $need_sign = $biz['city_id'] == '350900' ? true : false;
+            $need_sign = true;
         }
         $fill_info = $this->pdf_data($this->order_row);
         $this->ci->load->library('pdftk');