From 262f121cb8324b9afc731c82219d0fe5e23fee60 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 12 Jun 2019 17:22:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8EDeliveryRange=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store.go | 2 +- business/partner/purchase/jd/store.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 24139cc20..d00406139 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -320,7 +320,7 @@ func EbaiDeliveryRegion2Jx(deliveryRegion interface{}) string { func JxDeliveryRegion2Ebai(store *model.Store) (deliveryRegion interface{}) { rangeStr := strings.Trim(store.DeliveryRange, ";") if store.DeliveryRangeType == model.DeliveryRangeTypeRadius { - if utils.Str2Int64(store.DeliveryRange) > 100 { // todo 如果小于100米，表示禁用，不更新 + if utils.Str2Int64WithDefault(store.DeliveryRange, 0) > 100 { // todo 如果小于100米，表示禁用，不更新 rangeStr = jxutils.GetPolygonFromCircleStr(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat), utils.Str2Float64(store.DeliveryRange), 8) } else { rangeStr = "" diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 162ae91fc..34603eb9c 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -137,7 +137,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if store.DeliveryRangeType == model.DeliveryRangeTypePolygon { params["coordinatePoints"] = store.DeliveryRange } else { - params["deliveryRangeRadius"] = utils.Str2Int64(store.DeliveryRange) + params["deliveryRangeRadius"] = utils.Str2Int64WithDefault(store.DeliveryRange, 0) } } openTime2 := JxOperationTime2JdOperationTime(store.OpenTime2)