diff --git a/admin/controllers/autohome/Customer.php b/admin/controllers/autohome/Customer.php index 99700fdf..9a42303b 100644 --- a/admin/controllers/autohome/Customer.php +++ b/admin/controllers/autohome/Customer.php @@ -104,7 +104,7 @@ class Customer extends HD_Controller $count = $this->autohome_customer_model->count($where); $lists = []; if ($count) { - $rows = $this->autohome_customer_model->select($where, '', $page, $size); + $rows = $this->autohome_customer_model->select($where, 'id desc', $page, $size); $city_id_arr = array_filter(array_unique(array_column($rows, 'city_id'))); if ($city_id_arr) { $str_ids = implode(',', $city_id_arr); @@ -393,7 +393,7 @@ class Customer extends HD_Controller 'keyCarAudiId' => $v['series_id'] ? $v['series_id'] : null, 'keyCarTypeId' => null, 'keyCardCityId' => $v['city_id'] ? $v['city_id'] : '110100', - 'keyNewCarRentSupplierId' => 3 + 'keyNewCarRentSupplierId' => 10 ); $res = $this->mycurl->httpPost($url, $push_data, 'is_json'); diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php index 0af28b1b..85dc0592 100644 --- a/admin/libraries/OrdersList.php +++ b/admin/libraries/OrdersList.php @@ -14,6 +14,7 @@ class OrdersList { $this->ci = &get_instance(); $this->ci->load->model('receiver/order/receiver_orders_model', 'mdOrders'); + $this->ci->load->model('receiver/order/receiver_order_data_model', 'mdOrderData'); $this->ci->load->model('receiver/order/receiver_order_datas_model'); $this->ci->load->model('app/licheb/app_licheb_users_model', 'mdLichebUsers'); $this->ci->load->model('app/licheb/app_licheb_channel_biz_model'); @@ -110,6 +111,24 @@ class OrdersList $where["bill_time <="] = $bill_time[1] . ' 23:59:59'; } } + + //是否有合同 + $order_time[0] && $where_od['u_time >='] > $order_time[0] . ' 00:00:00'; + if ($params['iscontract'] == 1) { + $where_od['contract_img <>'] = ''; + } + if ($params['iscontract'] == 2) { + $where_od['contract_img'] = ''; + } + + if(count($where_od) > 1){ + $rows_od = $this->ci->mdOrderData->select($where_od, '', 0, 0, 'o_id'); + if ($rows_od) { + $str_ids = implode(',', array_column($rows_od, 'o_id')); + $where["id in({$str_ids})"] = null; + } + } + //是否开票 if ($params['isbill'] == 1) { $where["bill_time <>"] = '0000-00-00 00:00:00'; diff --git a/admin/views/receiver/order/lists.php b/admin/views/receiver/order/lists.php index 4f3a56ef..377a7604 100644 --- a/admin/views/receiver/order/lists.php +++ b/admin/views/receiver/order/lists.php @@ -86,6 +86,16 @@ +
+ +
+ +
+