From 18b4c037a5b9c2501a329229ac9cc07126c8647e Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Wed, 13 Apr 2022 16:07:09 +0800
Subject: [PATCH] edit-api-order_list

---
 admin/controllers/receiver/orderv2/Orders.php    | 1 +
 api/controllers/wxapp/licheb/CusorderV2.php      | 6 +++++-
 common/libraries/receiver/Order_datas_entity.php | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index e9c34a9c..668db7c1 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -601,6 +601,7 @@ class Orders extends HD_Controller
             $where = [
                 'o_id' => $params['id'],
                 'status' => 1,
+                "id not in (select id from lc_app_liche_orders where type=3 and o_id={$params['id']} and pay_price=0)" => null
             ];
             $count = $this->app_liche_orders_model->count($where);
             if ($count) {
diff --git a/api/controllers/wxapp/licheb/CusorderV2.php b/api/controllers/wxapp/licheb/CusorderV2.php
index f1a15859..fc410156 100644
--- a/api/controllers/wxapp/licheb/CusorderV2.php
+++ b/api/controllers/wxapp/licheb/CusorderV2.php
@@ -677,7 +677,11 @@ class CusorderV2 extends Wxapp{
                             }
                             $other_data['车辆分配'] = ['type'=> 'text','value'=>$this->orders_status_entity->status_cn($val['id'],2),'bg_color'=>''];
                             $other_data['发票'] = ['type'=> 'text','value'=>$this->orders_status_entity->status_cn($val['id'],3),'bg_color'=>''];
-                            $other_data['身份证'] = ['type'=> 'text','value'=>$img_status['cardida']['text'],'bg_color'=>$img_status['cardida']['color']];
+                            if($val['main_type']){//公司
+                                $other_data['营业执照'] = ['type'=> 'text','value'=>$img_status['business_licence']['text'],'bg_color'=>$img_status['business_licence']['color']];
+                            }else{
+                                $other_data['身份证'] = ['type'=> 'text','value'=>$img_status['cardida']['text'],'bg_color'=>$img_status['cardida']['color']];
+                            }
                             $other_data['登记证'] = ['type'=> 'text','value'=>$img_status['register_img']['text'],'bg_color'=>$img_status['register_img']['color']];
                             $other_data['行驶证'] = ['type'=> 'text','value'=>$img_status['car_img']['text'],'bg_color'=>$img_status['car_img']['color']];
                             $other_data['保单'] = ['type'=> 'text','value'=>$img_status['ins_img']['text'],'bg_color'=>$img_status['ins_img']['color']];
diff --git a/common/libraries/receiver/Order_datas_entity.php b/common/libraries/receiver/Order_datas_entity.php
index 4242158c..d0006b65 100644
--- a/common/libraries/receiver/Order_datas_entity.php
+++ b/common/libraries/receiver/Order_datas_entity.php
@@ -23,6 +23,7 @@ class Order_datas_entity{
     public function data_status($o_data){
         $result = [
             'cardida' => ['text'=>'未传','type'=>1,'color'=>self::COLOR_UN_UPLOAD],       //身份证
+            'business_licence' => ['text'=>'未传','type'=>1,'color'=>self::COLOR_UN_UPLOAD],       //营业执照
             'register_img' => ['text'=>'未传','type'=>2,'color'=>self::COLOR_UN_UPLOAD],  //登记证
             'car_img' => ['text'=>'未传','type'=>3,'color'=>self::COLOR_UN_UPLOAD],    //行驶证
             'ins_img' => ['text'=>'未传','type'=>4,'color'=>self::COLOR_UN_UPLOAD],    //保单证