diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index c620a586c..c3531aad6 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -8,6 +8,8 @@ import ( "strings" "time" + "git.rosy.net.cn/baseapi/platformapi/baidunavi" + "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai" "git.rosy.net.cn/baseapi/utils/errlist" @@ -585,25 +587,21 @@ func GetCityBankBranches(ctx *jxcontext.Context, cityCode int, bankCode string) } // GetSToUWalkingDistance 获取商家与用户间步行距离 -//func GetSToUWalkingDistance(sLng, sLat, uLng, uLat float64) (distance float64, err error) { -// var ( -// coords []*baidunavi.Coordinate -// sCoord *baidunavi.Coordinate -// uCoord *baidunavi.Coordinate -// ) -// coords = append(coords, &baidunavi.Coordinate{ -// Lng: sLng, -// Lat: sLat, -// }, &baidunavi.Coordinate{ -// Lat: uLng, -// Lng: uLat, -// }) -// if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil { -// if len(coords) > 0 { -// //distance=baidunavi. -// //todo 修改为百度地图 -// return jxutils.WalkingDistance(sLng, sLat, uLng, uLat), nil -// } -// } -// return 0, err -//} +func GetSToURidingDistance(sLng, sLat, uLng, uLat float64) (stepInfo interface{}, err error) { + var coords []*baidunavi.Coordinate + coords = append(coords, &baidunavi.Coordinate{ + Lng: sLng, + Lat: sLat, + }, &baidunavi.Coordinate{ + Lat: uLat, + Lng: uLng, + }) + if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil { + if len(coords) > 0 { + if stepInfo, err = api.BaiDuNaviAPI.DirectionLiteRide(coords); err == nil && stepInfo.(string) != "" { + return stepInfo, nil + } + } + } + return 0, err +} diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 89b13bfff..701856114 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -395,7 +395,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b sqlParams = append(sqlParams, pageSize, offset) txDB, _ := dao.Begin(db) defer dao.Commit(db, txDB) + + globals.SugarLogger.Debugf("store_sku 检查:sql:%s sqlParams:%s", sql, sqlParams) + if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil { + globals.SugarLogger.Debugf(" 检查参数:SkuNames:%s", utils.Format4Output(SkuNames, false)) skuNamesInfo = &dao.StoreSkuNamesInfo2{ TotalCount: dao.GetLastTotalRowCount2(db, txDB), } @@ -437,6 +441,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b sqlParams2 = append(sqlParams2, status) } if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil { + globals.SugarLogger.Debugf(" 检查参数:skus:%s", utils.Format4Output(skus, false)) v.Skus = skus } return retVal, err diff --git a/business/model/sku.go b/business/model/sku.go index 491cb1f61..6cf2ff637 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -23,8 +23,8 @@ const ( const ( SkuStatusDeleted = -1 // 商品删除 - SkuStatusDontSale = 0 // 商品正常 - SkuStatusNormal = 1 // 商品不可售 + SkuStatusDontSale = 0 // 商品不可售 + SkuStatusNormal = 1 // 商品正常 ) const ( diff --git a/conf/app.conf b/conf/app.conf index 4b325d339..8257bc917 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -26,7 +26,8 @@ tiktokShopAppSecret = "c397aa9f-3927-47c4-8cfe-4d84e02602e0" autonaviKey = "ef64f638f31e05cb7bde28790f7309fe" -baidunaviAK = "eL94zToVOdGDTkNQxV8dnEQ1ZRcB2UKb" +# baidunaviAK = "eL94zToVOdGDTkNQxV8dnEQ1ZRcB2UKb" +baidunaviAK = "wW2AwzPS0hdaPy5QLalzso7ARX5uYZtZ" baidunaviSK = "ZG0OOpOsOVURUwAkkmoHQFKRCbzn0zGb" disableElm = true diff --git a/controllers/cms.go b/controllers/cms.go index e9c9b37cc..6e6fa2eb6 100644 --- a/controllers/cms.go +++ b/controllers/cms.go @@ -360,8 +360,8 @@ func (c *CmsController) GetVendorOrgCodeInfo() { }) } -// @Title 得到商家与用户之间步行距离 -// @Description 得到商家与用户之间步行距离 +// @Title 得到商家与用户之间骑行路线规划 +// @Description 得到商家与用户之间骑行路线规划 // @Param token header string true "认证token" // @Param sLng query int true "商家经度" // @Param sLat query int true "商家纬度" @@ -369,9 +369,14 @@ func (c *CmsController) GetVendorOrgCodeInfo() { // @Param uLat query int true "用户纬度" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /GetSToUWalkingDistance [get] -func (c *CmsController) GetSToUWalkingDistance() { - c.callGetSToUWalkingDistance(func(params *tCmsGetSToUWalkingDistanceParams) (interface{}, string, error) { - return nil, "", nil +// @router /GetSToURidingDistance [get] +func (c *CmsController) GetSToURidingDistance() { + c.callGetSToURidingDistance(func(params *tCmsGetSToURidingDistanceParams) (retVal interface{}, errCode string, err error) { + sLng := jxutils.IntCoordinate2Standard(params.SLng) + sLat := jxutils.IntCoordinate2Standard(params.SLat) + uLng := jxutils.IntCoordinate2Standard(params.ULng) + uLat := jxutils.IntCoordinate2Standard(params.ULat) + retVal, err = cms.GetSToURidingDistance(sLng, sLat, uLng, uLat) + return retVal, "", err }) } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 0bdaa32f5..5063a37a1 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -450,8 +450,8 @@ func init() { web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:CmsController"], web.ControllerComments{ - Method: "GetSToUWalkingDistance", - Router: `/GetSToUWalkingDistance`, + Method: "GetSToURidingDistance", + Router: `/GetSToURidingDistance`, AllowHTTPMethods: []string{"get"}, MethodParams: param.Make(), Filters: nil,