From 7c9e089b708148421dd43ebb0862e84c2544f932 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 18 May 2023 23:09:03 +0800
Subject: [PATCH 1/2] =?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/controller/api/Common.php | 8 ++++++++
 route/api.php                 | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/controller/api/Common.php b/app/controller/api/Common.php
index 561464df..02938c65 100644
--- a/app/controller/api/Common.php
+++ b/app/controller/api/Common.php
@@ -491,4 +491,12 @@ class Common extends BaseController
         $select=Db::name('geo_village')->where('street_code',$street_code)->field('village_id id,village_code code,village_name name')->select();
         return app('json')->success($select);
     }
+
+    //获取云店铺
+    public function get_cloud_shop($street_code){
+        $find=DB::name('merchant')->alias('m')->where('m.type_id',11)->where('m.is_del',0)->where('m.status',1)
+        ->join('merchant_address a','a.mer_id=m.mer_id and a.street_id='.$street_code)
+        ->field('m.mer_id')->find();
+        return app('json')->success($find??[]);
+    }
 }
diff --git a/route/api.php b/route/api.php
index ab7aea78..0f21917c 100644
--- a/route/api.php
+++ b/route/api.php
@@ -574,6 +574,7 @@ Route::group('api/', function () {
     Route::get('city/get_area', 'api.Common/get_area');
     Route::get('city/get_street', 'api.Common/get_street');
     Route::get('city/get_village', 'api.Common/get_village');
+    Route::get('city/get_cloud_shop', 'api.Common/get_cloud_shop');
     //经纬度转位置信息
     Route::get('lbs/geocoder', 'api.Common/lbs_geocoder');
     //获取支付宝支付链接

From beb9d7eb776f734e49c985332f413e7a95df44a3 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 19 May 2023 09:41:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=97=E9=81=93=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 9911f07c..15152888 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -53,7 +53,7 @@ class Merchant extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader']);
+        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader', 'street_id']);
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
     }