diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index 1195fd73..49de4657 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -319,20 +319,25 @@ class MerchantDao extends BaseDao
      * 按距离获取有效的商户
      * @param $lat
      * @param $lng
+     * @param $sort 是否按距离排序
      * @param $distance 距离，单位米
      * @return mixed
      */
-    public function getValidMerchantByDistance($lat, $lng, $distance = 2000)
+    public function getValidMerchantByDistance($lat, $lng, $sort = false, $distance = 2000)
     {
-        $merchant = Merchant::where('type_id', 'IN', ["10", "17"])
+        $query = Merchant::where('type_id', 'IN', ["10", "17"])
             ->where(['is_del' => 0, 'mer_state' => 1])
             ->whereNotNull('lat')
             ->whereNotNull('long')
-            ->field("mer_id,st_distance_sphere(point(`long`,`lat`), point({$lng}, {$lat})) as distance")
-            ->having("distance <= {$distance}")
-            ->limit(50)->select()->toArray();
-        if (empty($merchant) && $distance < 5000) {
-            $merchant = $this->getValidMerchantByDistance($lat, $lng, 5000);
+            ->field("mer_id,st_distance_sphere(point(`long`,`lat`), point({$lng}, {$lat})) as distance");
+        if ($sort) {
+            $query->order('distance')->limit(20);
+        } else {
+            $query->having("distance <= {$distance}")->limit(50);
+        }
+        $merchant = $query->select()->toArray();
+        if (empty($merchant) && $distance < 5000 && !$sort) {
+            $merchant = $this->getValidMerchantByDistance($lat, $lng, $sort, 5000);
         }
         if (!empty($merchant)) {
             return array_column($merchant, 'mer_id');
diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php
index c0f4d3f1..2c779e82 100644
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@@ -56,6 +56,10 @@ class CloudWarehouse extends BaseController
                 }
             }
         }
+        if (empty($merIds)) {
+            $merIds = (new MerchantDao())->getValidMerchantByDistance($location['lat'], $location['lng'], true);
+            $query->whereIn('mer_id', $merIds);
+        }
         if($cate_pid!=0){
             $cate_id=Db::name('store_category')->where('pid',$cate_pid)->where('is_show',1)->column('store_category_id');
         }