liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- get district code from coordinate if necessary for ebai store.

Browse Source
This commit is contained in:
gazebo
2018-11-13 10:21:03 +08:00
parent 84f79249c8
commit 993ce31b4d
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/partner/purchase/ebai/store.go
View File

@@ -110,13 +110,6 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
retVal.Tel2 = tel2 retVal.Tel2 = tel2
} }
db := dao.GetDB()
if city, err2 := dao.GetPlaceByName(db, utils.Interface2String(result["city"]), model.PlaceLevelCity, 0); err2 == nil {
retVal.CityCode = city.Code
if district, err2 := dao.GetPlaceByName(db, utils.Interface2String(result["county"]), model.PlaceLevelDistrict, city.Code); err2 == nil {
retVal.DistrictCode = district.Code
}
}
lng := utils.MustInterface2Float64(result["longitude"]) lng := utils.MustInterface2Float64(result["longitude"])
lat := utils.MustInterface2Float64(result["latitude"]) lat := utils.MustInterface2Float64(result["latitude"])
if utils.Interface2String(result["coord_type"]) == ebaiapi.CoordTypeBaidu { if utils.Interface2String(result["coord_type"]) == ebaiapi.CoordTypeBaidu {
@@ -128,8 +121,23 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
retVal.Lng = jxutils.StandardCoordinate2Int(lng) retVal.Lng = jxutils.StandardCoordinate2Int(lng)
retVal.Lat = jxutils.StandardCoordinate2Int(lat) retVal.Lat = jxutils.StandardCoordinate2Int(lat)
db := dao.GetDB()
if city, err2 := dao.GetPlaceByName(db, utils.Interface2String(result["city"]), model.PlaceLevelCity, 0); err2 == nil {
retVal.CityCode = city.Code
districtName := utils.Interface2String(result["county"])
if retVal.CityCode != 0 && districtName != "" {
if district, err2 := dao.GetPlaceByName(db, utils.Interface2String(result["county"]), model.PlaceLevelDistrict, city.Code); err2 == nil {
retVal.DistrictCode = district.Code
}
}
if retVal.DistrictCode == 0 {
retVal.DistrictCode = api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat)
if district, err := dao.GetPlaceByCode(db, retVal.DistrictCode); err == nil {
retVal.CityCode = district.ParentCode
}
}
}
retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0)) retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0))
retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"]) retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"])