diff --git a/business/controller/controller.go b/business/controller/controller.go
index 280c2e4ac..1da6e35b4 100644
--- a/business/controller/controller.go
+++ b/business/controller/controller.go
@@ -3,39 +3,24 @@ package controller
 import (
 	"fmt"
 	"math"
-	"strings"
-	"sync"
-	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
-
-	"github.com/astaxie/beego/orm"
-
-	"git.rosy.net.cn/jx-callback/business/model"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/routinepool"
+	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
 	_ "git.rosy.net.cn/jx-callback/business/scheduler/defsch" // 导入缺省订单调度器
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-)
-
-const (
-	DefaultOrderCacheTimeout = 24 * time.Hour
+	"github.com/astaxie/beego/orm"
 )
 
 var (
 	OrderManager   *OrderController
 	WaybillManager *WaybillController
-
-	routinePool *routinepool.Pool
+	routinePool    *routinepool.Pool
 )
 
-type SyncMapWithTimeout struct {
-	sync.Map
-}
-
 func init() {
 	routinePool = routinepool.New(1000, 1000)
 	OrderManager = NewOrderManager()
@@ -43,44 +28,6 @@ func init() {
 	scheduler.CurrentScheduler.RegisterOrderManager(OrderManager)
 }
 
-func (m *SyncMapWithTimeout) StoreWithTimeout(key, value interface{}, timeout time.Duration) {
-	m.Map.Store(key, value)
-	time.AfterFunc(timeout, func() {
-		m.Delete(key)
-	})
-}
-
-func (m *SyncMapWithTimeout) Store(key, value interface{}) {
-	m.StoreWithTimeout(key, value, DefaultOrderCacheTimeout)
-}
-
-func SplitUniversalOrderID(universalOrderID string) (orderID string, vendorID int) {
-	index := strings.Index(universalOrderID, "|")
-	if index != -1 {
-		orderID = universalOrderID[:index]
-		vendorID = int(utils.Str2Int64(universalOrderID[index:]))
-	} else {
-		// 800402581000221 jd order
-		// 3022716176275221584 elm order
-		orderIDLen := len(universalOrderID)
-		if orderIDLen == len("800402581000221") {
-			vendorID = model.VendorIDJD
-		} else if orderIDLen == len("3022716176275221584") {
-			vendorID = model.VendorIDELM
-		} else {
-			globals.SugarLogger.Errorf("unkown order type:%v", universalOrderID)
-			vendorID = model.VendorIDUnknown
-		}
-		orderID = universalOrderID
-	}
-	return orderID, vendorID
-}
-
-func ComposeUniversalOrderID(orderID string, vendorID int) string {
-	// return fmt.Sprintf("%s|%d", orderID, vendorID)
-	return orderID // 当前用长度就能区分，先不加上vendorID
-}
-
 func StandardCoordinate2Int(value float64) int {
 	return int(math.Round(value * 1000000))
 }
@@ -172,10 +119,3 @@ func GetDataCityCodeFromOrder(order *model.GoodsOrder) (retVal string, err error
 	}
 	return retVal, err
 }
-
-func GetJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
-	if order.JxStoreID != 0 {
-		return order.JxStoreID
-	}
-	return order.StoreID
-}
diff --git a/business/controller/dada/waybill.go b/business/controller/dada/waybill.go
index e62b033d4..ea240bb7b 100644
--- a/business/controller/dada/waybill.go
+++ b/business/controller/dada/waybill.go
@@ -4,8 +4,10 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -53,15 +55,18 @@ func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVa
 		VendorStatus:     utils.Int2Str(msg.OrderStatus),
 		WaybillCreatedAt: utils.Timestamp2Time(int64(msg.UpdateTime)),
 	}
-	retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
+	retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
 	return retVal
 }
 
 // DeliveryPlatformHandler
 func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("CreateWaybill order:%v", order)
+	return nil
+
 	billParams := &dadaapi.OperateOrderRequiredParams{
 		ShopNo:          utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的
-		OriginID:        controller.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
+		OriginID:        jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
 		CargoPrice:      controller.IntPrice2Standard(order.SalePrice),
 		IsPrepay:        0,
 		ReceiverName:    order.ConsigneeName,
@@ -81,6 +86,9 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
 }
 
 func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
+	globals.SugarLogger.Infof("CancelWaybill bill:%v", bill)
+	return nil
+
 	reasonID := dadaapi.ReasonIDOther
 	reasonMsg := "other reason"
 	if bill.Status < model.WaybillStatusAccepted {
diff --git a/business/controller/elm/elm.go b/business/controller/elm/elm.go
index e8e2898d7..2005973da 100644
--- a/business/controller/elm/elm.go
+++ b/business/controller/elm/elm.go
@@ -4,6 +4,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
@@ -47,7 +48,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 			innerMsg.MsgType = msg.Type
 			controller.CallMsgHandler(func() {
 				retVal = new(OrderController).onOrderUserUrgeOrder(&innerMsg)
-			}, controller.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
+			}, jxutils.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
 		}
 	} else if msg.Type >= elmapi.MsgTypeWaybillWait4DeliveryVendor && msg.Type <= elmapi.MsgTypeRejectedSystemError {
 		var innerMsg elmapi.CallbackWaybillStatusMsg
diff --git a/business/controller/elm/order.go b/business/controller/elm/order.go
index 46a751555..c18163f16 100644
--- a/business/controller/elm/order.go
+++ b/business/controller/elm/order.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -11,11 +12,18 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
 )
 
