diff --git a/api/controllers/wxapp/liche/Order.php b/api/controllers/wxapp/liche/Order.php index f2c786bf..3d759b73 100644 --- a/api/controllers/wxapp/liche/Order.php +++ b/api/controllers/wxapp/liche/Order.php @@ -216,7 +216,7 @@ class Order extends Wxapp{ $agree = $this->receiver_order_contracts_model->count(['o_id'=>$val['o_id'],'status'=>1]) ? true : false; $contract_list = []; if($agree){ - $contracts = $this->receiver_order_contracts_model->select(['o_id'=>$val['o_id'],'status'=>1],'','','','id,type,file'); + $contracts = $this->receiver_order_contracts_model->select(['o_id'=>$val['o_id'],'status'=>1,'type <> 6' => null],'','','','id,type,file'); foreach ($contracts as $item) { $contract_list[] = [ 'title' => $contract_type_arr[$item['type']], diff --git a/api/controllers/wxapp/liche/User.php b/api/controllers/wxapp/liche/User.php index 2b4f5ba5..dc4d3479 100644 --- a/api/controllers/wxapp/liche/User.php +++ b/api/controllers/wxapp/liche/User.php @@ -380,7 +380,7 @@ class User extends Wxapp{ $mobile = $this->session['mobile']; $where = [ - "(mobile={$mobile} or owner_name={$mobile})" => null, + "(mobile={$mobile} or owner_mobile={$mobile})" => null, "status" => 1, ]; $count = $this->receiver_orders_v2_model->count($where); diff --git a/common/models/receiver/order/Receiver_order_contracts_model.php b/common/models/receiver/order/Receiver_order_contracts_model.php index 65510587..172caf35 100644 --- a/common/models/receiver/order/Receiver_order_contracts_model.php +++ b/common/models/receiver/order/Receiver_order_contracts_model.php @@ -12,7 +12,7 @@ class Receiver_order_contracts_model extends HD_Model { private $table_name = 'lc_receiver_order_contracts'; - private $type_arr = [ 0 => '整车合同',1 => '代理协议',2 => '车辆信息确定',3 => '交接信息', 4 => '合同补充协议', 5 => '委托服务补充协议']; + private $type_arr = [ 0 => '整车合同',1 => '代理协议',2 => '车辆信息确定',3 => '交接信息', 4 => '合同补充协议', 5 => '委托服务补充协议', 6 => '车辆信息确定']; private $type_arr_new = [ 0 => '购车协议',1 => '服务协议',3=>'车辆确认'];