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 15:27:27 +08:00
parent 20004df8c5
commit ad74e90c19
1 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4226,7 +4226,7 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
db.Db = orm.NewOrmUsingDB("c4beta") db.Db = orm.NewOrmUsingDB("c4beta")
sqlJD := ` sqlJD := `
SELECT name, 0 vendor_id, wmpoiid vendor_store_id, orgcode org_code, 1 vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num, SELECT name, 0 vendor_id, wmpoiid vendor_store_id, orgcode org_code, 1 vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num,
bak_info city_name, goods_number sku_count bak_info city_name, goods_number sku_count, lat, lng, district_name
FROM jingdong_showd FROM jingdong_showd
` `
sqlEbai := ` sqlEbai := `
@@ -4234,7 +4234,7 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
` `
sqlMT := ` sqlMT := `
SELECT name, 1 vendor_id, wmpoiid vendor_store_id, '' org_code, 1 vendor_status, address, phone tel1, pj shop_score, REPLACE(REPLACE(month_sales_tip,'月售',''),'+','') recent_order_num, SELECT name, 1 vendor_id, wmpoiid vendor_store_id, '' org_code, 1 vendor_status, address, phone tel1, pj shop_score, REPLACE(REPLACE(month_sales_tip,'月售',''),'+','') recent_order_num,
'' city_name, goods_number sku_count city_name, goods_number sku_count, lat, lng, district_name
FROM meituan_showd FROM meituan_showd
` `
sql := ` sql := `
@@ -4292,6 +4292,10 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
sql += ")" sql += ")"
} }
if lng1 > 0 {
sql += " AND t1.lng >= ? AND t1.lat >= ? AND t1.lng <= ? AND t1.lat <= ?"
sqlParams = append(sqlParams, lng1, lat1, lng2, lat2)
}
sql += ` sql += `
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
@@ -4309,37 +4313,37 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
if err = dao.GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &shopList, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount2(db, txDB), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
//Data: shopList, Data: shopList,
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
var newShopList []*dao.PageShopWithPlaceName //var newShopList []*dao.PageShopWithPlaceName
task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, //task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*dao.PageShopWithPlaceName) // v := batchItemList[0].(*dao.PageShopWithPlaceName)
if v.Address != "" && v.CityName != "" { // if v.Address != "" && v.CityName != "" {
result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) // result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName)
lng, lat := result.Lng, result.Lat // lng, lat := result.Lng, result.Lat
v.DistrictName = result.AdName // v.DistrictName = result.AdName
v.Lng, v.Lat = lng, lat // v.Lng, v.Lat = lng, lat
if lng1 > 0 { // if lng1 > 0 {
if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) { // if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) {
retVal = []*dao.PageShopWithPlaceName{v} // retVal = []*dao.PageShopWithPlaceName{v}
} // }
} else { // } else {
retVal = []*dao.PageShopWithPlaceName{v} // retVal = []*dao.PageShopWithPlaceName{v}
} // }
retVal = []*dao.PageShopWithPlaceName{v} // retVal = []*dao.PageShopWithPlaceName{v}
} else { // } else {
retVal = []*dao.PageShopWithPlaceName{v} // retVal = []*dao.PageShopWithPlaceName{v}
} // }
return retVal, err // return retVal, err
}, shopList) // }, shopList)
tasksch.HandleTask(task, nil, true).Run() //tasksch.HandleTask(task, nil, true).Run()
result, _ := task.GetResult(0) //result, _ := task.GetResult(0)
for _, v := range result { //for _, v := range result {
newShopList = append(newShopList, v.(*dao.PageShopWithPlaceName)) // newShopList = append(newShopList, v.(*dao.PageShopWithPlaceName))
} //}
pagedInfo.Data = newShopList //pagedInfo.Data = newShopList
} else { } else {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
} }
@@ -4370,7 +4374,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
) )
db.Db = orm.NewOrmUsingDB("c4beta") db.Db = orm.NewOrmUsingDB("c4beta")
sqlJD := ` 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 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
FROM jingdong_foodlist a FROM jingdong_foodlist a
LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid
` `
@@ -4378,7 +4383,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
` `
sqlMT := ` 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, '' city_name 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
FROM meituan_foodlist a FROM meituan_foodlist a
LEFT JOIN meituan_showd b ON a.wmpoiid = b.wmpoiid LEFT JOIN meituan_showd b ON a.wmpoiid = b.wmpoiid
` `
@@ -4419,6 +4425,9 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
if cityCode > 0 { if cityCode > 0 {
sql += " AND t2.code = ?" sql += " AND t2.code = ?"
sqlParams = append(sqlParams, cityCode) sqlParams = append(sqlParams, cityCode)
}
if radius > 0 {
} }
if sortType != 0 { if sortType != 0 {
switch math.Abs(float64(sortType)) { switch math.Abs(float64(sortType)) {
@@ -4443,39 +4452,37 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
panic(r) panic(r)
} }
}() }()
fmt.Println(sql)
fmt.Println(sqlParams)
if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount2(db, txDB), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
//Data: shopList, Data: results,
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
if radius > 0 { //if radius > 0 {
var newShopList []*QueryPageSkusResult // var newShopList []*QueryPageSkusResult
task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, // task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*QueryPageSkusResult) // v := batchItemList[0].(*QueryPageSkusResult)
if radius > 0 { // if radius > 0 {
result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) // result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName)
distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat) // distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat)
if utils.Float64TwoInt(math.Round(distance*1000)) < radius { // if utils.Float64TwoInt(math.Round(distance*1000)) < radius {
retVal = []*QueryPageSkusResult{v} // retVal = []*QueryPageSkusResult{v}
} // }
} else { // } else {
retVal = []*QueryPageSkusResult{v} // retVal = []*QueryPageSkusResult{v}
} // }
return retVal, err // return retVal, err
}, results) // }, results)
tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
result, _ := task.GetResult(0) // result, _ := task.GetResult(0)
for _, v := range result { // for _, v := range result {
newShopList = append(newShopList, v.(*QueryPageSkusResult)) // newShopList = append(newShopList, v.(*QueryPageSkusResult))
} // }
pagedInfo.Data = newShopList // pagedInfo.Data = newShopList
} else { //} else {
pagedInfo.Data = results // pagedInfo.Data = results
} //}
} else { } else {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
} }