diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index d2567d3..13b159c 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -210,7 +210,7 @@ class OrdersController extends CommonController $order = $order->refreshTotal(); $order->balance = $order->customer->balance; // 是否需要签订协议,0否1是 - $order->need_agreements = $order->needAgreements(); + $order->need_agreements = $order->needAgreements($order); } return response()->json($data->toArray()); } diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 0588efa..647f3c2 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -29,12 +29,12 @@ class Orders extends SoftDeletesModel /** * 判断是否要签协议 */ - public function needAgreements() + public function needAgreements($order) { - dd($this->paramedic_id , $this->project->agreement); - if ($this->paramedic_id && $this->project->agreement == 1 - && strtotime($this->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) - && ($this->orderAgreementByLast()->isEmpty() || ($this->orderAgreementByLast()->isNotEmpty() && $this->orderAgreementByLast()->paramedic_id != $this->paramedic_id))) { + if ($order->paramedic_id + && $order->project->agreement == 1 + && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) + && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) { return 1; } return 0;