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

- add param forceCreate for CreateWaybillOnProviders

Browse Source 
- fix error msg bug in BaseScheduler.CreateWaybillOnProviders
This commit is contained in:
gazebo
2019-02-14 10:53:45 +08:00
parent 34a4129b00
commit 446dc061fa
3 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,14 +15,15 @@ import (
func (c *BaseScheduler) CreateWaybillOnProviders(order *model.GoodsOrder, userName string, courierVendorIDs []int, policyHandler func(deliveryFee, addFee int64) error) (bills []*model.Waybill, err error) {
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", order.VendorOrderID, userName)
var errList []error
var errList []string
for _, courierVendorID := range courierVendorIDs {
bill, err2 := c.CreateWaybill(courierVendorID, order, policyHandler)
if err = err2; err == nil {
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill)
bills = append(bills, bill)
} else {
errList = append(errList, err)
globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
errList = append(errList, err.Error())
}
}
if len(bills) > 0 {
@@ -31,23 +32,6 @@ func (c *BaseScheduler) CreateWaybillOnProviders(order *model.GoodsOrder, userNa
err = fmt.Errorf("所有运单失败：\n%s", utils.Format4Output(errList, false))
}
globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", order.VendorOrderID, userName, err)
return nil, err
}
func (c *BaseScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) {
globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s", vendorOrderID, userName)
if vendorID == model.VendorIDELM {
return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号")
}
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil {
if order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin {
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 bills, err
}