From 3dd229f919162abf1c914596c5675abce7fa5d89 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 1 Jul 2022 16:01:24 +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 |  2 +-
 beike/Admin/Http/Resources/CustomerResource.php     |  2 +-
 beike/Repositories/CustomerRepo.php                 | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/beike/Admin/Http/Controllers/CustomerController.php b/beike/Admin/Http/Controllers/CustomerController.php
index 9d34c759..42d6dc22 100644
--- a/beike/Admin/Http/Controllers/CustomerController.php
+++ b/beike/Admin/Http/Controllers/CustomerController.php
@@ -26,7 +26,7 @@ class CustomerController extends Controller
     protected string $defaultRoute = 'customers.index';
     public function index(Request $request)
     {
-        $customers = CustomerRepo::list($request->only(['name', 'email', 'status', 'from', 'customer_group_name']));
+        $customers = CustomerRepo::list($request->only(['name', 'email', 'status', 'from', 'customer_group_id']));
 
         $data = [
             'customers' => CustomerResource::collection($customers),
diff --git a/beike/Admin/Http/Resources/CustomerResource.php b/beike/Admin/Http/Resources/CustomerResource.php
index 8964a34d..eb9bd0c7 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->customerGroup->description->name,
+            '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/Repositories/CustomerRepo.php b/beike/Repositories/CustomerRepo.php
index 7ff3829e..aa5451ed 100644
--- a/beike/Repositories/CustomerRepo.php
+++ b/beike/Repositories/CustomerRepo.php
@@ -64,14 +64,7 @@ class CustomerRepo
      */
     public static function list($data)
     {
-        $builder = Customer::query()
-            ->leftJoin('customer_groups AS cg', 'customers.customer_group_id', 'cg.id')
-            ->leftJoin('customer_group_descriptions AS cgd', function ($join) {
-                $join->on('cgd.customer_group_id', 'cg.id')
-                    ->where('cgd.locale', locale());
-            })
-            ->select(['customers.id', 'customers.email', 'customers.name', 'customers.avatar', 'customers.status', 'customers.from', 'cgd.name AS customer_group_name']);
-
+        $builder = Customer::query()->with("customerGroup.description");
 
         if (isset($data['name'])) {
             $builder->where('customers.name', 'like', "%{$data['name']}%");
@@ -85,8 +78,8 @@ class CustomerRepo
         if (isset($data['from'])) {
             $builder->where('customers.from', $data['from']);
         }
-        if (isset($data['customer_group_name'])) {
-            $builder->where('cgd.name', 'like', "%{$data['name']}%");
+        if (isset($data['customer_group_id'])) {
+            $builder->where('customers.customer_group_id', $data['customer_group_id']);
         }
 
         return $builder->paginate(20)->withQueryString();