liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- call GetJxStoreIDFromOrder at first place

Browse Source
This commit is contained in:
gazebo
2018-10-28 13:36:42 +08:00
parent cfa09f94be
commit a188f48253
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -71,15 +71,16 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
} }
func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) { func getStoreDeliveryType(order *model.GoodsOrder) (deliveryType int) {
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
if globals.OrderUseNewTable { if globals.OrderUseNewTable {
deliveryType = scheduler.StoreDeliveryTypeByPlatform // 缺省值 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) deliveryType = int(storeMap.DeliveryType)
} }
return deliveryType return deliveryType
} }
storefeature := &legacymodel2.Jxstorefeature{ storefeature := &legacymodel2.Jxstorefeature{
Id: jxutils.GetJxStoreIDFromOrder(order), Id: jxStoreID,
} }
if storefeature.Id != 0 { if storefeature.Id != 0 {
db := orm.NewOrm() db := orm.NewOrm()

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -101,8 +101,8 @@ func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsO
func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) { func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s", order.VendorOrderID) globals.SugarLogger.Debugf("updateOrderStoreFeature orderID:%s", order.VendorOrderID)
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
if globals.OrderUseNewTable { if globals.OrderUseNewTable {
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
if jxStoreID > 0 { if jxStoreID > 0 {
db := dao.GetDB() db := dao.GetDB()
storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID) storeMap, err2 := dao.GetStoreMapByStoreID(db, jxStoreID, order.VendorID)
@@ -134,7 +134,7 @@ func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err e
return err return err
} }
storefeature := &legacymodel2.Jxstorefeature{ storefeature := &legacymodel2.Jxstorefeature{
Id: jxutils.GetJxStoreIDFromOrder(order), Id: jxStoreID,
} }
if storefeature.Id > 0 { if storefeature.Id > 0 {
db := orm.NewOrm() db := orm.NewOrm()