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

- 手动创建运单时要判断订单是否已经有了有效的运单

Browse Source
This commit is contained in:
gazebo
2019-03-23 21:01:03 +08:00
parent a5788d5a7f
commit b5135287af
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,16 +72,20 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
if savedOrderInfo != nil { if savedOrderInfo != nil {
order := savedOrderInfo.order order := savedOrderInfo.order
if forceCreate || (order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) { if forceCreate || (order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) {
if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil); err == nil { if forceCreate || !s.IsOrderHasWaybill(order) {
if forceCreate { if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil); err == nil {
order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled if forceCreate {
err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order) order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
} err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order)
if err == nil { }
s.stopTimer(savedOrderInfo) if err == nil {
globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s userName:%s successfully", vendorOrderID, userName) s.stopTimer(savedOrderInfo)
return bills, err globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s userName:%s successfully", vendorOrderID, userName)
return bills, err
}
} }
} else {
err = fmt.Errorf("当前订单%s已经有了有效的承运人了", order.VendorOrderID)
} }
} else { } else {
globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s orderDetails:%s", vendorOrderID, utils.Format4Output(order, true)) globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s orderDetails:%s", vendorOrderID, utils.Format4Output(order, true))
@@ -107,7 +111,7 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
} }
savedOrderInfo := s.loadSavedOrderFromMap(status, false) savedOrderInfo := s.loadSavedOrderFromMap(status, false)
if savedOrderInfo != nil { if savedOrderInfo != nil {
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) err = s.cancelOtherWaybills2(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
} else { } else {
err = scheduler.ErrCanNotFindOrder err = scheduler.ErrCanNotFindOrder
} }