From a9a7cc889acefc1c7dc449ed597d5791176e9c39 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Sat, 25 Oct 2025 15:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Manager/OrdersController.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 991c357..4239454 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -211,11 +211,7 @@ class OrdersController extends CommonController $order->balance = $order->customer->balance; // 是否需要签订协议,0否1是 $order->need_agreements = 0; - $order->order_agreements = [ - ['paramedic_id' => $order->paramedic_id] - ]; - - if ($order->paramedic_id && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) + if ($order->paramedic_id && $order->project_id != 7 && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) { $order->need_agreements = 1; } @@ -350,13 +346,10 @@ class OrdersController extends CommonController $order->group_by_paramedic = collect($group_by_paramedic); // 是否需要签订协议,0否1是 $order->need_agreements = 0; - if ($order->paramedic_id && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) + if ($order->paramedic_id && $order->project_id != 7 && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) { $order->need_agreements = 1; } - $order->order_agreements = [ - ['paramedic_id' => $order->paramedic_id] - ]; if ($ajax === true) { return response()->json($order->toArray()); }