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-12 17:19:48 +08:00
parent 54e2a0ffb9
commit baffc6750f
2 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4357,18 +4357,19 @@ type QueryPageSkusResult struct {
RealTimePrice string `json:"realTimePrice"` //促销价 RealTimePrice string `json:"realTimePrice"` //促销价
BasicPrice string `json:"basicPrice"` // 原价 BasicPrice string `json:"basicPrice"` // 原价
VendorID int `orm:"column(vendor_id)" json:"vendorID"`
Address string `json:"address"` Address string `json:"address"`
CityName string `json:"cityName"` CityName string `json:"cityName"`
} }
func QueryPageSkus(ctx *jxcontext.Context, vendorID int, keyword string, lng, lat float64, radius, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreID, keyword string, lng, lat float64, radius, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
results []*QueryPageSkusResult results []*QueryPageSkusResult
) )
//db.Db = orm.NewOrmUsingDB("c4beta") db.Db = orm.NewOrmUsingDB("c4beta")
sqlJD := ` sqlJD := `
SELECT 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, 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, 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
` `
@@ -4376,7 +4377,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, keyword string, lng, la
` `
sqlMT := ` sqlMT := `
SELECT a.wmpoiid store_id, b.name store_name, a.name sku_name, a.month_saled month_sales, a.min_price basic_price, b.address, a.unit parameter SELECT 1 vendor_id, a.wmpoiid store_id, b.name store_name, a.name sku_name, a.month_saled month_sales, a.min_price basic_price, b.address, a.unit parameter
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
` `
@@ -4409,6 +4410,10 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, keyword string, lng, la
sql += " AND t1.sku_name LIKE ?" sql += " AND t1.sku_name LIKE ?"
sqlParams = append(sqlParams, keywordLike) sqlParams = append(sqlParams, keywordLike)
} }
if vendorStoreID != "" {
sql += " AND t1.store_id LIKE ?"
sqlParams = append(sqlParams, "%"+vendorStoreID+"%")
}
sql += ` sql += `
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
@@ -4422,33 +4427,39 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, keyword string, lng, la
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: shopList,
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
var newShopList []*QueryPageSkusResult if radius > 0 {
task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, var newShopList []*QueryPageSkusResult
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx,
v := batchItemList[0].(*QueryPageSkusResult) func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
if radius > 0 { v := batchItemList[0].(*QueryPageSkusResult)
result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) if radius > 0 {
distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat) result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName)
if utils.Float64TwoInt(math.Round(distance*1000)) < radius { distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat)
if utils.Float64TwoInt(math.Round(distance*1000)) < radius {
retVal = []*QueryPageSkusResult{v}
}
} else {
retVal = []*QueryPageSkusResult{v} retVal = []*QueryPageSkusResult{v}
} }
} else { return retVal, err
retVal = []*QueryPageSkusResult{v} }, results)
} tasksch.HandleTask(task, nil, true).Run()
return retVal, err result, _ := task.GetResult(0)
}, results) for _, v := range result {
tasksch.HandleTask(task, nil, true).Run() newShopList = append(newShopList, v.(*QueryPageSkusResult))
result, _ := task.GetResult(0) }
for _, v := range result { pagedInfo.Data = newShopList
newShopList = append(newShopList, v.(*QueryPageSkusResult)) } else {
pagedInfo.Data = results
} }
pagedInfo.Data = newShopList
} else { } else {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
} }

3
controllers/net_spider.go
View File

@@ -154,6 +154,7 @@ func (c *NetSpiderController) RefreshPageShops() {
// @Description 参考信息，商品搜索 // @Description 参考信息，商品搜索
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param vendorID query int false "平台ID" // @Param vendorID query int false "平台ID"
// @Param vendorStoreID query string false "门店ID"
// @Param keyword query string false "关键字" // @Param keyword query string false "关键字"
// @Param lng query string false "关注点经度" // @Param lng query string false "关注点经度"
// @Param lat query string false "关注点纬度" // @Param lat query string false "关注点纬度"
@@ -165,7 +166,7 @@ func (c *NetSpiderController) RefreshPageShops() {
// @router /QueryPageSkus [get] // @router /QueryPageSkus [get]
func (c *NetSpiderController) QueryPageSkus() { func (c *NetSpiderController) QueryPageSkus() {
c.callQueryPageSkus(func(params *tNetspiderQueryPageSkusParams) (retVal interface{}, errCode string, err error) { c.callQueryPageSkus(func(params *tNetspiderQueryPageSkusParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, params.Keyword, utils.Str2Float64(params.Lng), utils.Str2Float64(params.Lat), params.Radius, params.Offset, params.PageSize) retVal, err = cms.QueryPageSkus(params.Ctx, params.VendorID, params.VendorStoreID, params.Keyword, utils.Str2Float64WithDefault(params.Lng, 0), utils.Str2Float64WithDefault(params.Lat, 0), params.Radius, params.Offset, params.PageSize)
return retVal, "", err return retVal, "", err
}) })
} }