diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index a6bdd26b..ba28d4bc 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -315,4 +315,29 @@ class MerchantDao extends BaseDao
         return $this->getModel()::getInstance()->where($where);
     }
 
+    /**
+     * 按距离获取有效的商户
+     * @param $lat
+     * @param $lng
+     * @param $distance 距离，单位米
+     * @return mixed
+     */
+    public function getValidMerchantByDistance($lat, $lng, $distance = 2000)
+    {
+        $merchant = 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();
+        if (empty($merchant)) {
+            $merchant = $this->getValidMerchantByDistance($lat, $lng, 5000);
+        }
+        if (!empty($merchant)) {
+            return array_column($merchant->toArray(), 'mer_id');
+        }
+        return [];
+    }
+
 }
diff --git a/app/controller/api/store/product/CloudWarehouse.php b/app/controller/api/store/product/CloudWarehouse.php
index eebcc1ce..bbc0146f 100644
--- a/app/controller/api/store/product/CloudWarehouse.php
+++ b/app/controller/api/store/product/CloudWarehouse.php
@@ -3,6 +3,7 @@
 namespace app\controller\api\store\product;
 
 use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\store\GeoStreet;
 use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\product\SpuRepository;
 use think\facade\Db;
@@ -45,18 +46,23 @@ class CloudWarehouse extends BaseController
      */
     public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '')
     {
-
-        $cloud_where['street_code']=$street_code;
-        $cloud_where['status']=1;
+        $query = Db::name('cloud_product')->where('status', 1);
+        if (!empty($street_code)) {
+            $location = GeoStreet::where('street_code', $street_code)->field('lng,lat')->find();
+            if (!empty($location)) {
+                $merIds = (new MerchantDao())->getValidMerchantByDistance($location['lat'], $location['lng']);
+                if (!empty($merIds)) {
+                    $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');
         }
         if($cate_id>0){
-            $cloud_where['cate_id']=$cate_id;
+            $query->where('cate_id', $cate_id);
         }
-        $cloud_product_arr = Db::name('cloud_product')
-            ->where($cloud_where)
-            ->where(function($query){
+        $cloud_product_arr = $query->where(function($query){
                 $query->whereOr('mer_labels', '')
                 ->whereOr('mer_labels',',5,');
             })->page($page)->field('product_id,mer_labels')->select();
@@ -75,9 +81,7 @@ class CloudWarehouse extends BaseController
         if (!$cloud_product) {
             return app('json')->success(['count' => 0, 'list' => []]);
         }
-        $count = Db::name('cloud_product')
-        ->where($cloud_where)
-        ->where(function($query){
+        $count = $query->where(function($query){
             $query->whereOr('mer_labels', '')
             ->whereOr('mer_labels',',5,');
         })->count();
diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php
index 47388952..31cd4c4f 100644
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@@ -10,6 +10,8 @@
 // +----------------------------------------------------------------------
 namespace app\controller\api\store\product;
 
+use app\common\dao\system\merchant\MerchantDao;
+use app\common\model\store\GeoStreet;
 use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\store\StoreCategoryRepository;
@@ -62,23 +64,38 @@ class StoreSpu extends BaseController
             'street_id',
             'category_id',
             'type_code',
-            'village_id'
+            'village_id',
+            'location'
         ]);
         if ($where['type_id']||$where['type_code']) {
             $arr = ['status' => 1, 'mer_state' => 1, 'is_del' => 0];
-            if ($where['street_id']) {
-                $arr['street_id'] = $where['street_id'];
+            $query = Merchant::where($arr);
+            if ($where['location']) {
+                [$lat, $lng] = explode(',', $where['location']);
+                $merIds = (new MerchantDao())->getValidMerchantByDistance($lat, $lng);
+                if (!empty($merIds)) {
+                    $query->whereIn('mer_id', $merIds);
+                }
+            }
+            if ($where['street_id'] && empty($where['location'])) {
+                $location = GeoStreet::where('street_code', $where['street_id'])->field('lng,lat')->find();
+                if (!empty($location)) {
+                    $merIds = (new MerchantDao())->getValidMerchantByDistance($location['lat'], $location['lng']);
+                    if (!empty($merIds)) {
+                        $query->whereIn('mer_id', $merIds);
+                    }
+                }
             }
             if ($where['village_id']) {
-                $arr['village_id'] = $where['village_id'];
+                $query->where('village_id', $where['village_id']);
             }
             if($where['type_code']){
                 $mer_type_id=Db::name('merchant_type')->where('type_code',$where['type_code'])->value('mer_type_id');
                 if($mer_type_id){
-                    $where['type_id'] = $mer_type_id;
+                    $query->where('type_id', $mer_type_id);
                 }
             }
-            $where['mer_ids'] = Merchant::getInstance()->whereIn('type_id', explode(',', $where['type_id']))->where($arr)->column('mer_id');
+            $where['mer_ids'] = $query->whereIn('type_id', explode(',', $where['type_id']))->column('mer_id');
         }
 
         unset($where['type_id'], $where['street_id'],$where['type_code'],$where['village_id']);