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-19 16:17:09 +08:00
parent ad74e90c19
commit be9c90488f
2 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4373,9 +4373,10 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
results []*QueryPageSkusResult
)
db.Db = orm.NewOrmUsingDB("c4beta")
sqlParams := []interface{}{}
sqlJD := `
SELECT 0 vendor_id, b.orgcode org_code, a.wmpoiid store_id, b.name store_name, a.Base sku_id, a.name sku_name, a.month_saled month_sales,
a.basic_price, b.address, '' parameter, b.bak_info city_name
a.basic_price, b.address, '' parameter, b.bak_info city_name, getDistance(?, ?,b.lng, b.lat) distance
FROM jingdong_foodlist a
LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid
`
@@ -4384,7 +4385,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
`
sqlMT := `
SELECT 1 vendor_id, '' org_code, a.wmpoiid store_id, b.name store_name, '' sku_id, a.name sku_name, a.month_saled month_sales,
a.min_price basic_price, b.address, a.unit parameter, a.city_name
a.min_price basic_price, b.address, a.unit parameter, b.city_name, getDistance(?, ?, b.lng, b.lat) distance
FROM meituan_foodlist a
LEFT JOIN meituan_showd b ON a.wmpoiid = b.wmpoiid
`
@@ -4397,6 +4398,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
sql += sqlJD + ` UNION`
sql += sqlMT
//sql += sqlEbai + ` UNION`
sqlParams = append(sqlParams, lng, lat, lng, lat)
} else {
switch vendorID {
case model.VendorIDJD:
@@ -4406,13 +4408,13 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
case model.VendorIDEBAI:
sql += sqlEbai
}
sqlParams = append(sqlParams, lng, lat)
}
sql += `
)t1
LEFT JOIN place t2 ON t2.name = t1.city_name
WHERE 1 = 1
`
sqlParams := []interface{}{}
if keyword != "" {
keywordLike := "%" + keyword + "%"
sql += " AND t1.sku_name LIKE ?"
@@ -4427,7 +4429,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
sqlParams = append(sqlParams, cityCode)
}
if radius > 0 {
sql += " AND ROUND(t1.distance * 1000) < ?"
sqlParams = append(sqlParams, radius)
}
if sortType != 0 {
switch math.Abs(float64(sortType)) {