From 594a28b4933776bf32076b52758bc8b0c716badd Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 16 Feb 2019 17:33:39 +0800 Subject: [PATCH] - disable warning in updateOrderSkuOtherInfo when order is not fresh. --- business/jxcallback/orderman/order.go | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index ffc1f15f9..7c2230f40 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -22,19 +22,7 @@ type tStoreSkuBindAndVendorSkuID struct { UnitPrice int } -var ( - needAlarmStores map[int]int -) - func init() { - needAlarmStores = map[int]int{ - 100997: 1, - 100992: 1, - 100973: 1, - 100960: 1, - 100961: 1, - 100999: 1, - } } func (c *OrderManager) LoadPendingOrders() []*model.GoodsOrder { @@ -203,18 +191,18 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db orm. func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) { globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) jxStoreID := jxutils.GetShowStoreIDFromOrder(order) + opNumStr := "2" + if time.Now().Sub(order.OrderCreatedAt) < 48*time.Hour && order.VendorID != model.VendorIDEBAI { + opNumStr = "" + } if jxStoreID == 0 { if order.VendorID != model.VendorIDEBAI { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", opNumStr, order.VendorOrderID, order.VendorStoreID) } return nil } orderSkus := order.Skus - opNum := "2" - if order.VendorID != model.VendorIDEBAI && needAlarmStores[jxStoreID] != 0 { - opNum = "" - } vendorSkuIDs := make([]int64, 0) for _, v := range orderSkus { @@ -251,14 +239,14 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.O if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code skuBindInfo := skumapper[intVendorSkuID] if skuBindInfo == nil { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v) } else { v.JxSkuID = skuBindInfo.SkuID v.ShopPrice = int64(skuBindInfo.UnitPrice) v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准 order.ShopPrice += v.ShopPrice * int64(v.Count) if skuBindInfo.UnitPrice == 0 { - globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零（一般原因为没有门店价格信息），orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNum, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v) + globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零（一般原因为没有门店价格信息），orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v) } } }