+const (
+	acceptOrderDelay = 5 * time.Minute
+	fakePickedUp     = "fakefinishedpickup"
+)
+
 type OrderController struct {
+	scheduler.BasePurchasePlatform
 }
 
 func init() {
@@ -25,21 +33,21 @@ func init() {
 func (c *OrderController) OnOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onOrderStatusMsg(msg)
-	}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }
 
 func (c *OrderController) OnOrderNewMsg(msg map[string]interface{}) (retVal *elmapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onOrderNew(msg)
-	}, controller.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
+	}, jxutils.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
 	return retVal
 }
 
 func (c *OrderController) OnOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onOrderCancelRefundMsg(msg)
-	}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }
 
@@ -83,6 +91,13 @@ func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (
 		return elmapi.SuccessResponse
 	}
 	err := controller.OrderManager.OnOrderStatusChanged(status)
+
+	// 直接跳到拣货完成
+	if msg.MsgType == elmapi.MsgTypeOrderAccepted {
+		status.Status = model.OrderStatusFinishedPickup
+		status.VendorStatus = fakePickedUp
+		err = controller.OrderManager.OnOrderStatusChanged(status)
+	}
 	// if globals.HandleLegacyJxOrder && err == nil {
 	// 	c.legacyElmOrderStatusChanged(status)
 	// }
@@ -210,6 +225,9 @@ func (c *OrderController) spliltCompositeState(compositeState string) (state str
 
 // PurchasePlatformHandler
 func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	globals.SugarLogger.Infof("CancelWaybill order:%v", order)
+	return nil
+
 	if isAcceptIt {
 		err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
 	} else {
@@ -221,22 +239,35 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 // 饿了么没有拣货这个状态，直接返回成功
 // 真实流程中也不会调用这个方法，因为接收订单后状态会直接转移到已拣货
 func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("CancelWaybill order:%v", order)
+	return nil
+
 	return nil
 }
 
-func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
-	return api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
-}
-
-// 饿了么没有这个操作，直接返回成功
-func (c *OrderController) SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error) {
+func (c *OrderController) Swtich2SelfDeliver(vendorOrderID string) (err error) {
+	globals.SugarLogger.Infof("Swtich2SelfDeliver order:%v", vendorOrderID)
 	return nil
+
+	return api.ElmAPI.DeliveryBySelfLite(vendorOrderID)
 }
 
 func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievering order:%v", order)
+	return nil
+
 	return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
 }
 
 func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievered order:%v", order)
+	return nil
+
 	return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
 }
+
+func (c *OrderController) GetStatusActionConfig(status int) *scheduler.StatusActionConfig {
+	return &scheduler.StatusActionConfig{
+		Timeout: acceptOrderDelay, // 饿了么没有拣货状态，接单后就为拣货完成，所以要延迟接单，否则门店来不及备货
+	}
+}
diff --git a/business/controller/elm/waybill.go b/business/controller/elm/waybill.go
index 56e741482..1ea7f3c7a 100644
--- a/business/controller/elm/waybill.go
+++ b/business/controller/elm/waybill.go
@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
@@ -15,7 +16,7 @@ type WaybillController struct {
 func (c *WaybillController) OnWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onWaybillStatusMsg(msg)
-	}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }
 
@@ -53,12 +54,12 @@ func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatu
 		WaybillVendorID:  model.VendorIDELM,
 		CourierName:      msg.Name,
 		CourierMobile:    msg.Phone,
-		VendorStatus:     c.composeState(msg.State, msg.SubState, elmapi.MsgTypeWaybillWait4DeliveryVendor),
+		VendorStatus:     c.composeState(msg.State, msg.SubState, msg.MsgType),
 		WaybillCreatedAt: utils.Timestamp2Time(msg.UpdateAt / 1000),
 	}
 	return retVal
 }
 
 func (c *WaybillController) composeState(state, subState string, msgType int) string {
-	return fmt.Sprintf("%s-%s-%d", state, subState, msgType)
+	return fmt.Sprintf("%s-%d", state, msgType)
 }
diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go
index a4ef3583d..5825c3237 100644
--- a/business/controller/jd/order.go
+++ b/business/controller/jd/order.go
@@ -7,12 +7,15 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type OrderController struct {
+	scheduler.BasePurchasePlatform
 }
 
 func init() {
@@ -22,7 +25,7 @@ func init() {
 func (c *OrderController) OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onOrderMsg(msg)
-	}, controller.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
+	}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
 	return retVal
 }
 
