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);