diff --git a/app/Admin/Controllers/Store/OrderController.php b/app/Admin/Controllers/Store/OrderController.php index 60a99612..03952a0c 100644 --- a/app/Admin/Controllers/Store/OrderController.php +++ b/app/Admin/Controllers/Store/OrderController.php @@ -109,6 +109,7 @@ class OrderController extends AdminController // PayWay::WxpayMiniProgram->value => PayWay::WxpayMiniProgram->text(), // PayWay::Offline->value => PayWay::Offline->text(), // ])->width(3); + $filter->between('created_at')->dateTime()->width(6); $filter->where('order_status', function ($q) { switch ($this->input) { case OrderStatus::PENDING: @@ -138,9 +139,9 @@ class OrderController extends AdminController OrderStatus::COMPLETED => '已完成', OrderStatus::CANCELLED => '已取消' ])->width(3); - $filter->between('created_at')->dateTime()->width(6); $filter->where('user_coupon_id', fn($q) => $this->input ? $q->whereNotNull('user_coupon_id') : $q->whereNull('user_coupon_id'))->select(['未使用', '已使用'])->width(3); $filter->between('completed_at')->dateTime()->width(6); + $filter->where('pay_at', fn($q) => $this->input ? $q->whereNotNull('pay_at') : $q->whereNull('pay_at'), '付款状态')->select(['待付款', '已付款'])->width(3); }); $grid->footer(function ($collection) use ($grid) {