diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index ee306b26..93f287b0 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -942,4 +942,22 @@ class Orders extends HD_Controller return $this->show_json(SYS_CODE_FAIL, '保存失败'); } } + //修改支付订单状态 + public function edit_status(){ + if($this->input->method()=='post'){ + $id = $this->input->post('id'); + $row = $this->receiver_orders_v2_model->get(['id'=>$id]); + if(!$row){ + return $this->show_json(SYS_CODE_FAIL, '订单不存在'); + } + $res = $this->receiver_orders_v2_model->update(['status'=>2],['id'=>$id]); + if($res){ + $this->app_liche_orders_model->update(['status'=>-1],['o_id'=>$row['id']]); + return $this->show_json(SYS_CODE_SUCCESS, '修改成功'); + }else{ + return $this->show_json(SYS_CODE_FAIL, '保存失败'); + } + } + return $this->show_view('receiver/orderv2/edit_status'); + } } diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php index a827a397..5efd2c1d 100644 --- a/admin/libraries/Ordersv2List.php +++ b/admin/libraries/Ordersv2List.php @@ -218,7 +218,7 @@ class Ordersv2List if ($params['status_pid'] == 4) { //交付需要开票后才显示 $where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null; } - if (strlen($params['status_pid']) && $params['status_pid']) { + if (strlen($params['status_pid']) && $params['status_pid'] && $params['status_pid']!=21) { $where["{$this->t1}.id>="] = Orders_v2_entity::V2_START_ID; } @@ -229,7 +229,6 @@ class Ordersv2List } else { $orderby = "{$this->t1}.c_time desc"; } -// print_r($params);exit; if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21) { $where["{$this->t2}.pid_status"] = $params['status_pid']; $up_key = $params['status'] + 1; diff --git a/admin/views/auto/cars/get.php b/admin/views/auto/cars/get.php index d64b0c05..8ebe4757 100644 --- a/admin/views/auto/cars/get.php +++ b/admin/views/auto/cars/get.php @@ -13,6 +13,7 @@ +
diff --git a/admin/views/auto/cars/lists.php b/admin/views/auto/cars/lists.php index 2604e7c5..6a5d108a 100644 --- a/admin/views/auto/cars/lists.php +++ b/admin/views/auto/cars/lists.php @@ -49,8 +49,9 @@ ID - 裸车报价 - 车辆底价 + 裸车报价 + 车辆底价 + 操作