锁定单不自动接单

business/jxcallback/scheduler/defsch/defsch.go

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