From a188f48253484124bb9813e8c36249fa1d2e0d03 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 28 Oct 2018 13:36:42 +0800 Subject: [PATCH] - call GetJxStoreIDFromOrder at first place --- business/jxcallback/scheduler/basesch/basesch_ext.go | 5 +++-- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index f4f66d603..dfdcd713d 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -71,15 +71,16 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo } func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) { + jxStoreID := jxutils.GetJxStoreIDFromOrder(order) if globals.OrderUseNewTable { deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值 - if storeMap, _ := dao.GetStoreMapByStoreID(nil, jxutils.GetJxStoreIDFromOrder(order), order.VendorID); storeMap != nil { + if storeMap, _ := dao.GetStoreMapByStoreID(nil, jxStoreID, order.VendorID); storeMap != nil { deliveryType = int(storeMap.DeliveryType) } return deliveryType } storefeature := &legacymodel2.Jxstorefeature{ - Id: jxutils.GetJxStoreIDFromOrder(order), + Id: jxStoreID, } if storefeature.Id != 0 { db := orm.NewOrm() diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 3b6268cb3..501b5a73c 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -101,8 +101,8 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) { globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s", order.VendorOrderID) + jxStoreID := jxutils.GetJxStoreIDFromOrder(order) if globals.OrderUseNewTable { - jxStoreID := jxutils.GetJxStoreIDFromOrder(order) if jxStoreID > 0 { db := dao.GetDB() storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID) @@ -134,7 +134,7 @@ func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err e return err } storefeature := &legacymodel2.Jxstorefeature{ - Id: jxutils.GetJxStoreIDFromOrder(order), + Id: jxStoreID, } if storefeature.Id > 0 { db := orm.NewOrm()