diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index d153022c..8e70263b 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -1306,6 +1306,7 @@ class Orders extends HD_Controller 'show_img' => 0, 'descrip' => $item['descrip'], 'img' => $item['img'] ? build_qiniu_image_url($item['img']) : '', + 'admin_id' => $item['admin_id'], ]; } } @@ -1360,7 +1361,9 @@ class Orders extends HD_Controller public function add_paylog() { $id = $this->input->get_post('id'); + $log_id = $this->input->get_post('log_id'); $row = $this->receiver_orders_v2_model->get(['id' => $id]); + $order_row = $this->app_liche_orders_model->get(['id'=>$log_id,'o_id'=>$row['id']]); $srv_price = $this->orders_v2_entity->order_srv_money($row['id']); $need_price = $this->orders_v2_entity->recevable_price($row['id']); $car_price = $need_price-$srv_price; @@ -1375,6 +1378,9 @@ class Orders extends HD_Controller if (!$money || !$row || !$wx_mchid) { return $this->show_json(SYS_CODE_FAIL, '参数错误'); } + if($order_row["id"]){ //修改订单更新旧订单为无效订单 + $this->app_liche_orders_model->update(['status'=>-1],['id'=>$order_row['id']]); + } $p_row = $this->app_liche_orders_model->get(['pid'=>0,'o_id'=>$row['id']]); $last_p_row = $this->app_liche_orders_model->get(['o_id'=>$row['id'],'type'=>3,'pid'=>$p_row['id'],'status>='=>0]); //尾款父订单 @@ -1469,6 +1475,7 @@ class Orders extends HD_Controller $this->data['type'] = $type; $this->data['companys'] = $companys; $this->data['id'] = $this->input->get('id'); + $this->data['order_row'] = $order_row; return $this->show_view('receiver/orderv2/get/add_paylog'); } //取消配车 diff --git a/admin/views/receiver/orderv2/get/add_paylog.php b/admin/views/receiver/orderv2/get/add_paylog.php index 8bb0e329..473a7890 100644 --- a/admin/views/receiver/orderv2/get/add_paylog.php +++ b/admin/views/receiver/orderv2/get/add_paylog.php @@ -1,10 +1,11 @@