diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 42608fd59..842e5c7e4 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4557,15 +4557,16 @@ 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 lng1 > 0 { sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } if lng1 > 0 { sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlJD + ` UNION` sql += sqlMT @@ -4574,13 +4575,13 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string case model.VendorIDJD: if lng1 > 0 { sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlJD case model.VendorIDMTWM: if lng1 > 0 { sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" - sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2) + sqlParams = append(sqlParams, lng1, lat1, lng2, lat2) } sql += sqlMT case model.VendorIDEBAI: @@ -4628,8 +4629,6 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string sql += ` LIMIT ? OFFSET ? ` - pageSize = jxutils.FormalizePageSize(pageSize) - offset = jxutils.FormalizePageOffset(offset) sqlParams = append(sqlParams, pageSize, offset) txDB, _ := dao.Begin(db) defer func() { diff --git a/controllers/net_spider.go b/controllers/net_spider.go index 62ed7b586..f8a3c9e5f 100644 --- a/controllers/net_spider.go +++ b/controllers/net_spider.go @@ -185,8 +185,6 @@ func (c *NetSpiderController) QueryPageSkus() { _, lat2 = jxutils.ConvertDistanceToLogLat(lng, lat, float64(params.Radius), 0) lng1 = lng - (lng2 - lng) lat1 = lat - (lat2 - lat) - offset = 0 - pageSize = model.UnlimitedPageSize } 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