liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-05-20 11:56:19 +08:00
parent c056a682d7
commit 2d0b50568e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/jxstore/cms/store.go
View File

@@ -4557,15 +4557,16 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
t1.* t1.*
FROM ( FROM (
` `
sqlParams = append(sqlParams, lng, lat, lng, lat)
if vendorID == -1 { if vendorID == -1 {
//sql += sqlEbai + ` UNION` //sql += sqlEbai + ` UNION`
if lng1 > 0 { if lng1 > 0 {
sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" 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 { if lng1 > 0 {
sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" 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 += sqlJD + ` UNION`
sql += sqlMT sql += sqlMT
@@ -4574,13 +4575,13 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
case model.VendorIDJD: case model.VendorIDJD:
if lng1 > 0 { if lng1 > 0 {
sqlJD += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" 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 sql += sqlJD
case model.VendorIDMTWM: case model.VendorIDMTWM:
if lng1 > 0 { if lng1 > 0 {
sqlMT += " AND b.lng >= ? AND b.lat >= ? AND b.lng <= ? AND b.lat <= ?" 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 sql += sqlMT
case model.VendorIDEBAI: case model.VendorIDEBAI:
@@ -4628,8 +4629,6 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
sql += ` sql += `
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
pageSize = jxutils.FormalizePageSize(pageSize)
offset = jxutils.FormalizePageOffset(offset)
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer func() { defer func() {

2
controllers/net_spider.go
View File

@@ -185,8 +185,6 @@ func (c *NetSpiderController) QueryPageSkus() {
_, lat2 = jxutils.ConvertDistanceToLogLat(lng, lat, float64(params.Radius), 0) _, lat2 = jxutils.ConvertDistanceToLogLat(lng, lat, float64(params.Radius), 0)
lng1 = lng - (lng2 - lng) lng1 = lng - (lng2 - lng)
lat1 = lat - (lat2 - lat) 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) 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 return retVal, "", err