From 68b5ec38b699d52c92e99040781b0c44e88c674a Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 30 Mar 2019 11:29:20 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=9F=A5=E4=B8=8D=E5=88=B0=E7=BE=8E?= =?UTF-8?q?=E5=9B=A2=E9=85=8D=E9=80=81=E4=BB=B7=E6=A0=BC=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/dada/waybill.go | 2 +- business/partner/delivery/delivery.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 649e2b80b..f52facc8c 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -21,7 +21,7 @@ import ( const ( maxOrderPrice = 6399 // 单位为分，达达最大价格，超过这个价格配送费会增加 maxOrderWeight = 5000 // 5公斤 - maxDiffFee2Mtps = 100 // 与美团配送最多差价 + maxDiffFee2Mtps = 150 // 与美团配送最多差价 ) var ( diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 27e3c4399..ed31c451d 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -47,9 +47,12 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o lng = jxutils.IntCoordinate2Standard(priceInfo.Lng) lat = jxutils.IntCoordinate2Standard(priceInfo.Lat) deliveryFee = int64(priceInfo.Price) - + if deliveryFee == 0 { + globals.SugarLogger.Warnf("CalculateOrderDeliveryFee 查不到美团配送价格 orderID:%s", order.VendorOrderID) + deliveryFee = 650 + } if lng == 0 || lat == 0 { - globals.SugarLogger.Warnf("calculateDeliveryFee can not calculate delivery fee for orderID:%s, because no coordinate info", order.VendorOrderID) + globals.SugarLogger.Warnf("calculateDeliveryFee 门店没有坐标信息 orderID:%s", order.VendorOrderID) return 0, 0, ErrStoreNoCoordinate } lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)