From 072a3c914157cd4cfb39b34cff788b893b01bec7 Mon Sep 17 00:00:00 2001 From: lccsw <1127794702@qq.com> Date: Wed, 17 Nov 2021 09:37:32 +0800 Subject: [PATCH] edit-admin-order_list --- admin/controllers/receiver/order/Bill.php | 1 + admin/controllers/receiver/order/Deal.php | 1 + admin/controllers/receiver/order/Sign.php | 1 + admin/views/receiver/order/lists.php | 4 ++-- common/models/receiver/order/Receiver_orders_model.php | 2 +- common/services/apporder/Payment_service.php | 5 +++++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/admin/controllers/receiver/order/Bill.php b/admin/controllers/receiver/order/Bill.php index 3a5aeb79..16217aaf 100644 --- a/admin/controllers/receiver/order/Bill.php +++ b/admin/controllers/receiver/order/Bill.php @@ -25,6 +25,7 @@ class Bill extends HD_Controller $params = $this->input->get(); !strlen($params['status']) && $params['status'] = 1; $result = $this->orderslist->lists($this->status_pid, $params); + $params['status']==2 && $result['params']['show_bill_time'] = true; $this->data = $result; return $this->show_view($result['view'], true); } diff --git a/admin/controllers/receiver/order/Deal.php b/admin/controllers/receiver/order/Deal.php index c655c4a7..50b40dbe 100644 --- a/admin/controllers/receiver/order/Deal.php +++ b/admin/controllers/receiver/order/Deal.php @@ -26,6 +26,7 @@ class Deal extends HD_Controller { $params = $this->input->get(); $result = $this->orderslist->lists($this->status_pid, $params); + $result['params']['show_bill_time'] = true; $this->data = $result; return $this->show_view($result['view'], true); } diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php index ae94e649..a206e911 100644 --- a/admin/controllers/receiver/order/Sign.php +++ b/admin/controllers/receiver/order/Sign.php @@ -25,6 +25,7 @@ class Sign extends HD_Controller { $params = $this->input->get(); $result = $this->orderslist->lists($this->status_pid, $params); + $result['params']['sign'] = 1; $this->data = $result; return $this->show_view($result['view'], true); } diff --git a/admin/views/receiver/order/lists.php b/admin/views/receiver/order/lists.php index b2d1064c..a1b97094 100644 --- a/admin/views/receiver/order/lists.php +++ b/admin/views/receiver/order/lists.php @@ -229,7 +229,7 @@ - +
@@ -240,7 +240,7 @@
- +
diff --git a/common/models/receiver/order/Receiver_orders_model.php b/common/models/receiver/order/Receiver_orders_model.php index 7b377a39..0776aafa 100644 --- a/common/models/receiver/order/Receiver_orders_model.php +++ b/common/models/receiver/order/Receiver_orders_model.php @@ -35,7 +35,7 @@ class Receiver_orders_model extends HD_Model $status_ary[2] = array('name' => '车辆分配', 'show' => true, 'list' => array(0 => '车辆分配中', 1 => '用户未签名', 2 => '尾款未支付', 3 => '已确定'), 'menu_list' => array(0 => '车辆分配中', 1 => '用户未签名', 2 => '尾款未支付'), 'menu_default' => 0); $status_ary[3] = array('name' => '开票相关', 'show' => true, 'list' => array(0=> '待申请', 1 => '待开票', 2 => '已开票'), - 'menu_list' => array(1 => '待开票' ,0=>'待申请'), 'menu_default' => 0); + 'menu_list' => array(1 => '待开票' ,0 => '待申请', 2 => '已开票'), 'menu_default' => 0); $status_ary[4] = array('name' => '代办服务', 'show' => true, 'list' => array(0 => '代办中', 1 => '已完成代办'), 'menu_list' => array(0 => '代办中'), 'menu_default' => 0); $status_ary[5] = array('name' => '交付车辆', 'show' => true, 'list' => array(0 => '待销售确认', 1 => '销售已确认', 2 => '用户已签约'), diff --git a/common/services/apporder/Payment_service.php b/common/services/apporder/Payment_service.php index acddbb81..385f6d51 100644 --- a/common/services/apporder/Payment_service.php +++ b/common/services/apporder/Payment_service.php @@ -214,6 +214,11 @@ class Payment_service extends HD_Service{ $pay_price && $upd['pay_price'] = $pay_price; $res = $this->app_liche_orders_model->update($upd,array('id'=>$order['id'])); if($res) { + //更新订单状态 + $row = $this->orders_model->get(['id' => $order['o_id']]); + if($order['total_price']==$row['deposit']){ //意向金等于定金 更新订单下定时间 + $this->orders_model->update(['order_time' => date('Y-m-d H:i:s')], ['id' => $row['id']]); + } return array('code'=>1,'msg'=>'操作成功'); }else{ return array('code'=>0,'msg'=>'更新失败');