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

- limit feasible order status for CreateWaybillOnProviders.

Browse Source
This commit is contained in:
gazebo
2018-08-23 16:16:18 +08:00
parent 6df89a17b5
commit dc3a14b448
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", vendorOrderID, userName) globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", vendorOrderID, userName)
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil { if err == nil {
if order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin {
bill, err2 := c.CreateWaybill(model.VendorIDMTPS, order, nil) bill, err2 := c.CreateWaybill(model.VendorIDMTPS, order, nil)
if err = err2; err == nil { if err = err2; err == nil {
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s bill:%s", vendorOrderID, userName, bill.WaybillVendorID) globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s bill:%s", vendorOrderID, userName, bill.WaybillVendorID)
@@ -21,6 +22,9 @@ func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID
bill, bill,
}, nil }, nil
} }
} else {
err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
}
} }
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", vendorOrderID, userName, err) globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
return nil, err return nil, err