diff --git a/app/Actions/AttachAffectedOrders.php b/app/Actions/AttachAffectedOrders.php index 991ec09..5dba34b 100644 --- a/app/Actions/AttachAffectedOrders.php +++ b/app/Actions/AttachAffectedOrders.php @@ -32,9 +32,27 @@ class AttachAffectedOrders return $order; } + $model = Orders::with([ + "bed" => function ($query) { + $query->select("bed.id", "bed.name") + ->leftJoin("building", "building.id", "=", "bed.building_id") + ->leftJoin("area", "area.id", "=", "bed.area_id") + ->leftJoin("room", "room.id", "=", "bed.room_id") + ->addSelect("room.name as room_name", "area.name as area_name", "building.name as building_name"); + }, + "patient" => function ($query) { + $query->select("id", "name", "sex", "age", "mobile"); + }, + "paramedic" => function ($query) { + $query->select("paramedic.id", "paramedic.name", "paramedic.mobile") + ->leftJoin("paramedic_level", "paramedic_level.id", "=", "paramedic.paramedic_level_id") + ->addSelect("paramedic_level.name as paramedic_level_name"); + } + ]); + //更换护工,查询从原护工手上退出订单后,原护工的其他订单是否变成了1对1 if ($from_paramedic) { - $last_orders = Orders::where("paramedic_id", $from_paramedic) + $last_orders = $model->where("paramedic_id", $from_paramedic) ->where("status", Orders::STATUS_ONGOING) ->where("paramedic_id", "<>", $order->paramedic_id) //剔除未更换护工的情况 ->get(); @@ -48,7 +66,7 @@ class AttachAffectedOrders } //查询护工新接手一张单之后,是否有订单从1对1变成了1对多 - $new_same_paramedic_orders = Orders::where("paramedic_id", $order->paramedic_id) + $new_same_paramedic_orders = $model->where("paramedic_id", $order->paramedic_id) ->where("status", Orders::STATUS_ONGOING) ->where("id", "<>", $order->id) //剔除订单本身 ->get(); diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 6c87ad3..7e01eba 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -201,6 +201,32 @@ class OrdersController extends CommonController return response()->json($order->affected_orders->toArray()); } + /** + * @OA\post( + * path="/manager/update-order-price", + * tags={"管理端订单处理"}, + * summary="V2-批量更新订单价格", + * description="批量更新订单价格", + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Parameter(name="available_day", in="query", @OA\Schema(type="string"), required=false, description="生效日期,仅当值为today表示同步更新当日子订单价格,为其他值表示次日起生效"), + * @OA\Parameter(name="price", in="query", @OA\Schema(type="object"), required=true, description="价格提交,[{order_id:1,price:200},{...}]"), + * @OA\Response( + * response="200", + * description="批量更新订单价格" + * ) + * ) + */ + + public function updateOrderPrice(Request $request) + { + DB::beginTransaction(); + try { + + } catch (\Exception $exception) { + + } + } + /** * @OA\Get( * path="/manager/get-order/{id}", diff --git a/routes/web.php b/routes/web.php index 1dfe6f5..4854951 100644 --- a/routes/web.php +++ b/routes/web.php @@ -167,6 +167,7 @@ Route::group(["namespace" => "Manager", "prefix" => "manager"], function () { Route::post('confirm-order/{id}', 'OrdersController@confirmOrder'); Route::post('assign-order/{id}', 'OrdersController@assignOrder'); + Route::post('update-order-price', 'OrdersController@updateOrderPrice'); Route::post('modify-order/{id}', 'OrdersController@modifyOrder'); Route::post('checkout-order/{id}', 'OrdersController@checkoutOrder');