From a208113aff8179711231468b119e355fe05ec9bf Mon Sep 17 00:00:00 2001 From: weizong song Date: Sat, 11 Sep 2021 15:24:34 +0800 Subject: [PATCH] up --- app/Actions/AttachAffectedOrders.php | 2 +- app/Http/Controllers/Manager/OrdersController.php | 10 ++++++---- routes/web.php | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Actions/AttachAffectedOrders.php b/app/Actions/AttachAffectedOrders.php index 8dba39c..991ec09 100644 --- a/app/Actions/AttachAffectedOrders.php +++ b/app/Actions/AttachAffectedOrders.php @@ -65,7 +65,7 @@ class AttachAffectedOrders $affected_order->from_paramedic_id = $from_paramedic; } - $order->affected_orders = $affected_orders; + $order->affected_orders = collect($affected_orders); return $order; } } diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index d6a9414..6c87ad3 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -180,13 +180,13 @@ class OrdersController extends CommonController /** * @OA\Get( - * path="/manager/get-affected-orders", + * path="/manager/get-affected-orders/{from_order_id}", * tags={"管理端订单处理"}, * summary="V2-获取被影响到的订单列表", * description="获取被影响到的订单列表", * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Parameter(name="from_order_id", in="path", @OA\Schema(type="intger"), required=true, description="因为某张订单造成了影响"), - * @OA\Parameter(name="from_paramedic_id", in="path", @OA\Schema(type="intger"), required=false, description="原护工的id"), + * @OA\Parameter(name="from_paramedic_id", in="query", @OA\Schema(type="intger"), required=false, description="原护工的id"), * @OA\Response( * response="200", * description="获取被影响到的订单列表" @@ -194,9 +194,11 @@ class OrdersController extends CommonController * ) */ - public function getAffectedOrders() + public function getAffectedOrders($from_order_id, Request $request) { - + $order = Orders::find($from_order_id); + $order = (new AttachAffectedOrders())($order, $request->from_paramedic_id); + return response()->json($order->affected_orders->toArray()); } /** diff --git a/routes/web.php b/routes/web.php index 218f704..1dfe6f5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -163,6 +163,7 @@ Route::group(["namespace" => "Manager", "prefix" => "manager"], function () { Route::get('get-project-orders/{project_id}', 'OrdersController@list'); Route::get('get-order/{id}', 'OrdersController@getOrder'); Route::get('get-order-item/{id}', 'OrdersController@getOrderItem'); + Route::get('get-affected-orders/{from_order_id}', 'OrdersController@getAffectedOrders'); Route::post('confirm-order/{id}', 'OrdersController@confirmOrder'); Route::post('assign-order/{id}', 'OrdersController@assignOrder');