修复订单调度定时器的BUG

PickupGoods失败后判断订单状态如果是已经大于拣货完成，则忽略错误

business/jxcallback/scheduler/basesch/basesch.go

@@ -37,8 +37,14 @@ func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool
 	globals.SugarLogger.Infof("PickupGoods orderID:%s", order.VendorOrderID)
 	if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status == model.OrderStatusAccepted {
 		if c.IsReallyCallPlatformAPI {
-			err = utils.CallFuncLogErrorWithInfo(func() error {
-				return partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).PickupGoods(order, isSelfDelivery, userName)
+			handler := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID)
+			err = utils.CallFuncLogErrorWithInfo(func() (err error) {
+				if err = handler.PickupGoods(order, isSelfDelivery, userName); err != nil {
+					if status, err2 := handler.GetOrderStatus(order.VendorOrgCode, order.VendorOrderID); err2 == nil && status >= model.OrderStatusFinished {
+						err = nil
+					}
+				}
+				return err
 			}, "PickupGoods orderID:%s", order.VendorOrderID)
 		}
 	} else {