From a819f64dd54fd194e78c55fe6cd88b077c6bd564 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 27 Feb 2023 13:29:43 +0800
Subject: [PATCH] adminUser

---
 app/Admin/Actions/Store/RowAddStock.php                         | 1 +
 app/Admin/Controllers/Store/StockController.php                 | 1 +
 .../2023_02_27_123916_add_operator_name_to_stock_logs.php       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Actions/Store/RowAddStock.php b/app/Admin/Actions/Store/RowAddStock.php
index 5ad42efa..faf4db5c 100644
--- a/app/Admin/Actions/Store/RowAddStock.php
+++ b/app/Admin/Actions/Store/RowAddStock.php
@@ -37,6 +37,7 @@ class RowAddStock extends RowAction
                 array_push($list, [
                     'operator_type' => $type,
                     'operator_id' => $model->admin_user_id,
+                    'operator_name' => $model->adminUser->name,
                     'amount' => $amount,
                     'product_sku_id' => $item->id,
                     'balance' => $balance,
diff --git a/app/Admin/Controllers/Store/StockController.php b/app/Admin/Controllers/Store/StockController.php
index fbf0c055..11e9aa2c 100644
--- a/app/Admin/Controllers/Store/StockController.php
+++ b/app/Admin/Controllers/Store/StockController.php
@@ -76,6 +76,7 @@ class StockController extends AdminController
         $form->text('remarks');
         $form->hidden('operator_type');
         $form->hidden('operator_id');
+        $form->hidden('operator_name');
         $form->hidden('balance');
 
         $form->saving(function (Form $form) {
diff --git a/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php b/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
index 86496d56..18faafcc 100644
--- a/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
+++ b/database/migrations/2023_02_27_123916_add_operator_name_to_stock_logs.php
@@ -15,7 +15,7 @@ class AddOperatorNameToStockLogs extends Migration
     public function up()
     {
         Schema::table('store_stock_logs', function (Blueprint $table) {
-            $table->string('operator_name');
+            $table->string('operator_name')->nullable();
         });
         DB::update("update `store_stock_logs` set `operator_name` = (select `name` from `admin_users` where `store_stock_logs`.`operator_id` = `admin_users`.`id`) where `store_stock_logs`.`operator_type` in ('App\\Models\\Admin\\Administrator', 'admin_users');");
         DB::update("update `store_stock_logs` set `operator_name` = (select `phone` from `users` where `store_stock_logs`.`operator_id` = `users`.`id`) where `store_stock_logs`.`operator_type` in ('App\\Models\\User');");