From 811ddc82b31d3ed31323852f5b446cbdc855811d Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 7 Feb 2020 09:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=97=A8=E5=BA=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=EF=BC=8C=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B1=9F=E9=98=B4=E8=BF=99=E7=A7=8D=E5=8E=BF=E7=BA=A7=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jd/store.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 44a59d9ad..95d263fbb 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -81,14 +81,21 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo db := dao.GetDB() cityCode := result.City if cityCode != 0 { - if city, err2 := dao.GetPlaceByJdCode(db, cityCode); err2 == nil { - retVal.CityCode = city.Code - retVal.CityName = utils.Interface2String(result.CityName) - districtName := result.CountyName // 京东的市区号码与通用数据完全无法关联，只有通过名字来关联 - if retVal.CityCode != 0 && districtName != "" { - if district, err2 := dao.GetPlaceByName(db, districtName, 3, city.Code); err2 == nil { - retVal.DistrictCode = district.Code + if place, err2 := dao.GetPlaceByJdCode(db, cityCode); err2 == nil { + if place.Level == model.PlaceLevelCity { + retVal.CityCode = place.Code + retVal.CityName = utils.Interface2String(result.CityName) + districtName := result.CountyName // 京东的市区号码与通用数据完全无法关联，只有通过名字来关联 + if retVal.CityCode != 0 && districtName != "" { + if district, err2 := dao.GetPlaceByName(db, districtName, 3, place.Code); err2 == nil { + retVal.DistrictCode = district.Code + } } + } else if place.Level == model.PlaceLevelDistrict { + retVal.CityCode = place.ParentCode + retVal.DistrictCode = place.Code + } else { + globals.SugarLogger.Warnf("门店:%s的城市码:%d异常", vendorStoreID, cityCode) } } }