From 3bf4e1de1444ad5d30e0bb5a8099b6d917a90ba7 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 27 Mar 2023 08:58:41 +0800
Subject: [PATCH] order filter

---
 app/Admin/Controllers/Store/OrderController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/Store/OrderController.php b/app/Admin/Controllers/Store/OrderController.php
index 03952a0c..a902d653 100644
--- a/app/Admin/Controllers/Store/OrderController.php
+++ b/app/Admin/Controllers/Store/OrderController.php
@@ -141,7 +141,7 @@ class OrderController extends AdminController
             ])->width(3);
             $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);
+            $filter->where('pay_at', fn($q) => $this->input ? $q->whereNotNull('pay_at') : $q->whereNull('pay_at')->where('status', '!=', Order::STATUS_CANCELLED), '付款状态')->select(['待付款', '已付款'])->width(3);
         });
 
         $grid->footer(function ($collection) use ($grid) {