From 92f11341442622dc8b5c090f5e8e9cdc3f3271bc Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 16 Sep 2026 16:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=8E=A5=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reserve/ReservationController.php         | 24 ++++++++++++-------
 app/Services/ParkingReservationService.php    |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Reserve/ReservationController.php b/app/Http/Controllers/Reserve/ReservationController.php
index 032533e..9ba78c6 100644
--- a/app/Http/Controllers/Reserve/ReservationController.php
+++ b/app/Http/Controllers/Reserve/ReservationController.php
@@ -105,11 +105,14 @@ class ReservationController
     public function confirm(Request $request): JsonResponse
     {
         try {
-            $id = $request->post('id');
-            $exists = ParkingReservation::query()->where(
-                ['id' => $id, 'status' => 0]
-            )->exists();
-            if (!$exists) {
+            $reserve_id = $request->post('id', '');
+            if (empty($reserve_id)) {
+                throw new Exception('数据缺失');
+            }
+            $id = ParkingReservation::query()->where(
+                ['reserve_id' => $reserve_id, 'status' => 0]
+            )->value('id');
+            if (!$id) {
                 throw new Exception('确认失败');
             }
             $this->service->confirm($id);
@@ -122,12 +125,15 @@ class ReservationController
     public function cancel(Request $request): JsonResponse
     {
         try {
-            $id = $request->post('id');
-            $exists = ParkingReservation::query()->where('id', $id)->whereIn(
+            $reserve_id = $request->post('id', '');
+            if (empty($reserve_id)) {
+                throw new Exception('数据缺失');
+            }
+            $id = ParkingReservation::query()->where('reserve_id', $reserve_id)->whereIn(
                 'status',
                 [0, 1]
-            )->exists();
-            if (!$exists) {
+            )->value('id');
+            if (!$id) {
                 throw new Exception('取消失败');
             }
             $this->service->cancel($id);
diff --git a/app/Services/ParkingReservationService.php b/app/Services/ParkingReservationService.php
index 0b1114a..1e70a40 100644
--- a/app/Services/ParkingReservationService.php
+++ b/app/Services/ParkingReservationService.php
@@ -133,7 +133,7 @@ class ParkingReservationService extends BaseService
             'floor'        => AdminFloor::getName($data['floor_id']),
             'date'         => $data['date'],
             'reserve_time' => $create['created_at'],
-            'id'           => $model->id,
+            'id'           => $reserve_id,
         ];
     }