From aa00a8d82dfcdf6127fe46019e0a74321e33d810 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 27 Feb 2023 14:26:23 +0800
Subject: [PATCH] 1

---
 app/Admin/Actions/Store/RowAddStock.php | 7 ++++---
 app/Admin/Forms/OrderPackage.php        | 3 ++-
 app/Listeners/OrderAutoComplete.php     | 4 ++--
 app/Listeners/OrderPackage.php          | 3 ++-
 app/Providers/EventServiceProvider.php  | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Admin/Actions/Store/RowAddStock.php b/app/Admin/Actions/Store/RowAddStock.php
index faf4db5c..9b57c378 100644
--- a/app/Admin/Actions/Store/RowAddStock.php
+++ b/app/Admin/Actions/Store/RowAddStock.php
@@ -18,7 +18,8 @@ class RowAddStock extends RowAction
         if ($model->status) {
             return $this->response()->error('已经确认过了');
         }
-        $type = (new Administrator())->getMorphClass();
+        $admin = $model->adminUser;
+        $type = $admin->getMorphClass();
         foreach($model->productSkus()->get() as $item) {
             $amount = $item->pivot?->amount;
             if ($amount) {
@@ -36,8 +37,8 @@ class RowAddStock extends RowAction
                 }
                 array_push($list, [
                     'operator_type' => $type,
-                    'operator_id' => $model->admin_user_id,
-                    'operator_name' => $model->adminUser->name,
+                    'operator_id' => $admin->id,
+                    'operator_name' => $admin->name,
                     'amount' => $amount,
                     'product_sku_id' => $item->id,
                     'balance' => $balance,
diff --git a/app/Admin/Forms/OrderPackage.php b/app/Admin/Forms/OrderPackage.php
index ec7fa20b..d12b9b6f 100644
--- a/app/Admin/Forms/OrderPackage.php
+++ b/app/Admin/Forms/OrderPackage.php
@@ -66,8 +66,9 @@ class OrderPackage extends Form implements LazyRenderable
                         'amount' => $product->pivot->amount - $amount
                     ]);
                     $store->stockLogs()->create([
-                        'operator_type' => get_class($operator),
+                        'operator_type' => $operator->getMorphClass(),
                         'operator_id' => $operator->id,
+                        'operator_name' => $operator->name,
                         'source_type' => Order::class,
                         'source_id' => $order->id,
                         'amount' => 0-$amount,
diff --git a/app/Listeners/OrderAutoComplete.php b/app/Listeners/OrderAutoComplete.php
index df7d755a..d5ee8626 100644
--- a/app/Listeners/OrderAutoComplete.php
+++ b/app/Listeners/OrderAutoComplete.php
@@ -18,8 +18,8 @@ class OrderAutoComplete
     public function handle($event)
     {
         $order = $event->order;
-        // 门店, 桌号订单
-        if ($order->source_type === Desk::class && $store = $order->store) {
+        // 门店
+        if ($store = $order->store) {
             $order = Order::find($order->id);
             $package = (new \App\Admin\Services\OrderPackageService())->createAll($order);
 
diff --git a/app/Listeners/OrderPackage.php b/app/Listeners/OrderPackage.php
index ed96abee..11fbe3ba 100644
--- a/app/Listeners/OrderPackage.php
+++ b/app/Listeners/OrderPackage.php
@@ -71,7 +71,8 @@ class OrderPackage
                         ]);
                         // 添加店铺发货记录
                         $store->stockLogs()->create([
-                            'operator_type' => $inviter ? get_class($inviter) : '',
+                            'operator_type' => $inviter ? $inviter->getMorphClass() : '',
+                            'operator_name' => $inviter? $inviter->phone : '',
                             'operator_id' => $inviter ? $inviter->id : '',
                             'source_type' => Order::class,
                             'source_id' => $order->id,
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 68d8c5d5..091ef335 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -19,7 +19,7 @@ class EventServiceProvider extends ServiceProvider
         \App\Events\OrderPaid::class => [
             \App\Listeners\OrderPaidNotify::class,
             \App\Listeners\SendCoupons::class,
-            \App\Listeners\OrderPackage::class,
+            // \App\Listeners\OrderPackage::class,
             \App\Listeners\OrderDistribute::class,
             \App\Listeners\OrderPrint::class,
             \App\Listeners\OrderAutoComplete::class,