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:42:54 +08:00
parent ce6edfe6a5
commit 24c264e39e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: