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:49:27 +08:00
parent 24c264e39e
commit c056a682d7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4557,16 +4557,15 @@ 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, lng1, lat1, lng2, lat2) sqlParams = append(sqlParams, lng, lat, 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, lng1, lat1, lng2, lat2) sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2)
} }
sql += sqlJD + ` UNION` sql += sqlJD + ` UNION`
sql += sqlMT sql += sqlMT
@@ -4575,13 +4574,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, lng1, lat1, lng2, lat2) sqlParams = append(sqlParams, lng, lat, 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, lng1, lat1, lng2, lat2) sqlParams = append(sqlParams, lng, lat, lng1, lat1, lng2, lat2)
} }
sql += sqlMT sql += sqlMT
case model.VendorIDEBAI: case model.VendorIDEBAI: