From 02c4ad310ea3c770f692961ea1ae42acc4619363 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 12 May 2021 17:22:44 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go | 8 ++++----
 controllers/net_spider.go     | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 4673c42a0..d7037f2ea 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -4362,7 +4362,7 @@ type QueryPageSkusResult struct {
 	CityName string `json:"cityName"`
 }
 
-func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreID, keyword string, lng, lat float64, radius, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
+func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string, keyword string, lng, lat float64, radius, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	var (
 		db      = dao.GetDB()
 		results []*QueryPageSkusResult
@@ -4410,9 +4410,9 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreID, keyword
 		sql += " AND t1.sku_name LIKE ?"
 		sqlParams = append(sqlParams, keywordLike)
 	}
-	if vendorStoreID != "" {
-		sql += " AND t1.store_id LIKE ?"
-		sqlParams = append(sqlParams, "%"+vendorStoreID+"%")
+	if len(vendorStoreIDs) > 0 {
+		sql += " AND t1.store_id IN (" + dao.GenQuestionMarks(len(vendorStoreIDs)) + ")"
+		sqlParams = append(sqlParams, vendorStoreIDs)
 	}
 	sql += `
 		LIMIT ? OFFSET ?
diff --git a/controllers/net_spider.go b/controllers/net_spider.go
index 134d07251..99f08a21b 100644
--- a/controllers/net_spider.go
+++ b/controllers/net_spider.go
@@ -154,7 +154,7 @@ func (c *NetSpiderController) RefreshPageShops() {
 // @Description  参考信息，商品搜索
 // @Param	token			header		string	true	"认证token"
 // @Param	vendorID		query		int		false	"平台ID"
-// @Param	vendorStoreID	query		string	false	"门店ID"
+// @Param	vendorStoreIDs	query		string	false	"门店ID"
 // @Param	keyword			query		string	false	"关键字"
 // @Param	lng				query		string	false	"关注点经度"
 // @Param	lat				query		string	false	"关注点纬度"
@@ -166,7 +166,9 @@ func (c *NetSpiderController) RefreshPageShops() {
 // @router /QueryPageSkus [get]
 func (c *NetSpiderController) QueryPageSkus() {
 	c.callQueryPageSkus(func(params *tNetspiderQueryPageSkusParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, params.VendorStoreID, params.Keyword, utils.Str2Float64WithDefault(params.Lng, 0), utils.Str2Float64WithDefault(params.Lat, 0), params.Radius, params.Offset, params.PageSize)
+		var vendorStoreIDs []string
+		jxutils.Strings2Objs(params.VendorStoreIDs, &vendorStoreIDs)
+		retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, vendorStoreIDs, params.Keyword, utils.Str2Float64WithDefault(params.Lng, 0), utils.Str2Float64WithDefault(params.Lat, 0), params.Radius, params.Offset, params.PageSize)
 		return retVal, "", err
 	})
 }