This commit is contained in:
邓皓元 2019-11-19 17:41:20 +08:00
parent 21be6e8530
commit 96d82f942e

View File

@ -187,7 +187,7 @@ trait OrderCardConcern
break;
case 2:
$havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) >= '%s')", $date);
$havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) >= '%s')", $date);
$this->model = $this->model->whereNotNull('service_start_at')
->whereRaw($havingRaw)
@ -197,7 +197,7 @@ trait OrderCardConcern
break;
case 3:
$havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) < '%s')", $date);
$havingRaw = sprintf("sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MAX(service_end_at) < '%s')", $date);
$this->model = $this->model->whereNotNull('service_start_at')
->whereRaw($havingRaw)
@ -207,7 +207,7 @@ trait OrderCardConcern
break;
case 4:
$this->model = $this->model->whereHas('card', function ($relation) {
$this->model = $this->model->whereHas('card', function ($relation) use ($date) {
$relation->where('cancelled_at', ">=", $date);
});
break;