From 9c8b70170640ad0137aa53f3e14ed58ec79dfe42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B1=95=E9=B9=8F?= <wsh5485@163.com>
Date: Wed, 19 Nov 2025 01:42:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=92=8C=E5=B7=B2=E5=8F=96=E6=B6=88=E7=9A=84=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改SQL查询条件，在bookings.php和index.php中排除状态为'已完成'和'已取消'的订单，确保只显示有效预约
---
 bookings.php | 4 ++--
 index.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookings.php b/bookings.php
index 91f15ef..60f171b 100644
--- a/bookings.php
+++ b/bookings.php
@@ -18,9 +18,9 @@ if (isset($_POST['action']) && isset($_POST['booking_id'])) {
     }
 }
 
-// 获取所有预约
+// 获取所有预约（过滤掉已完成和已取消的订单）
 try {
-    $stmt = $pdo->query("SELECT b.*, p.package_name FROM bookings b LEFT JOIN packages p ON b.package_id = p.id ORDER BY b.start_time DESC");
+    $stmt = $pdo->query("SELECT b.*, p.package_name FROM bookings b LEFT JOIN packages p ON b.package_id = p.id WHERE b.status NOT IN ('已完成', '已取消') ORDER BY b.start_time DESC");
     $bookings = $stmt->fetchAll();
 } catch (Exception $e) {
     $error_message = '获取预约列表失败：' . $e->getMessage();
diff --git a/index.php b/index.php
index 004e0d0..3c38887 100644
--- a/index.php
+++ b/index.php
@@ -92,7 +92,7 @@ $stmt = $pdo->prepare("SELECT DATE(start_time) as date,
                               ) as bookings
                        FROM bookings 
                        WHERE DATE(start_time) BETWEEN ? AND ? 
-                       AND status != '已取消'
+                       AND status NOT IN ('已完成', '已取消')
                        GROUP BY DATE(start_time)
                        ORDER BY date");
 $stmt->execute([$start_date, $end_date]);
@@ -116,7 +116,7 @@ $stmt2 = $pdo->prepare("SELECT DATE(start_time) as date,
                                car_number
                         FROM bookings 
                         WHERE DATE(start_time) BETWEEN ? AND ? 
-                        AND status != '已取消'
+                        AND status NOT IN ('已完成', '已取消')
                         ORDER BY date, start_time");
 $stmt2->execute([$start_date, $end_date]);
 $all_bookings = $stmt2->fetchAll(PDO::FETCH_ASSOC);