From 5a7c11ffd952dcddd7c0f386d63cfc6d0d06b863 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 10 Jun 2026 15:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=B8=E6=9C=BA=E7=AE=A1=E7=90=86-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=93=8D=E4=BD=9C=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/ParkingGateControlController.php       |  2 ++
 app/Models/ParkingGateControl.php                |  3 ++-
 app/Services/ParkingGateControlService.php       | 16 ++++++++++------
 ..._143449_create_parking_gate_control_table.php |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Admin/ParkingGateControlController.php b/app/Http/Controllers/Admin/ParkingGateControlController.php
index 87da0c0..f66674a 100644
--- a/app/Http/Controllers/Admin/ParkingGateControlController.php
+++ b/app/Http/Controllers/Admin/ParkingGateControlController.php
@@ -263,6 +263,7 @@ class ParkingGateControlController extends BaseController
                 )
             ];
             $this->validateData($data, $rules, $messages);
+            $data['admin_user_id'] = $this->adminUserId;
             $this->service->enterModel($data);
             return $this->responseService->success(
                 null,
@@ -299,6 +300,7 @@ class ParkingGateControlController extends BaseController
                 )
             ];
             $this->validateData($data, $rules, $messages);
+            $data['admin_user_id'] = $this->adminUserId;
             $this->service->leaveModel($data);
             return $this->responseService->success(
                 null,
diff --git a/app/Models/ParkingGateControl.php b/app/Models/ParkingGateControl.php
index 0456501..a4f9731 100644
--- a/app/Models/ParkingGateControl.php
+++ b/app/Models/ParkingGateControl.php
@@ -24,7 +24,8 @@ class ParkingGateControl extends Model
             'customer_id',
             'member_id',
             'free_passage',
-            'reservation_id'
+            'reservation_id',
+            'admin_user_id'
         ];
 
     protected $hidden
diff --git a/app/Services/ParkingGateControlService.php b/app/Services/ParkingGateControlService.php
index 2531811..57fe943 100644
--- a/app/Services/ParkingGateControlService.php
+++ b/app/Services/ParkingGateControlService.php
@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Models\AdminUsers;
 use App\Models\Parking;
 use App\Models\ParkingChannel;
 use App\Models\ParkingGateControl;
@@ -50,7 +51,8 @@ class ParkingGateControlService extends BaseService
 
         $item['enter_img'] = get_image_url($item['enter_img']);
         $item['leave_img'] = get_image_url($item['leave_img']);
-        unset($item['license_plate_id'], $item['channel_id'], $item['reservation_id'], $item['free_passage']);
+        $item['admin_username'] = $item['admin_user_id'] ? AdminUsers::getUsername($item['admin_user_id']) : '';
+        unset($item['license_plate_id'], $item['channel_id'], $item['reservation_id'], $item['free_passage'], $item['admin_user_id']);
         return $item;
     }
 
@@ -119,6 +121,7 @@ class ParkingGateControlService extends BaseService
                 'member_type'      => $member_type,
                 'customer_id'      => $customer_id,
                 'member_id'        => $member_id,
+                'admin_user_id'    => $data['admin_user_id'],
                 'created_at'       => get_datetime()
             ]);
             $this->logService->logCreated($model, $this->menuTitle . '.create_enter');
@@ -154,11 +157,12 @@ class ParkingGateControlService extends BaseService
             $oldValue = $model->toArray();
 
             $model->update([
-                'enter_type'   => 2,
-                'leave_img'    => $leave_img,
-                'leave_at'     => $leave_time,
-                'free_passage' => $free_passage,
-                'updated_at'   => get_datetime()
+                'enter_type'    => 2,
+                'leave_img'     => $leave_img,
+                'leave_at'      => $leave_time,
+                'free_passage'  => $free_passage,
+                'admin_user_id' => $data['admin_user_id'],
+                'updated_at'    => get_datetime()
             ]);
             $this->logService->logUpdated($model, $oldValue, $this->menuTitle . '.update_leave');
             DB::commit();
diff --git a/database/migrations/2026_06_09_143449_create_parking_gate_control_table.php b/database/migrations/2026_06_09_143449_create_parking_gate_control_table.php
index 8e95bf4..5af56df 100644
--- a/database/migrations/2026_06_09_143449_create_parking_gate_control_table.php
+++ b/database/migrations/2026_06_09_143449_create_parking_gate_control_table.php
@@ -26,6 +26,7 @@ return new class extends Migration
             $table->string('member_id', 50)->default('')->comment('会员id');
             $table->tinyInteger('free_passage')->default(0)->comment('免费放行');
             $table->integer('reservation_id')->default(0)->comment('预约id');
+            $table->integer('admin_user_id')->nullable()->comment('操作员');
             $table->timestamps();
             $table->innoDb();
             $table->comment('停车场闸机进出记录');