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-11 16:26:59 +08:00
parent 20718f4e9d
commit deece80b16
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
business/model/dao/page_store.go
View File

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