From d0b2ccfa20ad721f89cb8efb216e3786489924ce Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 1 Jul 2022 15:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Controllers/CustomerController.php | 3 +--
 beike/Admin/Http/Resources/CustomerResource.php     | 2 +-
 beike/Models/Customer.php                           | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/beike/Admin/Http/Controllers/CustomerController.php b/beike/Admin/Http/Controllers/CustomerController.php
index 7e67d928..9d34c759 100644
--- a/beike/Admin/Http/Controllers/CustomerController.php
+++ b/beike/Admin/Http/Controllers/CustomerController.php
@@ -40,9 +40,8 @@ class CustomerController extends Controller
     {
         $data = $request->only(['email', 'name', 'password', 'status', 'customer_group_id']);
         $customer = CustomerService::create($data);
-        $customer->load('group');
 
-        return json_success('创建成功！', $customer);
+        return json_success('创建成功！', new CustomerResource($customer));
     }
 
     public function edit(Request $request, Customer $customer)
diff --git a/beike/Admin/Http/Resources/CustomerResource.php b/beike/Admin/Http/Resources/CustomerResource.php
index 2d37d591..8964a34d 100644
--- a/beike/Admin/Http/Resources/CustomerResource.php
+++ b/beike/Admin/Http/Resources/CustomerResource.php
@@ -21,7 +21,7 @@ class CustomerResource extends JsonResource
             'status' => $this->status ? '启用' : '禁用',
             'avatar' => image_resize($this->avatar),
             'from' => $this->from,
-            'customer_group_name' => $this->customer_group_name ?? $this->group->description->name,
+            'customer_group_name' => $this->customer_group_name ?? $this->customerGroup->description->name,
             'edit' => admin_route('customers.edit', $this->id),
             'delete' => admin_route('customers.destroy', $this->id),
         ];
diff --git a/beike/Models/Customer.php b/beike/Models/Customer.php
index 5b49aaa2..e08a0086 100644
--- a/beike/Models/Customer.php
+++ b/beike/Models/Customer.php
@@ -23,7 +23,7 @@ class Customer extends Authenticatable
         return $this->hasMany(Address::class);
     }
 
-    public function group(): BelongsTo
+    public function customerGroup(): BelongsTo
     {
         return $this->belongsTo(CustomerGroup::class);
     }