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-10-20 10:45:50 +08:00
parent b7ab92357b
commit 516a8d12c6
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -163,6 +163,7 @@ func init() {
Timeout: 10 * time.Millisecond, Timeout: 10 * time.Millisecond,
}, },
TimeoutAction: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) { TimeoutAction: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
if savedOrderInfo.order.LockStatus == model.LockStatusUnlocked && savedOrderInfo.order.Status == model.OrderStatusNew {
order := savedOrderInfo.order order := savedOrderInfo.order
mobile := order.ConsigneeMobile mobile := order.ConsigneeMobile
if order.ConsigneeMobile2 != "" { if order.ConsigneeMobile2 != "" {
@@ -185,17 +186,20 @@ func init() {
} }
} }
if isAcceptIt { if isAcceptIt {
if err == nil {
sch.notifyNewOrder(order) sch.notifyNewOrder(order)
msghub.OnNewOrder(order) msghub.OnNewOrder(order)
}
} else { } else {
partner.CurOrderManager.OnOrderMsg(order, "黑名单拒单", "") partner.CurOrderManager.OnOrderMsg(order, "黑名单拒单", "")
} }
return err return err
}) })
}
return nil return nil
}, },
ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool {
return savedOrderInfo.order.Status == model.OrderStatusNew return savedOrderInfo.order.LockStatus == model.LockStatusUnlocked && savedOrderInfo.order.Status == model.OrderStatusNew
}, },
}, },
model.OrderStatusAccepted: &StatusActionConfig{ // 自动拣货 model.OrderStatusAccepted: &StatusActionConfig{ // 自动拣货