From 5a94945deeb8ef5644a8fc60357e519abf90afe1 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 14 Dec 2022 10:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96SKU=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8F=E5=A4=A7(5=E4=B8=87+)=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/ProductRepo.php                     | 2 +-
 plugins/LatestProducts/Controllers/MenusController.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php
index e5173cbc..0928d819 100644
--- a/beike/Repositories/ProductRepo.php
+++ b/beike/Repositories/ProductRepo.php
@@ -128,7 +128,7 @@ class ProductRepo
             $builder->onlyTrashed();
         }
 
-        $sort = $data['sort'] ?? 'updated_at';
+        $sort = $data['sort'] ?? 'products.updated_at';
         $order = $data['order'] ?? 'desc';
         $builder->orderBy($sort, $order);
 
diff --git a/plugins/LatestProducts/Controllers/MenusController.php b/plugins/LatestProducts/Controllers/MenusController.php
index dc3cde4c..bb22b0f0 100644
--- a/plugins/LatestProducts/Controllers/MenusController.php
+++ b/plugins/LatestProducts/Controllers/MenusController.php
@@ -29,9 +29,13 @@ class MenusController extends Controller
     public function latestProducts()
     {
         $products = ProductRepo::getBuilder(['active' => 1])
-            ->whereHas('master_sku')
+            ->select('products.*')
+            ->join('product_skus', function ($query) {
+                $query->on('products.id', '=', 'product_skus.product_id')
+                    ->where('product_skus.is_default', 1);
+            })
+            ->with('master_sku')
             ->with('inCurrentWishlist')
-            ->orderByDesc('updated_at')
             ->paginate(40);
 
         $data = [