@@ -164,31 +167,41 @@ func (c *OrderController) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
 
 // PurchasePlatformHandler
 func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	globals.SugarLogger.Infof("AcceptOrRefuseOrder order:%v", order)
+	return nil
+
 	_, err = api.JdAPI.OrderAcceptOperate(order.VendorOrderID, isAcceptIt)
 	return err
 }
 
 func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("PickedUpGoods order:%v", order)
+	return nil
+
 	_, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID)
 	return c.translateOrderRelatedErr(err)
 }
 
-func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
-	_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
+func (c *OrderController) Swtich2SelfDeliver(vendorOrderID string) (err error) {
+	globals.SugarLogger.Infof("Swtich2SelfDeliver order:%v", vendorOrderID)
+	return nil
+
+	_, err = api.JdAPI.ModifySellerDelivery(vendorOrderID)
 	return c.translateOrderRelatedErr(err)
 }
 
-func (c *OrderController) SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error) {
+func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievering order:%v", order)
+	return nil
+
 	_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
 	return c.translateOrderRelatedErr(err)
 }
 
-// 京东无此操作，直接返回成功
-func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
-	return nil
-}
-
 func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievered order:%v", order)
+	return nil
+
 	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
 	return err
 }
diff --git a/business/controller/jd/waybill.go b/business/controller/jd/waybill.go
index 527eb1af3..b7d8007c7 100644
--- a/business/controller/jd/waybill.go
+++ b/business/controller/jd/waybill.go
@@ -4,6 +4,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
@@ -13,7 +14,7 @@ type WaybillController struct {
 func (c *WaybillController) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
 	controller.CallMsgHandler(func() {
 		retVal = c.onWaybillMsg(msg)
-	}, controller.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJD))
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJD))
 	return retVal
 }
 
diff --git a/business/controller/mtps/waybill.go b/business/controller/mtps/waybill.go
index bb787bfd4..0ba99d9c4 100644
--- a/business/controller/mtps/waybill.go
+++ b/business/controller/mtps/waybill.go
@@ -4,6 +4,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/controller"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/legacyorder"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
@@ -38,7 +39,7 @@ func (c *WaybillController) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionM
 			VendorStatus:     utils.Int2Str(msg.ExceptionCode),
 			WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
 		}
-		order.VendorOrderID, order.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
+		order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
 		retVal = mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept")
 	}, msg.OrderID)
 	return retVal
@@ -74,17 +75,20 @@ func (c *WaybillController) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (
 		VendorStatus:     utils.Int2Str(msg.Status),
 		WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
 	}
-	retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
+	retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
 	return retVal
 }
 
 // DeliveryPlatformHandler
 func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("CreateWaybill bill:%v", order)
+	return nil
+
 	db := orm.NewOrm()
 	// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
 	lngFloat, latFloat, _ := controller.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
 	billParams := &mtpsapi.CreateOrderByShopParam{
-		OrderID:              controller.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
+		OrderID:              jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
 		DeliveryServiceCode:  mtpsapi.DeliveryServiceCodeRapid,
 		ReceiverName:         order.ConsigneeName,
 		ReceiverAddress:      order.ConsigneeAddress,
@@ -119,6 +123,9 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) {
 }
 
 func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
