- 自配送门店的PickupGoods不应调用平台相应API，模拟一个事件

business/jxcallback/scheduler/defsch/defsch.go

@@ -182,7 +182,7 @@ func init() {
 				TimeoutGap: time2AutoPickupGap,
 				TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) {
 					if savedOrderInfo.autoPickupTimeoutMinute > 0 {
-						return sch.autoPickupGood(savedOrderInfo.order)
+						return sch.autoPickupGood(savedOrderInfo)
 					}
 					return nil
 				},
@@ -281,7 +281,7 @@ func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending
 		} else if status.LockStatus != model.OrderStatusUnknown {
 			s.stopTimer(savedOrderInfo)
 		}
-	} else if status.Status > model.OrderStatusApplyCancel {
+	} else if status.Status == model.OrderStatusApplyCancel {
 		globals.SugarLogger.Debugf("OnOrderStatusChanged orderID:%s %s, status:%v", status.VendorOrderID, model.OrderStatusName[status.Status], status)
 		savedOrderInfo := s.loadSavedOrderFromMap(status, true)
 		utils.CallFuncAsync(func() {
@@ -842,8 +842,8 @@ func (s *DefScheduler) updateBillsInfo(savedOrderInfo *WatchOrderInfo, bill *mod
 	return isBillExist
 }
 
-func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) {
-	err = s.PickupGoods(order, "")
+func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error) {
+	err = s.PickupGoods(savedOrderInfo.order, savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore, "")
 	if err == scheduler.ErrOrderStatusAlreadySatisfyCurOperation {
 		err = nil
 	}