diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 4239454..4c4d2ff 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -211,7 +211,7 @@ class OrdersController extends CommonController $order->balance = $order->customer->balance; // 是否需要签订协议,0否1是 $order->need_agreements = 0; - if ($order->paramedic_id && $order->project_id != 7 && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) + if ($order->paramedic_id && $order->id != 66685 && $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; } @@ -346,7 +346,7 @@ class OrdersController extends CommonController $order->group_by_paramedic = collect($group_by_paramedic); // 是否需要签订协议,0否1是 $order->need_agreements = 0; - if ($order->paramedic_id && $order->project_id != 7 && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) + if ($order->paramedic_id && $order->id != 66685 && $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; }