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"` 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 ( var (
db = dao.GetDB() db = dao.GetDB()
results []*QueryPageSkusResult results []*QueryPageSkusResult
@@ -4557,30 +4557,31 @@ 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 lng > 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, 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 <= ?" 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 += sqlJD + ` UNION`
sql += sqlMT sql += sqlMT
} else { } else {
switch vendorID { switch vendorID {
case model.VendorIDJD: case model.VendorIDJD:
if lng > 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, lng2, lat2) sqlParams = append(sqlParams, lng1, lat1, lng2, lat2)
} }
sql += sqlJD sql += sqlJD
case model.VendorIDMTWM: case model.VendorIDMTWM:
if lng > 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, lng2, lat2) sqlParams = append(sqlParams, lng1, lat1, lng2, lat2)
} }
sql += sqlMT sql += sqlMT
case model.VendorIDEBAI: case model.VendorIDEBAI:

2
controllers/net_spider.go
View File

@@ -188,7 +188,7 @@ func (c *NetSpiderController) QueryPageSkus() {
offset = 0 offset = 0
pageSize = model.UnlimitedPageSize 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 return retVal, "", err
}) })
} }