+	globals.SugarLogger.Infof("CancelWaybill bill:%v", bill)
+	return nil
+
 	reasonID := mtpsapi.CancelReasonMerchantOther
 	reasonMsg := "other reason"
 	if bill.Status < model.WaybillStatusAccepted {
@@ -148,7 +155,7 @@ func (c *WaybillController) getDeliveryID(order *model.GoodsOrder, db orm.Ormer)
 func (c *WaybillController) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) (retVal string, err error) {
 	sql := "SELECT zs_store_id FROM jx_to_zs_store_map WHERE jx_store_id = ?"
 	var lists []orm.ParamsList
-	JxStoreID := controller.GetJxStoreIDFromOrder(order)
+	JxStoreID := jxutils.GetJxStoreIDFromOrder(order)
 	num, err := db.Raw(sql, JxStoreID).ValuesList(&lists)
 	if err != nil && num == 1 {
 		retVal = lists[0][0].(string)
diff --git a/business/controller/order.go b/business/controller/order.go
index 3de166390..dc92bc0e8 100644
--- a/business/controller/order.go
+++ b/business/controller/order.go
@@ -22,6 +22,7 @@ func NewOrderManager() *OrderController {
 
 func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
 	db := orm.NewOrm()
+	order.StatusTime = order.OrderCreatedAt
 	isDuplicated, err := addOrderOrWaybillStatus(c.order2Status(order), db)
 	if err == nil && !isDuplicated {
 		if err = c.saveOrder(order, false, db); err == nil {
@@ -33,6 +34,7 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
 
 func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder) (err error) {
 	db := orm.NewOrm()
+	order.StatusTime = order.OrderCreatedAt
 	status := c.order2Status(order)
 	isDuplicated, err := addOrderOrWaybillStatus(status, db)
 	if err == nil && !isDuplicated {
@@ -212,11 +214,21 @@ func (c *OrderController) order2Status(order *model.GoodsOrder) (retVal *model.O
 		RefVendorID:      order.VendorID,
 		Status:           order.Status,
 		VendorStatus:     order.VendorStatus,
-		StatusTime:       order.OrderCreatedAt,
+		StatusTime:       order.StatusTime,
 	}
 	return retVal
 }
 
+func (c *OrderController) LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) {
+	db := orm.NewOrm()
+	order = &model.GoodsOrder{
+		VendorOrderID: vendorOrderID,
+		VendorID:      vendorID,
+	}
+	err = db.Read(order, "VendorOrderID", "VendorID")
+	return order, err
+}
+
 //Waybill
 func (c *OrderController) UpdateWaybillVendorID(bill *model.Waybill) (err error) {
 	db := orm.NewOrm()
diff --git a/business/controller/order_legacy.go b/business/controller/order_legacy.go
index 7675276f5..4d246fdde 100644
--- a/business/controller/order_legacy.go
+++ b/business/controller/order_legacy.go
@@ -5,6 +5,7 @@ import (
 
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/legacyorder"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -138,7 +139,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
 	jxorder := &legacyorder.Jxorder2{
 		VenderId:         int8(order.VendorID),
 		OrderId:          utils.Str2Int64(order.VendorOrderID),
-		JxStoreId:        utils.Int2Str(GetJxStoreIDFromOrder(order)),
+		JxStoreId:        utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order)),
 		JxStoreName:      order.StoreName,
 		OrderNum:         order.OrderSeq,
 		OrderStatus:      legacyMapOrderStatus(order.Status),
@@ -172,7 +173,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
 	params := []interface{}{}
 	for _, sku := range order.Skus {
 		sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
-		params = append(params, sku.VendorID, sku.VendorOrderID, sku.JxSkuID, sku.SkuName, GetJxStoreIDFromOrder(order), sku.SalePrice, sku.Count, sku.SkuType, sku.PromotionType, 0, 0, "")
+		params = append(params, sku.VendorID, sku.VendorOrderID, sku.JxSkuID, sku.SkuName, jxutils.GetJxStoreIDFromOrder(order), sku.SalePrice, sku.Count, sku.SkuType, sku.PromotionType, 0, 0, "")
 	}
 	sql = sql[:len(sql)-1] + ";"
 	if _, err = db.Raw(sql, params...).Exec(); err != nil {
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
new file mode 100644
index 000000000..07de6f62d
--- /dev/null
+++ b/business/jxutils/jxutils.go
@@ -0,0 +1,84 @@
+package jxutils
+
+import (
+	"strings"
+	"sync"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+const (
+	DefaultOrderCacheTimeout = 24 * time.Hour
+)
+
+type SyncMapWithTimeout struct {
+	sync.Map
+}
+
+func (m *SyncMapWithTimeout) StoreWithTimeout(key, value interface{}, timeout time.Duration) {
+	m.Map.Store(key, value)
+	time.AfterFunc(timeout, func() {
+		m.Delete(key)
+	})
+}
+
+func (m *SyncMapWithTimeout) Store(key, value interface{}) {
+	m.StoreWithTimeout(key, value, DefaultOrderCacheTimeout)
+}
+
+func GetJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {
+	if order.JxStoreID != 0 {
+		return order.JxStoreID
+	}
+	return order.StoreID
+}
+
+func SplitUniversalOrderID(universalOrderID string) (orderID string, vendorID int) {
+	index := strings.Index(universalOrderID, "|")
+	if index != -1 {
+		orderID = universalOrderID[:index]
+		vendorID = int(utils.Str2Int64(universalOrderID[index:]))
+	} else {
+		// 800402581000221 jd order
+		// 3022716176275221584 elm order
+		orderIDLen := len(universalOrderID)
+		if orderIDLen == len("800402581000221") {
+			vendorID = model.VendorIDJD
+		} else if orderIDLen == len("3022716176275221584") {
+			vendorID = model.VendorIDELM
+		} else {
+			globals.SugarLogger.Errorf("unkown order type:%v", universalOrderID)
+			vendorID = model.VendorIDUnknown
+		}
+		orderID = universalOrderID
+	}
+	return orderID, vendorID
+}
+
+func ComposeUniversalOrderID(orderID string, vendorID int) string {
+	// return fmt.Sprintf("%s|%d", orderID, vendorID)
+	return orderID // 当前用长度就能区分，先不加上vendorID
+}
+
+func GetUniversalOrderIDFromWaybill(bill *model.Waybill) string {
+	return ComposeUniversalOrderID(bill.VendorOrderID, bill.OrderVendorID)
+}
+
+func GetUniversalOrderIDFromOrder(order *model.GoodsOrder) string {
+	return ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)
+}
+
+func GetUniversalOrderIDFromOrderStatus(status *model.OrderStatus) string {
+	return ComposeUniversalOrderID(status.VendorOrderID, status.VendorID)
+}
+
+func GetRealTimeout(beginTime time.Time, timeout time.Duration) time.Duration {
+	retVal := beginTime.Add(timeout).Sub(time.Now())
+	if retVal < 0 {
+		retVal = 0
+	}
+	return retVal
+}
diff --git a/business/model/order.go b/business/model/order.go
index e62477a5a..722ab5583 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -29,7 +29,7 @@ type GoodsOrder struct {
 	SkuCount              int    // 商品类别数量，即有多少种商品（注意在某些情况下，相同SKU的商品由于售价不同，也会当成不同商品在这个值里）
 	GoodsCount            int    // 商品个数
 	Status                int    // 参见OrderStatus*相关的常量定义
-	VendorStatus          string `orm:"size(16)"`
+	VendorStatus          string `orm:"size(255)"`
 	LockStatus            int
 	OrderSeq              int       // 门店订单序号
 	BuyerComment          string    `orm:"size(255)"`
@@ -42,6 +42,7 @@ type GoodsOrder struct {
 	ModelTimeInfo
 	OriginalData string      `orm:"type(text)"`
 	Skus         []*OrderSku `orm:"-"`
+	StatusTime   time.Time   `orm:"-"` // 用于传递数据，不实际存储
 }
 
 func (o *GoodsOrder) TableUnique() [][]string {
@@ -85,7 +86,7 @@ type Waybill struct {
 	CourierName       string    `orm:"size(32)"`
 	CourierMobile     string    `orm:"size(32)"`
 	Status            int       // 参见WaybillStatus*相关的常量定义
-	VendorStatus      string    `orm:"size(16)"`
+	VendorStatus      string    `orm:"size(255)"`
 	ActualFee         int64     // 实际要支付给快递公司的实际费用
 	DesiredFee        int64     // 根据合同计算出来的预期费用
 	DuplicatedCount   int       // 重复新订单消息数，这个一般不是由于消息重发造成的（消息重发由OrderStatus过滤），一般是业务逻辑造成的
@@ -116,7 +117,7 @@ type OrderStatus struct {
 	RefVendorOrderID string    `orm:"column(ref_vendor_order_id);size(48)"`
 	RefVendorID      int       `orm:"column(ref_vendor_id)"`
 	Status           int       // 如果Status为OrderStatusEvent，表示VendorStatus只是一个通知事件，不是状态变化
-	VendorStatus     string    `orm:"size(16)"`
+	VendorStatus     string    `orm:"size(255)"`
 	StatusTime       time.Time `orm:"type(datetime);index"`
 	DuplicatedCount  int       // 收到的重复状态转换（或消息）数，一般是由于重发造成的
 	ModelTimeInfo
diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go
index a750eae45..6be81e22e 100644
--- a/business/scheduler/defsch/defsch.go
+++ b/business/scheduler/defsch/defsch.go
@@ -1,6 +1,10 @@
 package defsch
 
 import (
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/scheduler"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -8,50 +12,235 @@ import (
 	"github.com/astaxie/beego/orm"
 )
 
+const (
+	defTime2Delivery = 1 * time.Hour
+)
+
+type WatchOrderInfo struct {
+	order    *model.GoodsOrder
+	waybills []*model.Waybill
+	timer    *time.Timer
+}
+
+// 重要：此调度器要求同一定单的处理逻辑必须是序列化了的，不然会有并发问题
 type DefScheduler struct {
 	scheduler.BaseScheduler
+	defWorkflowConfig map[int]*scheduler.StatusActionConfig
+	orderMap          jxutils.SyncMapWithTimeout
 }
 
 func init() {
 	sch := &DefScheduler{}
 	sch.Init()
 	scheduler.CurrentScheduler = sch
+
+	sch.defWorkflowConfig = map[int]*scheduler.StatusActionConfig{
+		model.OrderStatusNew: &scheduler.StatusActionConfig{ // 自动接单
+			Timeout: 1 * time.Second,
+			TimeoutAction: func(order *model.GoodsOrder) (err error) {
+				_ = sch.handleAutoAcceptOrder(order.VendorOrderID, order.VendorID, order.ConsigneeMobile, jxutils.GetJxStoreIDFromOrder(order), nil, func(isAcceptIt bool) error {
+					return sch.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt)
+				})
+				return nil
+			},
+		},
+		model.OrderStatusAccepted: &scheduler.StatusActionConfig{ // 20分钟后自动拣货
+			Timeout: 20 * time.Minute,
+			TimeoutAction: func(order *model.GoodsOrder) (err error) {
+				return sch.GetPurchasePlatformFromVendorID(order.VendorID).PickedUpGoods(order)
+			},
+		},
+		model.OrderStatusFinishedPickup: &scheduler.StatusActionConfig{ // 拣货完成8分钟后开始在外部快递平台创建运单
+			Timeout: 8 * time.Minute,
+			TimeoutAction: func(order *model.GoodsOrder) (err error) {
+				return sch.createWaybillOn3rdProviders(order)
+			},
+		},
+	}
 }
 
 // 以下是订单
 func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder) (err error) {
-	return nil
+	config := s.mergeOrderStartConfig(order.Status, s.GetPurchasePlatformFromVendorID(order.VendorID).GetStatusActionConfig(order.Status))
+	watchInfo := &WatchOrderInfo{
+		order: order,
+		timer: time.AfterFunc(jxutils.GetRealTimeout(order.OrderCreatedAt, config.Timeout), func() {
+			config.TimeoutAction(order)
+		}),
+	}
+	s.orderMap.Store(jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), watchInfo)
+	return err
 }
 
 func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus) (err error) {
-	return nil
+	if savedOrderInfo := s.loadWatchOrderFromMap(status.VendorOrderID, status.VendorID); savedOrderInfo != nil {
+		if savedOrderInfo.timer != nil {
+			savedOrderInfo.timer.Stop()
+		}
+		if status.Status < model.OrderStatusEndBegin {
+			s.updateOrderByStatus(savedOrderInfo.order, status)
+			config := s.mergeOrderStartConfig(status.Status, s.GetPurchasePlatformFromVendorID(status.VendorID).GetStatusActionConfig(status.Status))
+			if config.TimeoutAction != nil {
+				var timeout time.Duration
+				if status.Status == model.OrderStatusAccepted {
+					savedOrderInfo := s.loadWatchOrderFromMap(status.VendorOrderID, status.VendorID)
+					timeout = s.getLatestPickupTimeout(savedOrderInfo.order, config.Timeout)
+				} else {
+					timeout = jxutils.GetRealTimeout(savedOrderInfo.order.StatusTime, config.Timeout)
+				}
+				savedOrderInfo.timer = time.AfterFunc(timeout, func() {
+					config.TimeoutAction(savedOrderInfo.order)
+				})
+			}
+		} else {
+			s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
+		}
+	}
+	return err
 }
 
 // 以下是运单
 func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
-	if bill.Status == model.WaybillStatusAccepted {
-		s.CurOrderManager.UpdateWaybillVendorID(bill)
-	} else if bill.Status == model.WaybillStatusAcceptCanceled {
-		bill.WaybillVendorID = model.VendorIDUnknown
-		s.CurOrderManager.UpdateWaybillVendorID(bill)
+	savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
+	if bill.Status == model.WaybillStatusNew {
+		err = s.addWaybill2Map(bill)
+	} else {
+		findIt := false
+		for _, v := range savedOrderInfo.waybills {
+			if v.VendorWaybillID == bill.VendorWaybillID && v.WaybillVendorID == bill.WaybillVendorID {
+				findIt = true
+				break
+			}
+		}
+		if findIt {
+			switch bill.Status {
+			case model.WaybillStatusAccepted:
+				s.cancelOtherWaybills(bill)
+				if bill.WaybillVendorID != bill.OrderVendorID {
+					s.swtich2SelfDeliverWithRetry(bill, 2, 10*time.Second)
+				}
+				s.CurOrderManager.UpdateWaybillVendorID(bill)
+				savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID
+			case model.WaybillStatusAcceptCanceled, model.WaybillStatusCanceled, model.WaybillStatusFailed:
+				s.removeWaybillFromMap(bill, savedOrderInfo)
+				if savedOrderInfo.order.WaybillVendorID == bill.WaybillVendorID {
+					s.createWaybillOn3rdProviders(savedOrderInfo.order)
+					bill.WaybillVendorID = model.VendorIDUnknown
+					s.CurOrderManager.UpdateWaybillVendorID(bill)
+				}
+			case model.WaybillStatusDelivering:
+				s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievering(savedOrderInfo.order)
+			case model.WaybillStatusDelivered:
+				s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).SelfDeliverDelievered(savedOrderInfo.order)
+				s.removeWaybillFromMap(bill, savedOrderInfo)
+			}
+		} else {
+			globals.SugarLogger.Infof("OnWaybillStatusChanged can not find bill:%v in saved info", bill)
+		}
 	}
 	return nil
 }
 
-func (s *DefScheduler) getPurchasePlatformFromVendorID(vendorID int) scheduler.PurchasePlatformHandler {
-	return s.PurchasePlatformHandlers[vendorID]
+func (s *DefScheduler) addWaybill2Map(bill *model.Waybill) (err error) {
+	savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
+	for _, v := range savedOrderInfo.waybills {
+		if v.VendorWaybillID == bill.VendorWaybillID && v.WaybillVendorID == bill.WaybillVendorID {
+			// 如果已经存在，不做处理
+			globals.SugarLogger.Infof("addWaybill2Map bill:%v already exists", bill)
+			return nil
+		}
+	}
+	savedOrderInfo.waybills = append(savedOrderInfo.waybills, bill)
+	return nil
 }
 
-// c.handleAutoAcceptOrder(order.VendorOrderID, order.VendorID, order.ConsigneeMobile, order.StoreID, db, func(isAccept bool) {
-// 	// c.purchasePlatformHandlers[order.VendorID].AcceptOrRefuseOrder(order, isAccept)
-// 	if isAccept {
-// 		order.Status = model.OrderStatusAccepted
-// 	} else {
-// 		order.Status = model.OrderStatusFailed
-// 	}
-// })
+func (s *DefScheduler) onWaybillFailed(bill *model.Waybill) (err error) {
+	savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
+	s.removeWaybillFromMap(bill, savedOrderInfo)
+	if len(savedOrderInfo.waybills) == 0 {
+		s.createWaybillOn3rdProviders(savedOrderInfo.order)
+	}
+	return nil
+}
 
-func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userMobile string, jxStoreID int, db orm.Ormer, handler func(accepted bool)) int {
+func (s *DefScheduler) createWaybillOn3rdProviders(order *model.GoodsOrder) (err error) {
+	successCount := 0
+	for _, v := range s.DeliveryPlatformHandlers {
+		if err = v.CreateWaybill(order); err == nil {
+			successCount++
+		}
+	}
+	if successCount != 0 {
+		return nil
+	}
+	return scheduler.ErrCanNotCreateAtLeastOneWaybill
+}
+
+func (s *DefScheduler) cancelOtherWaybills(bill *model.Waybill) (err error) {
+	savedOrderInfo := s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
+	for _, v := range savedOrderInfo.waybills {
+		if !(v.WaybillVendorID == bill.WaybillVendorID && v.VendorWaybillID == bill.VendorWaybillID) {
+			_ = s.GetDeliveryPlatformFromVendorID(v.WaybillVendorID).CancelWaybill(v)
+		}
+	}
+	return nil
+}
+
+func (s *DefScheduler) swtich2SelfDeliverWithRetry(bill *model.Waybill, retryCount int, duration time.Duration) {
+	if err := s.GetPurchasePlatformFromVendorID(bill.OrderVendorID).Swtich2SelfDeliver(bill.VendorOrderID); err != nil {
+		if retryCount >= 0 {
+			time.AfterFunc(duration, func() {
+				s.swtich2SelfDeliverWithRetry(bill, retryCount-1, duration)
+			})
+		} else {
+			// 如果购买平台转商家自送失败，最终还是要取消3方物流
+			s.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID).CancelWaybill(bill)
+		}
+	} else {
+		s.removeWaybillFromMap(bill, nil)
+	}
+}
+
+func (s *DefScheduler) loadWatchOrderFromMap(vendorOrderID string, vendorID int) *WatchOrderInfo {
+	universalOrderID := jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID)
+	var realSavedInfo *WatchOrderInfo
+	if savedInfo, ok := s.orderMap.Load(universalOrderID); ok {
+		realSavedInfo = savedInfo.(*WatchOrderInfo)
+	} else {
+		globals.SugarLogger.Infof("can not get saved order, vendorOrderID:%s, vendorID:%d, load it", vendorOrderID, vendorID)
+		if order, err := s.CurOrderManager.LoadOrder(vendorOrderID, vendorID); err == nil {
+			realSavedInfo = &WatchOrderInfo{
+				order: order,
+			}
+			s.orderMap.Store(universalOrderID, realSavedInfo)
+		} else {
+			globals.SugarLogger.Errorf("can not load order vendorOrderID:%s, vendorID:%d", vendorOrderID, vendorID)
+		}
+	}
+	return realSavedInfo
+}
+
+func (s *DefScheduler) removeWaybillFromMap(bill *model.Waybill, savedOrderInfo *WatchOrderInfo) {
+	if savedOrderInfo == nil {
+		savedOrderInfo = s.loadWatchOrderFromMap(bill.VendorOrderID, bill.OrderVendorID)
+	}
+	for k, v := range savedOrderInfo.waybills {
+		if v.VendorWaybillID == bill.VendorWaybillID && v.WaybillVendorID == bill.WaybillVendorID {
+			savedOrderInfo.waybills = append(savedOrderInfo.waybills[0:k], savedOrderInfo.waybills[k+1:]...)
+			break
+		}
+	}
+}
+
+func (s *DefScheduler) getLatestPickupTimeout(order *model.GoodsOrder, configTimeout time.Duration) (retVal time.Duration) {
+	beginTime := order.StatusTime
+	if order.ExpectedDeliveredTime != utils.DefaultTimeValue {
+		beginTime = order.ExpectedDeliveredTime.Add(-defTime2Delivery)
+	}
+	return jxutils.GetRealTimeout(beginTime, configTimeout)
+}
+
+func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userMobile string, jxStoreID int, db orm.Ormer, handler func(accepted bool) error) int {
 	handleType := 0
 	if userMobile != "" {
 		if db == nil {
@@ -83,3 +272,26 @@ func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userM
 	}
 	return handleType
 }
+
+func (s *DefScheduler) mergeOrderStartConfig(status int, config *scheduler.StatusActionConfig) (retVal *scheduler.StatusActionConfig) {
+	retVal = &scheduler.StatusActionConfig{
+		Timeout:       s.defWorkflowConfig[status].Timeout,
+		TimeoutAction: s.defWorkflowConfig[status].TimeoutAction,
+	}
+	if config != nil {
+		if config.Timeout >= 0 {
+			retVal.Timeout = config.Timeout
+		}
+		if config.TimeoutAction != nil {
+			retVal.TimeoutAction = config.TimeoutAction
+		}
+	}
+	return retVal
+}
+
+func (s *DefScheduler) updateOrderByStatus(order *model.GoodsOrder, status *model.OrderStatus) (retVal *model.GoodsOrder) {
+	order.Status = status.Status
+	order.VendorStatus = status.VendorStatus
+	order.StatusTime = status.StatusTime
+	return order
+}
diff --git a/business/scheduler/scheduler.go b/business/scheduler/scheduler.go
index a7d36dd2c..5f4cd31b0 100644
--- a/business/scheduler/scheduler.go
+++ b/business/scheduler/scheduler.go
@@ -13,26 +13,25 @@ var (
 )
 
 var (
-	ErrStatusIsNotOKForOperation = errors.New("当前状态操作无效")
+	ErrStatusIsNotOKForOperation     = errors.New("当前状态操作无效")
+	ErrCanNotCreateAtLeastOneWaybill = errors.New("一个运单都不能创建")
 )
 
-type StatusTimeoutAction struct {
-	Action  func(order *model.GoodsOrder) (err error)
-	Timeout time.Duration
-}
-
-type StatusConfig struct {
-	handler          PurchasePlatformHandler
-	AutoStatusChange map[int]*StatusTimeoutAction
+type StatusActionConfig struct {
+	Timeout       time.Duration                             // 超时时间，为0的话表示立即执行
+	TimeoutAction func(order *model.GoodsOrder) (err error) // 超时后需要执行的动作，为nil表示此状态不需要执行监控
 }
 
 type PurchasePlatformHandler interface {
 	AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error)
 	PickedUpGoods(order *model.GoodsOrder) (err error)
-	Swtich2SelfDeliver(order *model.GoodsOrder) (err error)
-	SelfDeliverPickedUpGoods(order *model.GoodsOrder) (err error)
+
+	Swtich2SelfDeliver(vendorOrderID string) (err error)
+
 	SelfDeliverDelievering(order *model.GoodsOrder) (err error)
 	SelfDeliverDelievered(order *model.GoodsOrder) (err error)
+
+	GetStatusActionConfig(status int) *StatusActionConfig
 }
 
 type DeliveryPlatformHandler interface {
@@ -41,6 +40,7 @@ type DeliveryPlatformHandler interface {
 }
 
 type OrderManager interface {
+	LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error)
 	OnOrderStatusChanged(status *model.OrderStatus) (err error) // 此消息是否使用还不确定
 	UpdateWaybillVendorID(bill *model.Waybill) (err error)
 }
@@ -92,3 +92,18 @@ func (c *BaseScheduler) RegisterDeliveryPlatform(vendorID int, handler DeliveryP
 	}
 	c.DeliveryPlatformHandlers[vendorID] = handler
 }
+
+func (c *BaseScheduler) GetPurchasePlatformFromVendorID(vendorID int) PurchasePlatformHandler {
+	return c.PurchasePlatformHandlers[vendorID]
+}
+
+func (c *BaseScheduler) GetDeliveryPlatformFromVendorID(vendorID int) DeliveryPlatformHandler {
+	return c.DeliveryPlatformHandlers[vendorID]
+}
+
+type BasePurchasePlatform struct {
+}
+
+func (p *BasePurchasePlatform) GetStatusActionConfig(status int) *StatusActionConfig {
+	return nil
+}
diff --git a/legacy/jd/controller/order.go b/legacy/jd/controller/order.go
index 5d08470d2..8a1917046 100644
--- a/legacy/jd/controller/order.go
+++ b/legacy/jd/controller/order.go
@@ -212,7 +212,7 @@ func normalOrderStatus(msg *jdapi.CallbackOrderMsg) (err error) {
 			if rec.OrderStatus == int(utils.Str2Int64(msg.StatusID)) {
 				globals.SugarLogger.Infof("Duplicate message msg:%v", msg)
 			} else {
-				if err = freshfood.FreshFoodAPI.JDOrderStatus(msg); err == nil {
+				if err = freshfood.FreshFoodAPI.JDOrderStatus(msg); err == nil && msg.StatusID != jdapi.OrderStatusWaitOutStore { // 老系统没有处理OrderStatusWaitOutStore，不转发
 					rec.OrderStatus = int(utils.Str2Int64(msg.StatusID))
 					rec.OrderStatusTime = msg.Timestamp
 					rec.Code = "0"