From 6d5046b4e89dd80af539dc4a93311be4b497466a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 10 Nov 2023 10:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/product/ProductRepository.php    | 2 +-
 app/common/repositories/system/merchant/MerchantRepository.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 669c499e..b9b54428 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -1719,7 +1719,7 @@ class ProductRepository extends BaseRepository
                 ]
             ], $product['mer_id']);
             if($data['status']==1){
-                $this->switchShow($id,1,'is_used',0);
+                $this->switchShow($product['product_id'],1,'is_used',0);
             }
 
         }
diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 9e5617be..a2a5f87f 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -306,6 +306,7 @@ class MerchantRepository extends BaseRepository
                     'lat' => (float)$data[0],
                     'long' => (float)$data[1],
                 ];
+                $where['order'] = 'location';
             }
         }
         if ($where['keyword'] !== '') {