diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 03d65c4b6..e03524eed 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4528,7 +4528,7 @@ type QueryPageSkusResult struct { CityCode int `json:"cityCode"` } -func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string, keyword string, cityCode int, lng, lat, lng2, lat2 float64, radius, sortType, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { +func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string, keyword string, cityCode int, lng, lat, lng1, lat1, lng2, lat2 float64, radius, sortType, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { var ( db = dao.GetDB() results []*QueryPageSkusResult @@ -4557,30 +4557,31 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string t1.* FROM ( ` + sqlParams = append(sqlParams, lng, lat, lng, lat) if vendorID == -1 { //sql += sqlEbai + ` UNION` - if lng > 0 { + if lng1 > 0 { sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } - if lng > 0 { + if lng1 > 0 { sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlJD + ` UNION` sql += sqlMT } else { switch vendorID { case model.VendorIDJD: - if lng > 0 { + if lng1 > 0 { sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlJD case model.VendorIDMTWM: - if lng > 0 { + if lng1 > 0 { sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlMT case model.VendorIDEBAI: diff --git a/controllers/net_spider.go b/controllers/net_spider.go index 6a40c494f..62ed7b586 100644 --- a/controllers/net_spider.go +++ b/controllers/net_spider.go @@ -188,7 +188,7 @@ func (c *NetSpiderController) QueryPageSkus() { offset = 0 pageSize = model.UnlimitedPageSize } - retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, vendorStoreIDs, params.Keyword, params.CityCode, lng1, lat1, lng2, lat2, params.Radius, params.SortType, offset, pageSize) + retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, vendorStoreIDs, params.Keyword, params.CityCode, lng, lat, lng1, lat1, lng2, lat2, params.Radius, params.SortType, offset, pageSize) return retVal, "", err }) }