diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 67a724ceb..4fb12ef05 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -6,8 +6,6 @@ import (
 	"strings"
 	"time"
 
-	beego "github.com/astaxie/beego/server/web"
-
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
@@ -401,15 +399,23 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	if isAcceptIt {
 		if globals.EnableEbaiStoreWrite {
 			err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
-			if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
-				utils.AfterFuncWithRecover(time.Minute*10, func() {
-					err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
-				})
-			} else {
-				utils.AfterFuncWithRecover(time.Minute, func() {
+
+			store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, "")
+			flag := store.AutoPickup == model.YES && store.VendorStatus == model.StoreStatusOpened // 只要打开了就可以自动拣货
+			if flag {
+				utils.AfterFuncWithRecover(time.Minute*6, func() {
 					err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
 				})
 			}
+			//if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
+			//	utils.AfterFuncWithRecover(time.Minute*10, func() {
+			//		err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
+			//	})
+			//} else {
+			//	utils.AfterFuncWithRecover(time.Minute, func() {
+			//		err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
+			//	})
+			//}
 		}
 		p.postFakeMsg(order.VendorOrderID, fakeAcceptOrder)
 	} else {
@@ -431,9 +437,6 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
 	if globals.EnableEbaiStoreWrite {
-		globals.SugarLogger.Debugf("-------PickupGoods := %d , %s ,%s", order.JxStoreID, userName, utils.Format4Output(isSelfDelivery, false))
-		globals.SugarLogger.Debugf("-------PickupGoods2 := %s", utils.Format4Output(userName == "autoPickup" && !isSelfDelivery, false))
-		globals.SugarLogger.Debugf("-------PickupGoods3 := %s", order.VendorOrderID)
 		if userName == "autoPickup" && !isSelfDelivery {
 			return nil
 		}