diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index bc7eaca..4ff0348 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -215,7 +215,8 @@ class OrdersController extends CommonController ['paramedic_id' => $order->paramedic_id] ]; - if ($order->paramedic_id && ($order->orderAgreements->isEmpty() || ($order->orderAgreements->isNotEmpty() && $order->orderAgreements[0]->paramedic_id != $order->paramedic_id))) { + if ($order->paramedic_id && 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; } } @@ -347,9 +348,12 @@ class OrdersController extends CommonController ]; } $order->group_by_paramedic = collect($group_by_paramedic); - // todo:: // 是否需要签订协议,0否1是 $order->need_agreements = 0; + if ($order->paramedic_id && 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] ]; @@ -1426,8 +1430,8 @@ class OrdersController extends CommonController ]); } - $order = (new Orders())->with(["wechatpayAccount","alipayAccount"])->find($order_id); - Log::info("阿里云支付账号:".$order->alipayAccount->appid); + $order = (new Orders())->with(["wechatpayAccount", "alipayAccount"])->find($order_id); + Log::info("阿里云支付账号:" . $order->alipayAccount->appid); $recharge = (new Recharge())->create([ "customer_id" => $order->customer->id, "money" => request()->money, diff --git a/app/Models/Orders.php b/app/Models/Orders.php index c9bb790..336d8d4 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -21,6 +21,9 @@ class Orders extends SoftDeletesModel const TEXT_ONGOING = "进行中"; const TEXT_FINISHED = "已完成"; + // 协议开启时间点变量 + const AGREEMENT_START_DATE = '2025-10-22 00:00:00'; + protected $appends = ["status_name", "days"]; public function getStatusLabelAttribute($pure_text = true) @@ -54,12 +57,12 @@ class Orders extends SoftDeletesModel public function orderAgreements() { - return $this->hasMany(OrderAgreement::class, "order_id","id"); + return $this->hasMany(OrderAgreement::class, "order_id", "id"); } public function orderAgreementByLast() { - return $this->hasOne(OrderAgreement::class, "order_id","id")->orderBy("id", "desc"); + return $this->hasOne(OrderAgreement::class, "order_id", "id")->orderBy("id", "desc"); } public function isOngoing()