master
cody 6 months ago
parent 94c2ec7d55
commit 79f49b241c

@ -210,7 +210,7 @@ class OrdersController extends CommonController
$order = $order->refreshTotal(); $order = $order->refreshTotal();
$order->balance = $order->customer->balance; $order->balance = $order->customer->balance;
// 是否需要签订协议0否1是 // 是否需要签订协议0否1是
$order->need_agreements = $order->needAgreements(); $order->need_agreements = $order->needAgreements($order);
} }
return response()->json($data->toArray()); return response()->json($data->toArray());
} }

@ -29,12 +29,12 @@ class Orders extends SoftDeletesModel
/** /**
* 判断是否要签协议 * 判断是否要签协议
*/ */
public function needAgreements() public function needAgreements($order)
{ {
dd($this->paramedic_id , $this->project->agreement); if ($order->paramedic_id
if ($this->paramedic_id && $this->project->agreement == 1 && $order->project->agreement == 1
&& strtotime($this->created_at) >= strtotime(Orders::AGREEMENT_START_DATE) && strtotime($order->created_at) >= strtotime(Orders::AGREEMENT_START_DATE)
&& ($this->orderAgreementByLast()->isEmpty() || ($this->orderAgreementByLast()->isNotEmpty() && $this->orderAgreementByLast()->paramedic_id != $this->paramedic_id))) { && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) {
return 1; return 1;
} }
return 0; return 0;

Loading…
Cancel
Save