From 833b7bcbed580ece683e9a20016f2155d92edd64 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 3 Feb 2020 20:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=EF=BC=8C=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=85=8D=E9=80=81=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store.go | 6 +++--- business/partner/purchase/jd/store.go | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index d92b0ed58..8f88b77a7 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -408,9 +408,9 @@ func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} { params["longitude"] = jxutils.IntCoordinate2Standard(store.Lng) params["latitude"] = jxutils.IntCoordinate2Standard(store.Lat) params["coord_type"] = ebaiapi.CoordTypeAutonavi - if deliveryRegion := JxDeliveryRegion2Ebai(&store.Store); deliveryRegion != nil { - params["delivery_region"] = deliveryRegion - } + // if deliveryRegion := JxDeliveryRegion2Ebai(&store.Store); deliveryRegion != nil { + // params["delivery_region"] = deliveryRegion + // } if store.ProvinceID != 0 { params["province"] = store.ProvinceID } diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index e4c9fdfd1..4a9b73857 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -156,7 +156,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { storeParams.StationAddress = store.Address - storeParams.DeliveryRangeType = store.DeliveryRangeType storeParams.CoordinateType = jdapi.CoordinateTypeAutonavi // 一直用高德 storeParams.Lng = jxutils.IntCoordinate2Standard(store.Lng) storeParams.Lat = jxutils.IntCoordinate2Standard(store.Lat) @@ -166,11 +165,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if store.JdDistrictCode != 0 { storeParams.County = store.JdDistrictCode } - if store.DeliveryRangeType == model.DeliveryRangeTypePolygon { - storeParams.CoordinatePoints = store.DeliveryRange - } else { - storeParams.DeliveryRangeRadius = int(utils.Str2Int64WithDefault(store.DeliveryRange, 0)) - } + // storeParams.DeliveryRangeType = store.DeliveryRangeType + // if store.DeliveryRangeType == model.DeliveryRangeTypePolygon { + // storeParams.CoordinatePoints = store.DeliveryRange + // } else { + // storeParams.DeliveryRangeRadius = int(utils.Str2Int64WithDefault(store.DeliveryRange, 0)) + // } } if specialDistrictMap[storeParams.County] != 0 { storeParams.City = storeParams.County @@ -183,7 +183,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin _, storeParams.CloseStatus = JxStoreStatus2JdStatus(jxutils.MergeStoreStatus(store.Status, store.JdStoreStatus)) } fillOpTimeParams(storeParams, store.GetOpTimeList()) - globals.SugarLogger.Debug(utils.Format4Output(storeParams, false)) + // globals.SugarLogger.Debug(utils.Format4Output(storeParams, false)) errList := errlist.New() if globals.EnableJdStoreWrite { errList.AddErr(a.UpdateStoreInfo4Open2(storeParams, modifyCloseStatus))