From 09b2a14f4a3eeee0e83c37fef6bed736f032e963 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 31 Jan 2019 09:48:47 +0800 Subject: [PATCH] - fix bug in CreateWaybillOnProvidersEx(forget return bills and err) --- business/jxcallback/scheduler/basesch/basesch_ext.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index c1a96d842..85e3bef7e 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -42,13 +42,13 @@ func (c *BaseScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendo order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { if order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin { - c.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil) + bills, err = c.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil) } else { err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation } } globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s error:%v", vendorOrderID, userName, err) - return nil, err + return bills, err } func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (err error) {