|
|
|
|
@ -211,10 +211,14 @@ class OrdersController extends CommonController
|
|
|
|
|
$order->balance = $order->customer->balance;
|
|
|
|
|
// 是否需要签订协议,0否1是
|
|
|
|
|
$order->need_agreements = 0;
|
|
|
|
|
$order->orderAgreements = [
|
|
|
|
|
['paramedic_id' => $order->paramedic_id]
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
if ($order->paramedic_id && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) {
|
|
|
|
|
$order->need_agreements = 1;
|
|
|
|
|
}
|
|
|
|
|
$order->paramedic_id = null;
|
|
|
|
|
// $order->paramedic_id = null;
|
|
|
|
|
}
|
|
|
|
|
return response()->json($data->toArray());
|
|
|
|
|
}
|
|
|
|
|
@ -1966,7 +1970,7 @@ class OrdersController extends CommonController
|
|
|
|
|
// 目录
|
|
|
|
|
$save_folder = "public";
|
|
|
|
|
// 文件名
|
|
|
|
|
$name = "agreement_" . date("YmdHis") . uniqid(). "." . $options['format'];
|
|
|
|
|
$name = "agreement_" . date("YmdHis") . uniqid() . "." . $options['format'];
|
|
|
|
|
$tempPath = storage_path("app/{$save_folder}/" . $name);
|
|
|
|
|
// 确保临时目录存在
|
|
|
|
|
Storage::makeDirectory($save_folder);
|
|
|
|
|
|