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 }