From 0cb5086e52d88b1e3c0936e097f47fb71baed8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 24 Aug 2020 17:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=954?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/basesch/basesch.go | 2 +-
 business/jxcallback/scheduler/defsch/defsch.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go
index 1f623cd4f..e0077e04e 100644
--- a/business/jxcallback/scheduler/basesch/basesch.go
+++ b/business/jxcallback/scheduler/basesch/basesch.go
@@ -20,7 +20,7 @@ type BaseScheduler struct {
 
 func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
 	globals.SugarLogger.Infof("AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
-	if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status == model.OrderStatusNew {
+	if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status == model.OrderStatusNew || order.Status == model.OrderStatusWaitAccepted {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogErrorWithInfo(func() error {
 				return partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt, userName)
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 334c9e633..327f66eca 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -279,7 +279,7 @@ func init() {
 	}
 	sch.defWorkflowConfig = []map[int]*StatusActionConfig{
 		map[int]*StatusActionConfig{
-			model.OrderStatusWaitAccepted: statusAccept(4 * time.Second), //饿百假的自动接单
+			model.OrderStatusWaitAccepted: statusAccept(4 * time.Minute), //饿百假的自动接单
 			model.OrderStatusNew:          statusAccept(10 * time.Millisecond),
 			model.OrderStatusAccepted: &StatusActionConfig{ // 自动拣货
 				StatusActionParams: partner.StatusActionParams{