|
|
|
|
@ -623,7 +623,8 @@ class OrdersController extends CommonController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//更新订单基本信息
|
|
|
|
|
$update = (new Orders())->filterRequestColumns(request(), ["id", "paramedic_id"]);
|
|
|
|
|
$from_paramedic = $order->paramedic_id;
|
|
|
|
|
$update = (new Orders())->filterRequestColumns(request(), ["id"]);
|
|
|
|
|
if (request()->has("contact", "patient_name") && !request()->contact) {
|
|
|
|
|
$update["contact"] = request()->patient_name;
|
|
|
|
|
}
|
|
|
|
|
@ -635,13 +636,16 @@ class OrdersController extends CommonController
|
|
|
|
|
}
|
|
|
|
|
$order->update($update);
|
|
|
|
|
|
|
|
|
|
//更换护工的处理
|
|
|
|
|
if ($order->isOngoing()) {
|
|
|
|
|
//正在进行中的订单修改子订单
|
|
|
|
|
if ($order->isOngoing() && request()->available_day == "today") {
|
|
|
|
|
$res = (new OrderItems())->updateTodayItem($order->id);
|
|
|
|
|
if (!$res["status"]) {
|
|
|
|
|
return response()->json([
|
|
|
|
|
"errorcode" => "103",
|
|
|
|
|
"errormsg" => request()->available_day
|
|
|
|
|
"errormsg" => $res["msg"]
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//如果原本的护工id为空且新提交了护工id,视同为派单
|
|
|
|
|
if ($order->isPending() && request()->paramedic_id) {
|
|
|
|
|
@ -650,10 +654,10 @@ class OrdersController extends CommonController
|
|
|
|
|
"status" => Orders::STATUS_ONGOING
|
|
|
|
|
]);
|
|
|
|
|
event(new OrderAssigned($order));
|
|
|
|
|
$order = (new AttachAffectedOrders)($order);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DB::commit();
|
|
|
|
|
$order = (new AttachAffectedOrders)($order, $from_paramedic);
|
|
|
|
|
return response()->json($order->toArray());
|
|
|
|
|
} catch (\Exception $exception) {
|
|
|
|
|
DB::rollBack();
|
|
|
|
|
|