This commit is contained in:
suyl
2021-05-11 16:26:59 +08:00
parent 20718f4e9d
commit deece80b16

View File

@@ -3,6 +3,8 @@ package dao
import (
"fmt"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals/api"
)
@@ -207,25 +209,33 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
}
Commit(db, txDB)
var newShopList []*PageShopWithPlaceName
for _, v := range shopList {
if v.Address != "" && v.CityName != "" {
result, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, v.CityCode)
lng, lat := result.Lng, result.Lat
v.DistrictName = result.AdName
v.Lng, v.Lat = lng, lat
if lng1 > 0 {
if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) {
newShopList = append(newShopList, v)
task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*PageShopWithPlaceName)
if v.Address != "" && v.CityName != "" {
result, _ := api.AutonaviAPI.GetCoordinateFromAddressByPageAll(v.Address, v.CityCode)
lng, lat := result.Lng, result.Lat
v.DistrictName = result.AdName
v.Lng, v.Lat = lng, lat
if lng1 > 0 {
if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) {
retVal = []*PageShopWithPlaceName{v}
}
} else {
retVal = []*PageShopWithPlaceName{v}
}
retVal = []*PageShopWithPlaceName{v}
} else {
newShopList = append(newShopList, v)
retVal = []*PageShopWithPlaceName{v}
}
newShopList = append(newShopList, v)
} else {
newShopList = append(newShopList, v)
}
return retVal, err
}, shopList)
tasksch.HandleTask(task, nil, true).Run()
result, _ := task.GetResult(0)
for _, v := range result {
newShopList = append(newShopList, v.(*PageShopWithPlaceName))
}
pagedInfo.Data = shopList
pagedInfo.Data = newShopList
} else {
Rollback(db, txDB)
}