From 04c82289fda61dab5e5e155d655568116f781f9e Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 27 Mar 2019 09:52:48 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E4=B8=8E=E7=BE=8E?=
 =?UTF-8?q?=E5=9B=A2=E6=B7=BB=E5=8A=A0=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=E5=BB=B6=E8=BF=9F=E5=8F=AC=E5=94=A4=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E9=85=8D=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/order.go | 11 +++++++++--
 business/partner/purchase/mtwm/order.go | 17 ++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index e03c8da29..6db8aae29 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -21,8 +21,10 @@ import (
 
 const (
 	// acceptOrderDelay = 180 * time.Second
-	pickupOrderDelay = 240 * time.Second
-	pickupOrderGap   = 30
+	pickupOrderDelay     = 240 * time.Second
+	pickupOrderGap       = 30
+	callDeliveryDelay    = 10 * time.Minute
+	callDeliveryDelayGap = 30
 	// fakePickedUp        = "9527"
 	fakeUserApplyCancel = "fake_user_apply_cancel"
 	fakeAcceptOrder     = "fake_accept_order"
@@ -292,6 +294,11 @@ func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) (params
 			Timeout:    pickupOrderDelay,
 			TimeoutGap: pickupOrderGap,
 		}
+	} else if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusFinishedPickup {
+		params = &partner.StatusActionParams{ // 自配送延时召唤配送
+			Timeout:    callDeliveryDelay,
+			TimeoutGap: callDeliveryDelayGap,
+		}
 	}
 	return params
 }
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 55b3d4a00..ff6137d61 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -22,8 +22,10 @@ const (
 )
 
 const (
-	pickupOrderDelay = 4 * time.Minute
-	pickupOrderGap   = 20
+	pickupOrderDelay     = 4 * time.Minute
+	pickupOrderGap       = 20
+	callDeliveryDelay    = 10 * time.Minute
+	callDeliveryDelayGap = 30
 )
 
 var (
@@ -220,10 +222,10 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 					Cmd:  FakeMsgTypeOrderReceived,
 					Data: url.Values{},
 				}
-				msg.Data.Set("timestamp", utils.Int64ToStr(time.Now().Unix()))
-				msg.Data.Set("utime", msg.Data.Get("timestamp"))
 				msg.Data.Set(mtwmapi.KeyOrderID, order.VendorOrderID)
 				msg.Data.Set("status", mtwmapi.OrderStatusReceived)
+				msg.Data.Set("timestamp", utils.Int64ToStr(time.Now().Unix()))
+				msg.Data.Set("utime", msg.Data.Get("timestamp"))
 				utils.CallFuncAsync(func() {
 					OnOrderCallbackMsg(msg)
 				})
@@ -249,7 +251,7 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
 }
 
 func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
-	return nil
+	return err
 }
 
 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
@@ -277,6 +279,11 @@ func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) (params
 			Timeout:    pickupOrderDelay,
 			TimeoutGap: pickupOrderGap,
 		}
+	} else if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusFinishedPickup {
+		params = &partner.StatusActionParams{ // 自配送延时召唤配送
+			Timeout:    callDeliveryDelay,
+			TimeoutGap: callDeliveryDelayGap,
+		}
 	}
 	return params
 }