From a78dc2c4120292ac9a48ca573f12a55fef948f95 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 18 May 2022 17:39:08 +0800
Subject: [PATCH] user

---
 app/Admin/Controllers/OrderController.php | 5 +++--
 app/Console/Commands/UserToken.php        | 8 +-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index b73d975c..961a87e7 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -220,7 +220,7 @@ class OrderController extends AdminController
     {
         return function (Row $row) use ($id) {
             $row->column(5, function ($column) use ($id) {
-                $builder = OrderModel::with(['user', 'userCoupon', 'tags'])->withCount('afterSales');
+                $builder = OrderModel::with(['user', 'userCoupon', 'tags', 'store'])->withCount('afterSales');
                 $column->row(Show::make($id, $builder, function (Show $show) {
                     // $show->field('id');
                     $show->row(function (Show\Row $show) {
@@ -287,7 +287,8 @@ class OrderController extends AdminController
                     $show->row(function (Show\Row $show) use ($userCouponId) {
                         $show->width(6)->field('sales_value');
                         $show->field('completed_at', '完成时间');
-                        $show->width(12)->field('note')->width(10, 1);
+                        $show->field('note');
+                        $show->field('store.title', '店铺');
                         $show->width(12)->field('remark')->width(10, 1);
                     });
 
diff --git a/app/Console/Commands/UserToken.php b/app/Console/Commands/UserToken.php
index d1bf6c4f..9e9fa396 100644
--- a/app/Console/Commands/UserToken.php
+++ b/app/Console/Commands/UserToken.php
@@ -39,13 +39,7 @@ class UserToken extends Command
     public function handle()
     {
         $user = User::findOrFail($this->argument('id'));
-        $tokens = $user->tokens;
-        $token = '';
-        if ($tokens->count() > 0) {
-            $token = $tokens->first();
-        } else {
-            $token = $user->createToken('command');
-        }
+        $token = $user->createToken('command');
         $this->info($token->plainTextToken);
         return 0;
     }