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

- fix bug in CreateWaybillOnProvidersEx and SelfDeliveringAndUpdateStatus

Browse Source
This commit is contained in:
gazebo
2019-02-14 12:30:36 +08:00
parent 7c80ca2352
commit 64d605d6e9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,7 +624,7 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isAutoLo
OrderCreatedAt: status.StatusTime, OrderCreatedAt: status.StatusTime,
WaybillVendorID: model.VendorIDUnknown, WaybillVendorID: model.VendorIDUnknown,
}) })
globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s", status.VendorOrderID) globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s with error:%v", status.RefVendorOrderID, err)
} }
} }
return realSavedInfo return realSavedInfo

8
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -15,8 +15,8 @@ import (
func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) { func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {
globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName)
status := &model.OrderStatus{ status := &model.OrderStatus{
VendorOrderID: vendorOrderID, RefVendorOrderID: vendorOrderID,
VendorID: vendorID, RefVendorID: vendorID,
} }
savedOrderInfo := s.loadSavedOrderFromMap(status, false) savedOrderInfo := s.loadSavedOrderFromMap(status, false)
if savedOrderInfo != nil { if savedOrderInfo != nil {
@@ -65,8 +65,8 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号") return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号")
} }
status := &model.OrderStatus{ status := &model.OrderStatus{
VendorOrderID: vendorOrderID, RefVendorOrderID: vendorOrderID,
VendorID: vendorID, RefVendorID: vendorID,
} }
savedOrderInfo := s.loadSavedOrderFromMap(status, true) savedOrderInfo := s.loadSavedOrderFromMap(status, true)
if savedOrderInfo != nil { if savedOrderInfo != nil {