From ad74e90c1975b63d7d32369a2aa3fedaea10b64e Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Wed, 19 May 2021 15:27:27 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store.go | 129 ++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 61 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0f1a8f0e6..036155d73 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4226,7 +4226,7 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo db.Db = orm.NewOrmUsingDB("c4beta") 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, - bak_info city_name, goods_number sku_count + bak_info city_name, goods_number sku_count, lat, lng, district_name FROM jingdong_showd ` sqlEbai := ` @@ -4234,7 +4234,7 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo ` 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, - '' city_name, goods_number sku_count + city_name, goods_number sku_count, lat, lng, district_name FROM meituan_showd ` sql := ` @@ -4292,6 +4292,10 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) 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 += ` 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 { pagedInfo = &model.PagedInfo{ TotalCount: dao.GetLastTotalRowCount2(db, txDB), - //Data: shopList, + Data: shopList, } dao.Commit(db, txDB) - var newShopList []*dao.PageShopWithPlaceName - task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(*dao.PageShopWithPlaceName) - if v.Address != "" && v.CityName != "" { - result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) - 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 = []*dao.PageShopWithPlaceName{v} - } - } else { - retVal = []*dao.PageShopWithPlaceName{v} - } - retVal = []*dao.PageShopWithPlaceName{v} - } else { - retVal = []*dao.PageShopWithPlaceName{v} - } - return retVal, err - }, shopList) - tasksch.HandleTask(task, nil, true).Run() - result, _ := task.GetResult(0) - for _, v := range result { - newShopList = append(newShopList, v.(*dao.PageShopWithPlaceName)) - } - pagedInfo.Data = newShopList + //var newShopList []*dao.PageShopWithPlaceName + //task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // v := batchItemList[0].(*dao.PageShopWithPlaceName) + // if v.Address != "" && v.CityName != "" { + // result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) + // 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 = []*dao.PageShopWithPlaceName{v} + // } + // } else { + // retVal = []*dao.PageShopWithPlaceName{v} + // } + // retVal = []*dao.PageShopWithPlaceName{v} + // } else { + // retVal = []*dao.PageShopWithPlaceName{v} + // } + // return retVal, err + // }, shopList) + //tasksch.HandleTask(task, nil, true).Run() + //result, _ := task.GetResult(0) + //for _, v := range result { + // newShopList = append(newShopList, v.(*dao.PageShopWithPlaceName)) + //} + //pagedInfo.Data = newShopList } else { dao.Rollback(db, txDB) } @@ -4370,7 +4374,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string ) db.Db = orm.NewOrmUsingDB("c4beta") 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 LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid ` @@ -4378,7 +4383,8 @@ 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, '' 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 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 { sql += " AND t2.code = ?" sqlParams = append(sqlParams, cityCode) + } + if radius > 0 { + } if sortType != 0 { switch math.Abs(float64(sortType)) { @@ -4443,39 +4452,37 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string panic(r) } }() - fmt.Println(sql) - fmt.Println(sqlParams) if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil { pagedInfo = &model.PagedInfo{ TotalCount: dao.GetLastTotalRowCount2(db, txDB), - //Data: shopList, + Data: results, } dao.Commit(db, txDB) - if radius > 0 { - var newShopList []*QueryPageSkusResult - task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(*QueryPageSkusResult) - if radius > 0 { - result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) - distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat) - if utils.Float64TwoInt(math.Round(distance*1000)) < radius { - retVal = []*QueryPageSkusResult{v} - } - } else { - retVal = []*QueryPageSkusResult{v} - } - return retVal, err - }, results) - tasksch.HandleTask(task, nil, true).Run() - result, _ := task.GetResult(0) - for _, v := range result { - newShopList = append(newShopList, v.(*QueryPageSkusResult)) - } - pagedInfo.Data = newShopList - } else { - pagedInfo.Data = results - } + //if radius > 0 { + // var newShopList []*QueryPageSkusResult + // task := tasksch.NewParallelTask("", tasksch.NewParallelConfig().SetIsContinueWhenError(true), jxcontext.AdminCtx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // v := batchItemList[0].(*QueryPageSkusResult) + // if radius > 0 { + // result, _ := api.AutonaviAPI.GetCoordinateFromAddressAll(v.Address, v.CityName) + // distance := jxutils.EarthDistance(lng, lat, result.Lng, result.Lat) + // if utils.Float64TwoInt(math.Round(distance*1000)) < radius { + // retVal = []*QueryPageSkusResult{v} + // } + // } else { + // retVal = []*QueryPageSkusResult{v} + // } + // return retVal, err + // }, results) + // tasksch.HandleTask(task, nil, true).Run() + // result, _ := task.GetResult(0) + // for _, v := range result { + // newShopList = append(newShopList, v.(*QueryPageSkusResult)) + // } + // pagedInfo.Data = newShopList + //} else { + // pagedInfo.Data = results + //} } else { dao.Rollback(db, txDB) }