|
|
|
|
@ -339,7 +339,7 @@ class Orders extends SoftDeletesModel
|
|
|
|
|
})->where("id", $this->id)->get();
|
|
|
|
|
} else {
|
|
|
|
|
//获取正在进行中的订单,即使已经到了截止日,只要状态是在进行中的都继续生成
|
|
|
|
|
$unGeneratedOrders = $this::whereIn("status", [self::STATUS_ONGOING])
|
|
|
|
|
$unGeneratedOrders = (new Orders())->whereIn("status", [self::STATUS_ONGOING])
|
|
|
|
|
->whereRaw("DATEDIFF(`from_date`, now()) <= 0")
|
|
|
|
|
->whereDoesntHave("orderItems", function ($query) {
|
|
|
|
|
$query->whereRaw("DATEDIFF(`service_date`, now()) = 0");
|
|
|
|
|
|