From 1cc643b42af813337c878d92f15f03cfb7fc81b7 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 17 Apr 2019 15:45:21 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=89=93=E5=BC=80=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=E8=BF=90=E8=90=A5=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/jxcallback/orderman/order.go | 8 ++++---- business/partner/delivery/delivery.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 6e9621909..55b20020e 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -259,15 +259,15 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.DaoDB) (err error) { globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) jxStoreID := jxutils.GetShowStoreIDFromOrder(order) - opNumStr := "2" + var opNumStr string if time.Now().Sub(order.OrderCreatedAt) < 48*time.Hour && order.VendorID != model.VendorIDEBAI { opNumStr = "" + } else { + // opNumStr = "2" } if jxStoreID == 0 { - if order.VendorID != model.VendorIDEBAI { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", opNumStr, order.VendorOrderID, order.VendorStoreID) - } + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", opNumStr, order.VendorOrderID, order.VendorStoreID) return nil } orderSkus := order.Skus diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index f6a90914b..225f68456 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -86,7 +86,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o deliveryFee = 650 } if lng == 0 || lat == 0 { - globals.SugarLogger.Warnf("calculateDeliveryFee 门店没有坐标信息 orderID:%s", order.VendorOrderID) + globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,门店:%d没有坐标信息", order.VendorOrderID, jxutils.GetSaleStoreIDFromOrder(order)) return 0, 0, fmt.Errorf("找不到门店:%d的坐标", jxutils.GetSaleStoreIDFromOrder(order)) } lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) @@ -99,7 +99,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o } else { distanceAddFee = jxutils.StandardPrice2Int(2 + 2*math.Ceil(distance-5)) if distance > warningDistance { - globals.SugarLogger.Infof("[运营]CalculateOrderDeliveryFee orderID:%s distance is %.3fkm", order.VendorOrderID, distance) + globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,距离%.3fkm太远,请检查门店坐标信息", order.VendorOrderID, distance) } } globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s", order.VendorOrderID) @@ -112,7 +112,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o } else { weightAddFee = jxutils.StandardPrice2Int(2.5 + 10 + 2*float64(jxutils.IntWeight2Float(order.Weight)-20)) if order.Weight > warningWeight { - globals.SugarLogger.Infof("[运营]CalculateOrderDeliveryFee orderID:%s weight is %d", order.VendorOrderID, order.Weight) + globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,重量:%dg太重,请检查商品属性", order.VendorOrderID, order.Weight) } }