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

- isPossibleSwitch2SelfDelivery中，订单结束后不能转自送

Browse Source
This commit is contained in:
gazebo
2019-05-30 11:19:43 +08:00
parent f06a966c7f
commit 7ffad7e217
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,10 +86,12 @@ func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (e
if time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute { if time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute {
err = fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier) err = fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier)
} }
} else if order.Status > model.OrderStatusFinishedPickup { } else if order.Status > model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin {
if model.IsOrderHaveOwnWaybill(order) { if model.IsOrderHaveOwnWaybill(order) {
err = fmt.Errorf("%s物流已在配送中，不能转自配送", jxutils.GetVendorName(order.VendorID)) err = fmt.Errorf("%s物流已在配送中，不能转自配送", jxutils.GetVendorName(order.VendorID))
} }
} else {
err = fmt.Errorf("订单%s已经结束，请刷新状态", order.VendorOrderID)
} }
} }
return err return err