- paging added for GetStoreOrderInfo.

- GetStoreOrderCountInfo added.

business/jxcallback/scheduler/basesch/basesch.go

@@ -84,7 +84,9 @@ func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder) (err error) {
 			}, "PickupGoods orderID:%s", order.VendorOrderID)
 		}
 	} else {
-		err = ErrOrderStatusIsNotSuitable
+		if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusAccepted {
+			err = ErrOrderStatusIsNotSuitable
+		}
 		globals.SugarLogger.Infof("PickupGoods orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
 	}
 	return err
@@ -102,7 +104,9 @@ func (c *BaseScheduler) Swtich2SelfDeliver(order *model.GoodsOrder) (err error)
 			}
 		}
 	} else {
-		err = ErrOrderStatusIsNotSuitable
+		if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusFinishedPickup {
+			err = ErrOrderStatusIsNotSuitable
+		}
 		globals.SugarLogger.Infof("Swtich2SelfDeliver orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
 	}
 	return err

business/jxcallback/scheduler/defsch/defsch.go

@@ -478,7 +478,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 	order := savedOrderInfo.order
 	globals.SugarLogger.Debugf("swtich2SelfDeliverWithRetry orderID:%s", order.VendorOrderID)
 	if order.WaybillVendorID != order.VendorID {
-		if err := s.Swtich2SelfDeliver(order); err != nil && err != scheduler.ErrStatusIsNotOKForOperation {
+		if err := s.Swtich2SelfDeliver(order); err != nil {
 			globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry failed, bill:%v, err:%v", bill, err)
 			if retryCount > 0 {
 				time.AfterFunc(duration, func() {