- refactor file structure.

2018-08-17 13:59:15 +08:00
parent d872d4d0ec
commit d40186e930
25 changed files with 153 additions and 150 deletions
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -0,0 +1,359 @@
+package orderman
+
+import (
+	"fmt"
+	"time"
+
+	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego/orm"
+)
+
+func (c *OrderManager) LoadPendingOrders() []*model.GoodsOrder {
+	db := orm.NewOrm()
+	var orders []*model.GoodsOrder
+	tillTime := time.Now().Add(-pendingOrderGapMax)
+	_, err := db.Raw(`
+	SELECT *
+	FROM goods_order
+	WHERE order_created_at >= ?
+	AND status < ?
+	`, tillTime, model.OrderStatusEndBegin).QueryRows(&orders)
+	if err != nil {
+		globals.SugarLogger.Warnf("LoadPendingOrders load pending orders error:%v", err)
+		return nil
+	}
+	for _, order := range orders {
+		utils.CallFuncLogError(func() error {
+			_, err = db.QueryTable("order_sku").Filter("vendor_order_id", order.VendorOrderID).Filter("vendor_id", order.VendorID).All(&order.Skus)
+			return err
+		}, "LoadPendingOrders order:%v", order)
+	}
+	return orders
+}
+
+// msgVendorStatus的意思是事件本身的类型，类似有时收到NewOrder事件去取，订单状态不一定就是New的
+// OnOrderAdjust也类似，而OrderStatus要记录的是消息，所以添加这个
+func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus string) (err error) {
+	// todo transaction
+	db := orm.NewOrm()
+	if order.Status == model.OrderStatusUnknown {
+		order.Status = model.OrderStatusNew
+	}
+	status := model.Order2Status(order)
+	status.Status = model.OrderStatusNew
+	status.VendorStatus = msgVendorStatus
+	isDuplicated, err := addOrderOrWaybillStatus(status, db)
+	if err == nil && !isDuplicated {
+		if isDuplicated, err = c.saveOrder(order, false, db); err == nil && !isDuplicated {
+			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
+		}
+	}
+	return err
+}
+
+// todo 调整单的处理可能还需要再细化一点，当前只是简单的删除重建
+func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus string) (err error) {
+	// todo transaction
+	db := orm.NewOrm()
+	if order.Status == model.OrderStatusUnknown {
+		order.Status = model.OrderStatusNew
+	}
+	status := model.Order2Status(order)
+	status.Status = model.OrderStatusAdjust
+	status.VendorStatus = msgVendorStatus
+	isDuplicated, err := addOrderOrWaybillStatus(status, db)
+	if err == nil && !isDuplicated {
+		err = utils.CallFuncLogError(func() error {
+			_, err = db.Raw("DELETE FROM order_sku WHERE vendor_order_id = ? AND vendor_id = ?", order.VendorOrderID, order.VendorID).Exec()
+			return err
+		}, "OnAdjustOrder delete order, orderID:%s", order.VendorOrderID)
+		if err != nil {
+			return err
+		}
+		err = utils.CallFuncLogError(func() error {
+			_, err = db.Raw("DELETE FROM goods_order WHERE vendor_order_id = ? AND vendor_id = ?", order.VendorOrderID, order.VendorID).Exec()
+			return err
+		}, "OnAdjustOrder delete order_sku, orderID:%s", order.VendorOrderID)
+		if err != nil {
+			return err
+		}
+		if isDuplicated, err = c.saveOrder(order, true, db); err == nil && !isDuplicated {
+			// 因为订单调度器需要的是真实状态，所以用order的状态
+			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
+			err = scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), false)
+		}
+	}
+	return err
+}
+
+func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) {
+	isDuplicated, err := c.addOrderStatus(orderStatus, nil)
+	if err == nil && !isDuplicated {
+		err = scheduler.CurrentScheduler.OnOrderStatusChanged(orderStatus, false)
+		if globals.GenerateLegacyJxOrder {
+			c.legacyJxOrderStatusChanged(orderStatus, nil)
+		}
+	}
+	return err
+}
+
+// private
+func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) {
+	// 忽略查找JX信息错误
+	c.updateOrderOtherInfo(order, db)
+	order.ID = 0
+	order.WaybillVendorID = model.VendorIDUnknown
+	order.OrderFinishedAt = utils.DefaultTimeValue
+	order.OrderCreatedAt = order.StatusTime
+
+	// hardcode 兼容京东消息错序问题
+	orderStatus := &model.OrderStatus{}
+	if db.Raw(`
+	SELECT *
+	FROM order_status
+	WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ?
+	ORDER BY status_time DESC
+	LIMIT 1
+	`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID).QueryRow(orderStatus) == nil {
+		order.Status = orderStatus.Status
+		order.VendorStatus = orderStatus.VendorStatus
+		order.StatusTime = orderStatus.StatusTime
+	}
+
+	globals.SugarLogger.Debugf("saveOrder isAdjust:%t, order:%v", isAdjust, order)
+	db.Begin()
+	created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID")
+	if err = err2; err == nil {
+		if created {
+			sql := `INSERT INTO order_sku(vendor_order_id, vendor_id, count, vendor_sku_id, sku_id, jx_sku_id, sku_name, 
+				shop_price, sale_price, weight, sku_type, promotion_type, order_created_at) VALUES`
+			params := []interface{}{}
+			for _, sku := range order.Skus {
+				sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
+				params = append(params, sku.VendorOrderID, sku.VendorID, sku.Count, sku.VendorSkuID, sku.SkuID, sku.JxSkuID, sku.SkuName,
+					sku.ShopPrice, sku.SalePrice, sku.Weight, sku.SkuType, sku.PromotionType, order.StatusTime)
+			}
+			sql = sql[:len(sql)-1] + ";"
+			if _, err = db.Raw(sql, params...).Exec(); err != nil {
+				db.Rollback()
+				baseapi.SugarLogger.Infof("saveOrder insert order:%v, order_sku error:%v", order, err)
+			} else {
+				db.Commit()
+				if globals.GenerateLegacyJxOrder {
+					c.legacyWriteJxOrder(order, db, isAdjust)
+				}
+			}
+		} else {
+			isDuplicated = true
+			order.DuplicatedCount++
+			db.Update(order, "DuplicatedCount")
+			db.Commit()
+			baseapi.SugarLogger.Infof("saveOrder duplicated orderid:%s msg received", order.VendorOrderID)
+		}
+	} else {
+		db.Rollback()
+		globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
+	}
+	return isDuplicated, err
+}
+
+func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) {
+	jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
+	if jxStoreID == 0 {
+		globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
+		return nil
+	}
+	orderSkus := order.Skus
+	var sql string
+	if orderSkus[0].VendorID == model.VendorIDJD {
+		sql = `
+		SELECT t1.jdskuid, t1.skuid, t2.price
+		FROM skumapper t1
+		LEFT JOIN jx_sku_store_bind t2 ON t1.skuid = t2.jxskuid AND t2.jxstoreid = ?
+		WHERE t1.jdskuid IN (-1,`
+	} else if orderSkus[0].VendorID == model.VendorIDELM {
+		sql = `
+		SELECT t2.jxskuid, t2.jxskuid, t2.price
+		FROM jx_sku_store_bind t2
+		WHERE t2.jxstoreid = ? AND t2.jxskuid IN (-1,`
+	} else {
+		panic(fmt.Sprintf("wrong vendorid:%d", orderSkus[0].VendorID))
+	}
+
+	sqlParams := []interface{}{jxStoreID}
+	for _, v := range orderSkus {
+		if orderSkus[0].VendorID == model.VendorIDJD {
+			sql += "?,"
+			sqlParams = append(sqlParams, int(utils.Str2Int64(v.VendorSkuID)))
+		} else if v.SkuID != 0 {
+			sql += "?,"
+			sqlParams = append(sqlParams, v.SkuID)
+		}
+	}
+	sql = sql[:len(sql)-1] + ")"
+	var lists []orm.ParamsList
+	if num, err := db.Raw(sql, sqlParams...).ValuesList(&lists); err == nil {
+		skumapper := make(map[string]orm.ParamsList)
+		for _, v := range lists {
+			skumapper[v[0].(string)] = v
+		}
+		// globals.SugarLogger.Debug(skumapper)
+		for _, v := range orderSkus {
+			if orderSkus[0].VendorID == model.VendorIDJD {
+				if values, ok := skumapper[v.VendorSkuID]; ok {
+					v.JxSkuID = int(utils.Str2Int64(utils.Interface2String(values[1])))
+					v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0)
+					order.ShopPrice += v.ShopPrice
+					if v.ShopPrice == 0 {
+						globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]京东订单sku门店价格为零（一般原因为没有门店价格信息），orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.JxSkuID, v)
+					}
+				} else {
+					globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]京东订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
+				}
+			} else {
+				if v.SkuID != 0 {
+					if values, ok := skumapper[utils.Int2Str(v.SkuID)]; ok {
+						v.ShopPrice = utils.Str2Int64WithDefault(utils.Interface2String(values[2]), 0)
+						order.ShopPrice += v.ShopPrice
+						if v.ShopPrice == 0 {
+							globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]饿了么订单sku门店价格为零，orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.SkuID, v)
+						}
+					} else {
+						globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]饿了么订单sku找不到门店价格，orderID:%s, StoreID:%d, SkuID:%d, sku:%v", order.VendorOrderID, jxStoreID, v.SkuID, v)
+					}
+				} else {
+					globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营2]饿了么订单sku没有京西ID信息，orderID:%s, VendorSkuID:%s, sku:%v", order.VendorOrderID, v.VendorSkuID, v)
+				}
+			}
+		}
+	} else {
+		globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku info for orderID:%s, num:%d, error:%v", order.VendorOrderID, num, err)
+	}
+	return err
+}
+
+func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) {
+	var sql string
+	if order.VendorID == model.VendorIDJD {
+		sql = `
+		SELECT t1.jxstoreid
+		FROM jxstoremap t1
+		/* JOIN jxstore t2 ON t1.jxstoreid = t2.storeid */
+		WHERE t1.jdstoreid = ?
+		`
+	} else if order.VendorID == model.VendorIDELM {
+		sql = `
+		SELECT t1.jx_store_id
+		FROM jx_to_elm_store_map t1
+		/* JOIN jxstore t2 ON t1.jx_store_id = t2.storeid */
+		WHERE t1.elm_store_id = ?
+		`
+	} else {
+		panic(fmt.Sprintf("wrong vendorid:%d", order.VendorID))
+	}
+	var lists []orm.ParamsList
+	if num, err := db.Raw(sql, utils.Str2Int64(order.VendorStoreID)).ValuesList(&lists); err == nil && num == 1 {
+		order.JxStoreID = int(utils.Str2Int64(lists[0][0].(string)))
+	} else {
+		globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单orderID:%s在京西找不到相应的京西门店信息，请处理, VendorStoreID:%s, num:%d, error:%v", order.VendorOrderID, order.VendorStoreID, num, err)
+	}
+	err = c.updateOrderSkuOtherInfo(order, db)
+	return err
+}
+
+func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) {
+	if db == nil {
+		db = orm.NewOrm()
+	}
+	isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
+	if err == nil && !isDuplicated &&
+		(orderStatus.Status > model.OrderStatusUnknown ||
+			(orderStatus.Status == model.OrderStatusUnlocked || orderStatus.Status == model.OrderStatusLocked || orderStatus.Status == model.OrderStatusApplyCancel)) {
+		order := &model.GoodsOrder{
+			VendorOrderID: orderStatus.VendorOrderID,
+			VendorID:      orderStatus.VendorID,
+		}
+		if err = db.ReadForUpdate(order, "VendorOrderID", "VendorID"); err == nil {
+			if (orderStatus.Status == model.OrderStatusUnlocked || orderStatus.Status == model.OrderStatusLocked || orderStatus.Status == model.OrderStatusApplyCancel) ||
+				(orderStatus.Status > model.OrderStatusUnknown && orderStatus.Status >= order.Status) { // todo 要求status不能回绕
+				order.VendorStatus = orderStatus.VendorStatus
+				order.StatusTime = orderStatus.StatusTime
+				updateFields := []string{
+					"VendorStatus", "StatusTime",
+				}
+				if orderStatus.Status > model.OrderStatusUnknown {
+					order.LockStatus = model.OrderStatusUnknown
+					order.Status = orderStatus.Status
+					updateFields = append(updateFields, "Status", "LockStatus")
+				} else {
+					if orderStatus.Status == model.OrderStatusUnlocked {
+						order.LockStatus = model.OrderStatusUnknown
+						updateFields = append(updateFields, "LockStatus")
+					} else if orderStatus.Status == model.OrderStatusLocked || orderStatus.Status == model.OrderStatusApplyCancel {
+						order.LockStatus = orderStatus.Status
+						updateFields = append(updateFields, "LockStatus")
+					}
+				}
+				if orderStatus.Status >= model.OrderStatusEndBegin {
+					order.OrderFinishedAt = orderStatus.StatusTime
+					updateFields = append(updateFields, "OrderFinishedAt")
+				}
+				utils.CallFuncLogError(func() error {
+					_, err = db.Update(order, updateFields...)
+					return err
+				}, "addOrderStatus update orderID:%s, status:%v", order.VendorOrderID, orderStatus)
+			} else {
+				isDuplicated = true
+			}
+		} else {
+			if err == orm.ErrNoRows { // todo 消息错序
+				err = nil
+			} else {
+				globals.SugarLogger.Warnf("addOrderStatus orderID:%s read failed with error:%v", order.VendorOrderID, err)
+			}
+		}
+	}
+	return isDuplicated, err
+}
+
+func (c *OrderManager) LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) {
+	db := orm.NewOrm()
+	order = &model.GoodsOrder{
+		VendorOrderID: vendorOrderID,
+		VendorID:      vendorID,
+	}
+	if err = db.Read(order, "VendorOrderID", "VendorID"); err == nil {
+		err = utils.CallFuncLogError(func() error {
+			_, err = db.QueryTable("order_sku").Filter("vendor_order_id", vendorOrderID).Filter("vendor_id", vendorID).All(&order.Skus)
+			return err
+		}, "LoadOrder orderID:%s", vendorOrderID)
+	}
+	if err != nil {
+		globals.SugarLogger.Infof("LoadOrder orderID:%s failed with error:%v", vendorOrderID, err)
+	}
+	return order, err
+}
+
+//Waybill
+func (c *OrderManager) UpdateWaybillVendorID(bill *model.Waybill, revertStatus bool) (err error) {
+	globals.SugarLogger.Debugf("UpdateWaybillVendorID bill:%v", bill)
+	db := orm.NewOrm()
+	params := orm.Params{
+		"vendor_waybill_id": bill.VendorWaybillID,
+		"waybill_vendor_id": bill.WaybillVendorID,
+	}
+	// 如果运单被取消，则要保持在已拣货状态
+	if revertStatus && bill.WaybillVendorID == model.VendorIDUnknown {
+		params["status"] = model.OrderStatusFinishedPickup
+	}
+	utils.CallFuncLogError(func() error {
+		_, err = db.QueryTable("goods_order").Filter("vendor_order_id", bill.VendorOrderID).Filter("vendor_id", bill.OrderVendorID).Update(params)
+		return err
+	}, "UpdateWaybillVendorID update order, bill:%v", bill)
+	return err
+}
--- a/business/jxcallback/orderman/order_legacy.go
+++ b/business/jxcallback/orderman/order_legacy.go
@@ -0,0 +1,315 @@
+package orderman
+
+import (
+	"strings"
+
+	"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/legacymodel"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego/orm"
+)
+
+// legacy
+const (
+	JX_ORDER_STATUS_WAIT_TO_ACCEPT    = -1 //未接单(41000)
+	JX_ORDER_STATUS_PICKING           = 0  //拣货(32000->或定时召唤达达)
+	JX_ORDER_STATUS_WAIT_FOR_DELIVERY = 1  //待配送(2->或转商家自送)
+	JX_ORDER_STATUS_DELIVERING        = 2  //配送中(33040)
+	JX_ORDER_STATUS_DELIVERY_DONE     = 3  //已完成(33060->90000)
+	JX_ORDER_STATUS_EXCEPTION_APPLY   = 4  //异常申请
+	JX_ORDER_STATUS_NOT_DELIVER       = 5  //不配送
+	JX_ORDER_STATUS_AFTER_SALE        = 6  //售后单
+	JX_ORDER_STATUS_CANCEL            = 7  //已取消
+	JX_ORDER_STATUS_ADJUST            = 8  //调整单
+
+	JX_DELIVERY_STATUS_NOT_DELIVERY                      = -1 //尚未申请配送
+	JX_DELIVERY_STATUS_WAIT_TO_GRAB                      = 0  //等待抢单
+	JX_DELIVERY_STATUS_GRAB_DONE                         = 1  //已抢单
+	JX_DELIVERY_STATUS_FAIL_TO_GET_GOODS                 = 2  //取货失败
+	JX_DELIVERY_STATUS_FAIL_TO_GET_GOODS_WAIT_TO_CONFIRM = 3  //取货失败待审核
+	JX_DELIVERY_STATUS_GET_GOODS_DONE                    = 4  //取货完成
+	JX_DELIVERY_STATUS_DELIVERY_FAIL                     = 5  //投递失败
+	JX_DELIVERY_STATUS_DELIVERY_DONE                     = 6  //已完成
+	JX_DELIVERY_STATUS_DELIVERY_CANCEL                   = 7  //已取消
+
+	JX_STATUS_UNKNOWN = -100
+)
+
+const (
+	DD_CARRIER_NO         = "9966"
+	SELLER_CARRIER_NO     = "2938"
+	MTPS_CARRIER_NO       = "1123"
+	DDDELIVERY_CARRIER_NO = "3465"
+	EME_SELF_CARRIER_NO   = "9999"
+)
+
+var (
+	VENDOR_ID2CARRIER_NO = map[int]string{
+		model.VendorIDJD:   DD_CARRIER_NO,
+		model.VendorIDELM:  EME_SELF_CARRIER_NO,
+		model.VendorIDDada: DDDELIVERY_CARRIER_NO,
+		model.VendorIDMTPS: MTPS_CARRIER_NO,
+	}
+
+	CARRIERS_NAMES = map[string]string{
+		DD_CARRIER_NO:         "达达专送",
+		SELLER_CARRIER_NO:     "门店自送",
+		MTPS_CARRIER_NO:       "美团配送",
+		DDDELIVERY_CARRIER_NO: "达达众包",
+		EME_SELF_CARRIER_NO:   "饿了么蜂鸟",
+	}
+
+	BUSINESS_TAGS_MAP = map[string]string{
+		"one_dingshida":        "0",
+		"dj_aging_nextday":     "1",
+		"dj_aging_immediately": "2",
+		"lengcang":             "3",
+		"lengdong":             "3",
+	}
+)
+
+func legacyMapCoordinateType(coordType int) (jxorderCoordType int) {
+	if coordType == model.CoordinateTypeMars {
+		return 2
+	}
+	return 0
+}
+
+func legacyMapOrderStatus(orderStatus int) (retVal int8) {
+	switch orderStatus {
+	case model.OrderStatusNew:
+		retVal = JX_ORDER_STATUS_WAIT_TO_ACCEPT
+	case model.OrderStatusAccepted:
+		retVal = JX_ORDER_STATUS_PICKING
+	case model.OrderStatusDelivering:
+		retVal = JX_ORDER_STATUS_DELIVERING
+	case model.OrderStatusDelivered, model.OrderStatusFinished:
+		retVal = JX_ORDER_STATUS_DELIVERY_DONE
+	case model.OrderStatusAdjust:
+		retVal = JX_ORDER_STATUS_ADJUST
+	case model.OrderStatusApplyCancel:
+		retVal = JX_ORDER_STATUS_EXCEPTION_APPLY
+	case model.OrderStatusCanceled:
+		retVal = JX_ORDER_STATUS_CANCEL
+	case model.OrderStatusFinishedPickup:
+		retVal = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
+	default:
+		retVal = JX_STATUS_UNKNOWN
+	}
+	return retVal
+}
+
+func legacyMapWaybillStatus(status int) (retVal int8) {
+	switch status {
+	case model.WaybillStatusNew:
+		retVal = JX_DELIVERY_STATUS_WAIT_TO_GRAB
+	case model.WaybillStatusAccepted:
+		retVal = JX_DELIVERY_STATUS_GRAB_DONE
+	case model.WaybillStatusCourierArrived:
+		retVal = JX_DELIVERY_STATUS_GET_GOODS_DONE
+	case model.WaybillStatusDelivering:
+		retVal = JX_DELIVERY_STATUS_GET_GOODS_DONE
+	case model.WaybillStatusDelivered:
+		retVal = JX_DELIVERY_STATUS_DELIVERY_DONE
+	case model.WaybillStatusCanceled:
+		retVal = JX_DELIVERY_STATUS_DELIVERY_CANCEL
+	case model.WaybillStatusFailed:
+		retVal = JX_DELIVERY_STATUS_DELIVERY_FAIL
+	default:
+		retVal = JX_STATUS_UNKNOWN
+	}
+	return retVal
+}
+
+func (c *OrderManager) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Ormer, isDelFirst bool) (err error) {
+	var result map[string]interface{}
+	businessTags := ""
+	if order.VendorID == model.VendorIDJD && utils.UnmarshalUseNumber([]byte(order.OriginalData), &result) == nil {
+		tagList := strings.Split(result["businessTag"].(string), ";")
+		list := []string{}
+		for _, v := range tagList {
+			if tag, ok := BUSINESS_TAGS_MAP[v]; ok {
+				list = append(list, tag)
+			}
+		}
+		businessTags = strings.Join(list, "|") + "|"
+	}
+
+	db.Begin()
+	if isDelFirst {
+		db.Raw("DELETE FROM "+globals.JxorderTableName+" WHERE order_id = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
+		db.Raw("DELETE FROM "+globals.JxorderskuTableName+" WHERE order_id = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
+	}
+	orderStatus := legacyMapOrderStatus(order.Status)
+	if orderStatus < JX_ORDER_STATUS_PICKING {
+		orderStatus = JX_ORDER_STATUS_PICKING
+	}
+	jxorder := &legacymodel.Jxorder2{
+		VenderId:               int8(order.VendorID),
+		OrderId:                utils.Str2Int64(order.VendorOrderID),
+		JxStoreId:              utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order)),
+		JxStoreName:            order.StoreName,
+		OrderNum:               order.OrderSeq,
+		OrderStatus:            orderStatus,
+		OrderStatusTime:        utils.Time2Str(order.StatusTime),
+		BusinessTag:            businessTags,
+		SkuCount:               order.SkuCount,
+		OrderBuyerRemark:       order.BuyerComment,
+		BuyerFullName:          order.ConsigneeName,
+		BuyerFullAddress:       order.ConsigneeAddress,
+		BuyerMobile:            order.ConsigneeMobile,
+		BuyerCoordType:         legacyMapCoordinateType(order.CoordinateType),
+		BuyerLng:               jxutils.IntCoordinate2Standard(order.ConsigneeLng),
+		BuyerLat:               jxutils.IntCoordinate2Standard(order.ConsigneeLat),
+		CityName:               "all",
+		OrderStartTime:         utils.Time2Str(order.StatusTime),
+		JdStoreId:              order.VendorStoreID,
+		OrderTotalMoney:        int(order.SalePrice),
+		OrderDiscountMoney:     int(order.SalePrice - order.ActualPayPrice),
+		OrderBuyerPayableMoney: int(order.ActualPayPrice),
+		// DeliveryPackageWeight: float64(order.Weight) / 1000,
+	}
+	if order.VendorID == model.VendorIDELM {
+		jxorder.OrderStatus = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
+	}
+	if order.ExpectedDeliveredTime.Sub(utils.DefaultTimeValue) > 0 {
+		jxorder.OrderPreEndDelivTime = utils.Time2Str(order.ExpectedDeliveredTime)
+	}
+
+	_, err = db.Insert(jxorder)
+	if err != nil {
+		db.Rollback()
+		globals.SugarLogger.Infof("insert jxorder:%v error:%v", jxorder, err)
+		return err
+	}
+	sql := "INSERT INTO " + globals.JxorderskuTableName + "(vender_id, order_id, jx_sku_id, sku_name, jx_store_id, sku_price, sku_count, is_gift, promotion_type, sku_plat_discount, sku_vender_discount, sku_img) VALUES"
+	params := []interface{}{}
+	for _, sku := range order.Skus {
+		sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
+		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 {
+		db.Rollback()
+		baseapi.SugarLogger.Infof("insert jxordersku jxorder:%v error:%v", jxorder, err)
+	} else {
+		db.Commit()
+		vendorOrderID := utils.Str2Int64(order.VendorOrderID)
+		utils.CallFuncLogError(func() error {
+			_, err = db.Raw(`
+			UPDATE `+globals.JxorderTableName+` t1
+			JOIN jxstore t2 ON t2.storeid = t1.jx_store_id
+			SET t1.store_lng = t2.lng,
+				t1.store_lat = t2.lat
+			WHERE t1.order_id = ?;
+		`, vendorOrderID /*, vendorOrderID*/).Exec()
+			return err
+		}, "update jxorder")
+
+		utils.CallFuncLogError(func() error {
+			_, err = db.Raw(`
+			UPDATE `+globals.JxorderskuTableName+` t1
+			JOIN jx_sku t2 ON t2.id = t1.jx_sku_id
+			JOIN jx_sku_name t3 ON t3.id = t2.nameid
+			SET t1.sku_img = t3.img
+			WHERE t1.order_id = ?;
+		`, vendorOrderID /*, vendorOrderID*/).Exec()
+			return err
+		}, "update jxordersku")
+	}
+	return err
+}
+
+func (c *OrderManager) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) {
+	orderStatus := legacyMapOrderStatus(status.Status)
+	if orderStatus != JX_STATUS_UNKNOWN {
+		if status.VendorID == model.VendorIDELM {
+			if orderStatus < JX_ORDER_STATUS_WAIT_FOR_DELIVERY {
+				orderStatus = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
+			}
+		}
+		if db == nil {
+			db = orm.NewOrm()
+		}
+		jxorder := &legacymodel.Jxorder2{
+			OrderId: utils.Str2Int64(status.VendorOrderID),
+		}
+		if err = db.Read(jxorder, "OrderId"); err == nil {
+			utils.CallFuncLogError(func() error {
+				jxorder.OrderStatus = orderStatus
+				jxorder.OrderStatusTime = utils.Time2Str(status.StatusTime)
+				updateFields := []string{
+					"OrderStatus",
+					"OrderStatusTime",
+				}
+				if status.Status >= model.OrderStatusEndBegin {
+					jxorder.DeliveryFinishTime = utils.Time2Str(status.StatusTime)
+					updateFields = append(updateFields, "DeliveryFinishTime")
+				}
+				_, err = db.Update(jxorder, updateFields...)
+				if orderStatus == JX_ORDER_STATUS_DELIVERY_DONE || orderStatus == JX_ORDER_STATUS_DELIVERING {
+					db.Raw(`
+			UPDATE `+globals.JxorderTableName+` t1
+			JOIN waybill t2 ON t2.vendor_order_id = t1.order_id AND t2.status = 105
+			SET t1.delivery_price  = IF(t2.waybill_vendor_id = 102, t2.desired_fee/100, t1.delivery_price),
+				t1.delivery_price1 = IF(t2.waybill_vendor_id = 101, t2.desired_fee/100, t1.delivery_price1)
+			WHERE t1.order_id = ?
+			`, jxorder.OrderId).Exec()
+				}
+				return err
+			}, "legacyJxOrderStatusChanged")
+		} else {
+			globals.SugarLogger.Infof("read legacyJxOrder orderID:%d error:%v, ", jxorder.OrderId, err)
+		}
+	}
+	return err
+}
+
+func (c *OrderManager) legacyWaybillStatusChanged(bill *model.Waybill, db orm.Ormer) (err error) {
+	deliveryStatus := legacyMapWaybillStatus(bill.Status)
+	if deliveryStatus != JX_STATUS_UNKNOWN {
+		if db == nil {
+			db = orm.NewOrm()
+		}
+		jxorder := &legacymodel.Jxorder2{
+			OrderId: utils.Str2Int64(bill.VendorOrderID),
+		}
+		if err = db.Read(jxorder, "OrderId"); err == nil {
+			utils.CallFuncLogError(func() error {
+				updateFields := []string{
+					"DeliveryCarrierNo",
+					"DeliveryCarrierName",
+					"DeliveryManNo",
+					"DeliveryManName",
+					"DeliveryManPhone",
+					"DeliveryBillNo",
+					"DeliveryStatus",
+				}
+				// jxorder.DeliveryPackageWeight
+				jxorder.DeliveryCarrierNo = VENDOR_ID2CARRIER_NO[bill.WaybillVendorID]
+				jxorder.DeliveryCarrierName = CARRIERS_NAMES[jxorder.DeliveryCarrierNo]
+				jxorder.DeliveryManNo = bill.CourierMobile
+				jxorder.DeliveryManName = bill.CourierName
+				jxorder.DeliveryManPhone = bill.CourierMobile
+				jxorder.DeliveryBillNo = bill.VendorWaybillID
+				jxorder.DeliveryStatus = deliveryStatus
+				// jxorder.DeliveryConfirmTime
+				if bill.Status == model.WaybillStatusNew {
+					updateFields = append(updateFields, "DeliveryStartTime")
+					jxorder.DeliveryStartTime = utils.Time2Str(bill.StatusTime)
+				} else if bill.Status >= model.WaybillStatusEndBegin {
+					jxorder.DeliveryFinishTime = utils.Time2Str(bill.StatusTime)
+					updateFields = append(updateFields, "DeliveryFinishTime")
+				}
+				_, err = db.Update(jxorder, updateFields...)
+				return err
+			}, "legacyJxOrderStatusChanged")
+		} else {
+			globals.SugarLogger.Infof("read legacyJxOrder, orderID:%d error:%v", jxorder.OrderId, err)
+		}
+	}
+	return err
+}
--- a/business/jxcallback/orderman/orderman.go
+++ b/business/jxcallback/orderman/orderman.go
@@ -0,0 +1,144 @@
+package orderman
+
+import (
+	"sort"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch" // 导入缺省订单调度器
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego/orm"
+)
+
+const (
+	pendingOrderGapMax            = 2 * 24 * time.Hour   // 每次重启机子时，要检查几天内的订单状态
+	maxTimeHandlePendingOrder     = 2 * time.Second      //处理pending order的最长时间
+	maxSleepGapHandlePendingOrder = 5 * time.Millisecond // 每个pending order的最长时间间隙
+)
+
+var (
+	CurOrderManager *OrderManager
+)
+
+// 所有公共接口调用前，要求在order里或status中设置合适的Status
+type OrderManager struct {
+}
+
+func NewOrderManager() *OrderManager {
+	return &OrderManager{}
+}
+
+type StatusTimer interface {
+	GetStatusTime() time.Time
+}
+
+type StatusTimerSlice []StatusTimer
+
+func (s StatusTimerSlice) Len() int {
+	return len(s)
+}
+
+func (s StatusTimerSlice) Less(i, j int) bool {
+	return s[i].GetStatusTime().Sub(s[j].GetStatusTime()) < 0
+}
+
+func (s StatusTimerSlice) Swap(i, j int) {
+	tmp := s[i]
+	s[i] = s[j]
+	s[j] = tmp
+}
+
+func init() {
+	CurOrderManager = NewOrderManager()
+	partner.Init(CurOrderManager)
+}
+
+func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) {
+	if status.OrderType == model.OrderTypeOrder {
+		globals.SugarLogger.Debugf("addOrderStatus order:%v", status)
+	} else {
+		globals.SugarLogger.Debugf("addOrderStatus waybill:%v", status)
+	}
+
+	status.ID = 0
+	created, _, err := db.ReadOrCreate(status, "VendorOrderID", "VendorID", "OrderType", "VendorStatus", "StatusTime")
+	if err == nil {
+		if !created {
+			globals.SugarLogger.Debugf("duplicated event:%v", status)
+			isDuplicated = true
+			status.DuplicatedCount++
+			utils.CallFuncLogError(func() error {
+				_, err = db.Update(status, "DuplicatedCount")
+				return err
+			}, "addOrderOrWaybillStatus update DuplicatedCount, status:%v", status)
+		}
+	}
+	if err != nil {
+		// todo 这里居然会有主键重复错误，逻辑上是不应该的
+		globals.SugarLogger.Warnf("addOrderOrWaybillStatus status:%v, access db error:%v", status, err)
+	}
+	return isDuplicated, err
+}
+
+// todo 最好还是改成全事件回放算了
+func LoadPendingOrders() {
+	orders := CurOrderManager.LoadPendingOrders()
+	globals.SugarLogger.Infof("LoadPendingOrders orders count:%d", len(orders))
+
+	ordersCount := len(orders)
+	if ordersCount > 0 {
+		bills := CurOrderManager.LoadPendingWaybills()
+		globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills))
+		var sortOrders StatusTimerSlice
+		for _, order := range orders {
+			if order.Status > model.OrderStatusNew {
+				status := model.Order2Status(order)
+				sortOrders = append(sortOrders, status)
+			}
+			// order.Status = model.OrderStatusNew // 就是要以实际order状态来调用scheduler.OnOrderNew
+			order.StatusTime = order.OrderCreatedAt
+			sortOrders = append(sortOrders, order)
+		}
+		for _, bill := range bills {
+			if bill.Status > model.WaybillStatusNew {
+				bill2 := *bill
+				sortOrders = append(sortOrders, &bill2)
+			}
+			bill.Status = model.WaybillStatusNew
+			bill.StatusTime = bill.WaybillCreatedAt
+			sortOrders = append(sortOrders, bill)
+		}
+		sort.Sort(sortOrders)
+		sleepGap := maxTimeHandlePendingOrder / time.Duration(ordersCount)
+		if sleepGap > maxSleepGapHandlePendingOrder {
+			sleepGap = maxSleepGapHandlePendingOrder
+		}
+		lastTime := time.Now()
+		for _, item := range sortOrders {
+			if order, ok := item.(*model.GoodsOrder); ok {
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnOrderNew(order, true)
+				}, order.VendorOrderID)
+			} else if status, ok := item.(*model.OrderStatus); ok {
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnOrderStatusChanged(status, true)
+				}, status.VendorOrderID)
+			} else {
+				bill := item.(*model.Waybill)
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, true)
+				}, bill.VendorOrderID)
+			}
+			curTime := time.Now()
+			timeout := sleepGap - curTime.Sub(lastTime)
+			if timeout > 0 {
+				time.Sleep(timeout)
+			}
+			lastTime = curTime
+		}
+	}
+}
--- a/business/jxcallback/orderman/waybill.go
+++ b/business/jxcallback/orderman/waybill.go
@@ -0,0 +1,109 @@
+package orderman
+
+import (
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego/orm"
+)
+
+func (w *OrderManager) LoadPendingWaybills() []*model.Waybill {
+	db := orm.NewOrm()
+	var bills []*model.Waybill
+	tillTime := time.Now().Add(-pendingOrderGapMax)
+	_, err := db.Raw(`
+	SELECT t1.*
+	FROM waybill t1
+	JOIN goods_order t2 ON t2.vendor_order_id = t1.vendor_order_id
+	AND t2.vendor_id = t1.order_vendor_id
+	AND t2.order_created_at >= ?
+	AND t2.status < ?
+	WHERE t1.waybill_created_at >= ?
+	AND t1.status < ?
+	`, tillTime, model.OrderStatusEndBegin, tillTime, model.WaybillStatusEndBegin).QueryRows(&bills)
+	if err != nil {
+		globals.SugarLogger.Warnf("LoadPendingWaybills load pending waybills error:%v", err)
+		return nil
+	}
+	return bills
+}
+
+func (w *OrderManager) onWaybillNew(bill2 *model.Waybill, db orm.Ormer) (isDuplicated bool, err error) {
+	globals.SugarLogger.Debugf("onWaybillNew bill:%v", bill2)
+	isDuplicated, err = addOrderOrWaybillStatus(model.Waybill2Status(bill2), db)
+	if err == nil && !isDuplicated {
+		bill2.ID = 0
+		bill2.WaybillCreatedAt = bill2.StatusTime
+		bill2.WaybillFinishedAt = utils.DefaultTimeValue
+		billCopied := *bill2
+		bill := &billCopied
+		created, _, err2 := db.ReadOrCreate(bill, "VendorWaybillID", "WaybillVendorID")
+		if err = err2; err == nil {
+			if !created {
+				bill.DuplicatedCount++
+				if bill2.VendorOrderID == bill2.VendorWaybillID { // 购物平台（比如京东）重新建的运单，单号始终是与订单相同的
+					bill2.ID = bill.ID
+					bill2.DuplicatedCount = bill.DuplicatedCount
+					db.Update(bill2) //更新所有字段
+				} else {
+					db.Update(bill, "DuplicatedCount")
+					isDuplicated = true
+					globals.SugarLogger.Infof("onWaybillNew duplicated bill:%v msg received", bill2)
+				}
+			} else {
+				*bill2 = *bill
+			}
+		} else {
+			globals.SugarLogger.Warnf("onWaybillNew create bill:%v, error:%v", bill2, err)
+		}
+	}
+	return isDuplicated, err
+}
+
+func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
+	var isDuplicated bool
+	db := orm.NewOrm()
+	if bill.Status == model.WaybillStatusNew {
+		isDuplicated, err = w.onWaybillNew(bill, db)
+	} else {
+		var addParams orm.Params
+		if bill.Status == model.WaybillStatusAccepted {
+			addParams = orm.Params{
+				"courier_name":   bill.CourierName,
+				"courier_mobile": bill.CourierMobile,
+				"desired_fee":    bill.DesiredFee,
+			}
+		}
+		isDuplicated, err = w.addWaybillStatus(bill, db, addParams)
+	}
+	if err == nil && !isDuplicated {
+		scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, false)
+		if globals.GenerateLegacyJxOrder {
+			w.legacyWaybillStatusChanged(bill, db)
+		}
+	}
+	return err
+}
+
+func (w *OrderManager) addWaybillStatus(bill *model.Waybill, db orm.Ormer, addParams orm.Params) (isDuplicated bool, err error) {
+	waybillStatus := model.Waybill2Status(bill)
+	isDuplicated, err = addOrderOrWaybillStatus(waybillStatus, db)
+	if err == nil && !isDuplicated && waybillStatus.Status > model.WaybillStatusUnknown { // todo 这里应该和addOrderStatus一样的改法，状态不能回绕
+		params := utils.MergeMaps(orm.Params{
+			"status":        bill.Status,
+			"vendor_status": bill.VendorStatus,
+			"status_time":   bill.StatusTime,
+		}, addParams)
+		if bill.Status >= model.WaybillStatusEndBegin {
+			params["waybill_finished_at"] = bill.StatusTime
+		}
+		utils.CallFuncLogError(func() error {
+			_, err = db.QueryTable("waybill").Filter("vendor_waybill_id", bill.VendorWaybillID).Filter("waybill_vendor_id", bill.WaybillVendorID).Update(params)
+			return err
+		}, "addWaybillStatus update waybill status, bill:%v", bill)
+	}
+	return isDuplicated, err
+}
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -0,0 +1,678 @@
+package defsch
+
+import (
+	"fmt"
+	"math/rand"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
+	"git.rosy.net.cn/jx-callback/business/legacymodel"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+	"github.com/astaxie/beego/orm"
+)
+
+const (
+	time2Delivered          = 1 * time.Hour     // 正常从下单到送达的时间。
+	time2Schedule3rdCarrier = 330 * time.Second // 京东要求5分钟后才能转自送，保险起见，设置为5分半钟
+	// time2Schedule3rdCarrierGap4OrderStatus = 3 * time.Minute   // 京东要求是运单状态为待抢单且超时5分钟，但为了防止没有运单事件，所以就拣货完成事件开始算，添加3分钟
+	time2AutoPickupMin = 15 * time.Minute
+	time2AutoPickupGap = 5 * 60 //随机5分钟
+
+	// （把pending order timerout 在-pendingOrderTimerMinMinSecond至pendingOrderTimerMaxSecond映射到pendingOrderTimerMinSecond至pendingOrderTimerMaxSecond）
+	pendingOrderTimerMinMinSecond = 5 * 60 // 5分钟
+	pendingOrderTimerMinSecond    = 2
+	pendingOrderTimerMaxSecond    = 5
+
+	maxWaybillRetryCount = 3
+
+	orderMapStoreMaxTime = 4 * 24 * time.Hour // cache最长存储时间
+)
+
+type WatchOrderInfo struct {
+	autoPickupTimeoutMinute int // 0表示禁用，1表示用缺省值time2AutoPickupMin，其它表示分钟数
+	storeDeliveryType       int
+	isNeed3rdDelivery       bool
+	supported3rdCarriers    []int
+	isSwitched2SelfDelivery bool
+	order                   *model.GoodsOrder      // order里的信息是保持更新的
+	waybills                map[int]*model.Waybill // 这个waybills里的状态信息是不真实的，只使用id相关的信息
+
+	timerStatusType int // 0表示订单，1表示运单
+	timerStatus     int
+	timer           *time.Timer
+
+	retryCount int // 失败后尝试的次数，调试阶段可能出现死循化，阻止这种情况发生
+}
+
+type StatusActionConfig struct {
+	TimerType     int                                              // 参见上面的相关常量定义
+	Timeout       time.Duration                                    // 超时时间，0在GetStatusActionConfig返回时表示不修改缺省
+	TimeoutGap    int                                              // 以秒为单位的随机时间，0在GetStatusActionConfig返回时表示不修改缺省
+	TimeoutAction func(savedOrderInfo *WatchOrderInfo) (err error) // 超时后需要执行的动作，为nil表示此状态不需要执行监控， nil在GetStatusActionConfig返回时表示不修改缺省
+}
+
+// 重要：此调度器要求同一定单的处理逻辑必须是序列化了的，不然会有并发问题
+type DefScheduler struct {
+	scheduler.BaseScheduler
+	defWorkflowConfig []map[int]*StatusActionConfig
+	orderMap          jxutils.SyncMapWithTimeout
+}
+
+func NewWatchOrderInfo(order *model.GoodsOrder) (retVal *WatchOrderInfo) {
+	retVal = &WatchOrderInfo{
+		autoPickupTimeoutMinute: 1,
+		isNeed3rdDelivery:       false,
+		storeDeliveryType:       scheduler.StoreDeliveryTypeCrowdSourcing,
+		waybills:                map[int]*model.Waybill{},
+		supported3rdCarriers:    []int{},
+	}
+	retVal.SetOrder(order)
+	return retVal
+}
+
+func (s *WatchOrderInfo) SetOrder(order *model.GoodsOrder) (retVal *model.GoodsOrder) {
+	retVal = s.order
+	if s.order != order {
+		if order != nil {
+			s.updateOrderStoreFeature(order)
+		}
+		s.order = order
+	}
+	return retVal
+}
+
+func (s *WatchOrderInfo) updateOrderStoreFeature(order *model.GoodsOrder) (err error) {
+	storefeature := &model.Jxstorefeature{
+		Id: jxutils.GetJxStoreIDFromOrder(order),
+	}
+	if storefeature.Id > 0 {
+		db := orm.NewOrm()
+		utils.CallFuncLogError(func() error {
+			err = db.Read(storefeature, "Id")
+			if err == nil {
+				s.autoPickupTimeoutMinute = int(storefeature.Autopickup)
+				if order.VendorID == model.VendorIDELM {
+					s.storeDeliveryType = int(storefeature.ElmDeliveryType)
+				} else if order.VendorID == model.VendorIDJD {
+					s.storeDeliveryType = int(storefeature.JdDeliveryType)
+				}
+				if (s.storeDeliveryType == scheduler.StoreDeliveryTypeByStore) ||
+					(order.VendorID == model.VendorIDJD && storefeature.JdCompetition != 0) ||
+					(order.VendorID == model.VendorIDELM && storefeature.ElmCompetition != 0) {
+					s.isNeed3rdDelivery = true
+				}
+				if s.isNeed3rdDelivery {
+					if storefeature.SupportMtps != 0 {
+						s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDMTPS)
+					}
+					if storefeature.SupportDada != 0 {
+						s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDDada)
+					}
+					if storefeature.SupportFengNiao != 0 {
+						s.supported3rdCarriers = append(s.supported3rdCarriers, model.VendorIDFengNiao)
+					}
+					if len(s.supported3rdCarriers) == 0 {
+						s.isNeed3rdDelivery = false
+						globals.SugarLogger.Infof("updateOrderStoreFeature orderID:%s no at least one carrier supported", order.VendorOrderID)
+					}
+				}
+			}
+			return err
+		}, "updateOrderStoreFeature")
+	}
+	return err
+}
+
+func init() {
+	sch := &DefScheduler{}
+	sch.IsReallyCallPlatformAPI = globals.ReallyCallPlatformAPI
+	sch.Init()
+	scheduler.CurrentScheduler = sch
+	sch.defWorkflowConfig = []map[int]*StatusActionConfig{
+		map[int]*StatusActionConfig{
+			model.OrderStatusNew: &StatusActionConfig{ // 自动接单
+				TimerType: scheduler.TimerTypeBaseStatusTime,
+				Timeout:   1 * time.Second,
+				TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) {
+					order := savedOrderInfo.order
+					_ = sch.handleAutoAcceptOrder(order.VendorOrderID, order.VendorID, order.ConsigneeMobile, jxutils.GetJxStoreIDFromOrder(order), nil, func(isAcceptIt bool) error {
+						if err = sch.AcceptOrRefuseOrder(order, isAcceptIt); err != nil {
+							// 为了解决京东新消息与接单消息乱序的问题
+							if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 && errWithCode.IntCode() == -1 {
+								if order2, err2 := sch.GetPurchasePlatformFromVendorID(order.VendorID).GetOrder(order.VendorOrderID); err2 == nil && order2.Status > order.Status {
+									sch.OnOrderStatusChanged(model.Order2Status(order2), false)
+									err = nil
+								} else {
+									err = err2
+								}
+							}
+						}
+						return err
+					})
+					return nil
+				},
+			},
+			model.OrderStatusAccepted: &StatusActionConfig{ // 自动拣货
+				TimerType:  scheduler.TimerTypeBaseExpectedDeliveredTime,
+				Timeout:    time2AutoPickupMin, // 此值会被门店设置覆盖
+				TimeoutGap: time2AutoPickupGap,
+				TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) {
+					if savedOrderInfo.autoPickupTimeoutMinute > 0 {
+						return sch.autoPickupGood(savedOrderInfo.order)
+					}
+					return nil
+				},
+			},
+			model.OrderStatusFinishedPickup: &StatusActionConfig{
+				TimerType:  scheduler.TimerTypeBaseStatusTime,
+				Timeout:    1 * time.Second,
+				TimeoutGap: 0,
+				TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) {
+					if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { // 自配送商家使用
+						return sch.createWaybillOn3rdProviders(savedOrderInfo, nil)
+					}
+					return nil
+				},
+			},
+		},
+		map[int]*StatusActionConfig{
+			model.WaybillStatusNew: &StatusActionConfig{
+				TimerType: scheduler.TimerTypeBaseStatusTime,
+				Timeout:   time2Schedule3rdCarrier,
+				TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) {
+					if savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore { // 非自配置商家使用
+						return sch.createWaybillOn3rdProviders(savedOrderInfo, nil)
+					}
+					return nil
+				},
+			},
+		},
+	}
+}
+
+// 以下是订单
+func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err error) {
+	globals.SugarLogger.Debugf("OnOrderNew orderID:%s", order.VendorOrderID)
+	savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false)
+	if savedOrderInfo == nil {
+		savedOrderInfo = NewWatchOrderInfo(order)
+		s.orderMap.StoreWithTimeout(jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), savedOrderInfo, orderMapStoreMaxTime)
+	} else {
+		savedOrderInfo.SetOrder(order) // 调整单或消息错序都可能进到这里来
+	}
+	s.resetTimer(savedOrderInfo, nil, isPending)
+	if !isPending {
+		weixinmsg.NotifyNewOrder(order)
+	}
+	return err
+}
+
+// todo 这个接口应该可以直接传order的，因为在OrderManager中每次都生成了
+func (s *DefScheduler) OnOrderStatusChanged(status *model.OrderStatus, isPending bool) (err error) {
+	if status.LockStatus != model.OrderStatusUnknown || status.Status > model.OrderStatusUnknown {
+		globals.SugarLogger.Debugf("OnOrderStatusChanged orderID:%s %s, status:%v", status.VendorOrderID, model.OrderStatusName[status.Status], status)
+		savedOrderInfo := s.loadSavedOrderFromMap(status, true)
+		s.updateOrderByStatus(savedOrderInfo.order, status)
+		if status.LockStatus == model.OrderStatusUnknown && status.Status > model.OrderStatusUnknown { // 只处理状态转换，一般消息不处理
+			s.resetTimer(savedOrderInfo, nil, isPending)
+			if status.Status >= model.OrderStatusEndBegin {
+				curWaybill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]
+				if status.Status == model.OrderStatusDelivered || status.Status == model.OrderStatusFinished {
+					if curWaybill != nil && curWaybill.WaybillVendorID != curWaybill.OrderVendorID {
+						globals.SugarLogger.Infof("OnOrderStatusChanged [运营2]订单orderID:%s可能被手动点击送达，会对程序状态产生不利影响，请通知门店不要这样操作！", status.VendorOrderID)
+					}
+				}
+				s.cancelOtherWaybills(savedOrderInfo, curWaybill)
+				s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
+			}
+		} else if status.LockStatus != model.OrderStatusUnknown {
+			s.stopTimer(savedOrderInfo)
+		}
+	}
+	return err
+}
+
+// 以下是运单
+func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending bool) (err error) {
+	if bill.Status > model.WaybillStatusUnknown {
+		globals.SugarLogger.Debugf("OnWaybillStatusChanged orderID:%s %s, bill:%v", bill.VendorOrderID, model.WaybillStatusName[bill.Status], bill)
+		savedOrderInfo := s.loadSavedOrderFromMap(model.Waybill2Status(bill), true)
+		order := savedOrderInfo.order
+		// todo 当前收到的事件顺序有时是乱的，不能严格限制，暂时放开
+		// if order.Status < model.OrderStatusFinishedPickup || order.Status > model.OrderStatusEndBegin { // 如果当前order状态是不应该出现运单状态
+		// 	globals.SugarLogger.Infof("OnWaybillStatusChanged orderID:%s status:%s is not suitable for waybill", order.VendorOrderID, model.OrderStatusName[order.Status])
+		// 	s.CancelWaybill(bill)
+		// 	s.stopTimer(savedOrderInfo)
+		// 	s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(model.Order2Status(order)))
+		// 	return nil
+		// }
+		if bill.Status == model.WaybillStatusNew {
+			s.addWaybill2Map(savedOrderInfo, bill)
+			if !isPending {
+				if order.Status > model.OrderStatusEndBegin {
+					s.CancelWaybill(bill)
+				} else if order.WaybillVendorID != model.VendorIDUnknown {
+					globals.SugarLogger.Debugf("OnWaybillStatusChanged multiple waybill created, bill:%v", bill)
+					if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID {
+						s.CancelWaybill(bill)
+					} else if bill.WaybillVendorID == order.VendorID && order.WaybillVendorID != order.VendorID {
+						globals.SugarLogger.Warnf("OnWaybillStatusChanged bill:%v purchase platform bill came later than others, strange!!!", bill)
+					}
+				}
+			}
+			// 只有购物平台的新运单消息才会启动抢单TIMER
+			if bill.OrderVendorID == bill.WaybillVendorID {
+				s.resetTimer(savedOrderInfo, bill, isPending)
+			}
+		} else {
+			switch bill.Status {
+			case model.WaybillStatusAccepted:
+				s.resetTimer(savedOrderInfo, bill, isPending)
+				if !isPending {
+					// todo 购买平台的运单，优先级最高，但这样写也可能带来问题，即在这个时间，因为之前3方已经接单，已经发出了转自送请求（而且可能成功了），所以加个isSwitched2SelfDelivery状态判断
+					if order.WaybillVendorID == model.VendorIDUnknown ||
+						(order.VendorID == bill.WaybillVendorID && order.VendorID != order.WaybillVendorID && !savedOrderInfo.isSwitched2SelfDelivery) {
+						if order.WaybillVendorID != model.VendorIDUnknown {
+							// 进到这里的原因是，在这个时间点，购物平台物流已经抢单（但抢单消息还没有被收到）（比如：818810379000941）
+							globals.SugarLogger.Infof("OnWaybillStatusChanged orderID:%s purchase platform waybill arrvied later, may case problem", order.VendorOrderID)
+						}
+						s.updateOrderByBill(order, bill, false)
+						s.cancelOtherWaybills(savedOrderInfo, bill)
+						if bill.WaybillVendorID != bill.OrderVendorID {
+							if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
+								s.SelfDeliverDelievering(savedOrderInfo.order)
+							} else {
+								s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second)
+							}
+						}
+						if !isPending {
+							weixinmsg.NotifyWaybillStatus(bill, order)
+						}
+					} else if !s.isBillCandidate(order, bill) && bill.WaybillVendorID != order.VendorID {
+						// 发生这种情况的原因就是两个接单事件几乎同时到达（来不及取消），也算正常
+						s.CancelWaybill(bill)
+						globals.SugarLogger.Infof("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v", order.VendorOrderID, bill)
+					}
+				}
+			case model.WaybillStatusAcceptCanceled:
+				if s.isBillCandidate(order, bill) {
+					s.resetTimer(savedOrderInfo, bill, isPending)
+					if !isPending {
+						bill.WaybillVendorID = model.VendorIDUnknown
+						s.updateOrderByBill(order, bill, false)
+
+						s.createWaybillOn3rdProviders(savedOrderInfo, bill)
+					}
+				} else if order.WaybillVendorID != model.VendorIDUnknown {
+					s.CancelWaybill(bill)
+					globals.SugarLogger.Warnf("OnWaybillStatusChanged AcceptCanceled orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order)
+				}
+			case model.WaybillStatusCourierArrived: // do nothing
+				s.resetTimer(savedOrderInfo, bill, isPending)
+				if s.isBillCandidate(order, bill) {
+				} else {
+					// s.CancelWaybill(bill)
+					globals.SugarLogger.Infof("OnWaybillStatusChanged CourierArrived order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
+				}
+			case model.WaybillStatusFailed: // todo WaybillStatusFailed理解成订单整个失败了，不需要再尝试创建运单了，注意这里应该加个zabbix日志的报警
+				s.removeWaybillFromMap(savedOrderInfo, bill)
+				if s.isBillCandidate(order, bill) {
+					s.resetTimer(savedOrderInfo, bill, isPending)
+					if !isPending {
+						globals.SugarLogger.Infof("OnWaybillStatusChanged WaybillStatusFailed, bill:%v", bill)
+						bill.WaybillVendorID = model.VendorIDUnknown
+						s.updateOrderByBill(order, bill, false)
+					}
+				} else {
+					// 创建运单失败时，可能到这里来（比如：818874313000121）
+					globals.SugarLogger.Infof("OnWaybillStatusChanged Failed bill:%v shouldn't got here, order details:%v", bill, order)
+				}
+			case model.WaybillStatusCanceled:
+				s.removeWaybillFromMap(savedOrderInfo, bill)
+				if s.isBillCandidate(order, bill) || order.WaybillVendorID == model.VendorIDUnknown {
+					s.resetTimer(savedOrderInfo, bill, isPending)
+					if !isPending {
+						if order.WaybillVendorID != model.VendorIDUnknown {
+							bill.WaybillVendorID = model.VendorIDUnknown
+							s.updateOrderByBill(order, bill, false)
+						}
+						if bill.WaybillVendorID != order.VendorID { // 3方的运单取消才会重新发起创建3方订单，购物平台的运单取消后，它本身还会再创建新运单(NewWabill事件有相应TIMER))，至少京东是这样的，暂时按京东的行为来
+							s.createWaybillOn3rdProviders(savedOrderInfo, nil)
+						}
+					}
+				}
+			case model.WaybillStatusDelivering:
+				s.resetTimer(savedOrderInfo, bill, isPending)
+				if s.isBillCandidate(order, bill) {
+					// do nothing
+				} else {
+					// s.CancelWaybill(bill)
+					globals.SugarLogger.Infof("OnWaybillStatusChanged Delivering order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
+				}
+			case model.WaybillStatusDelivered:
+				s.resetTimer(savedOrderInfo, bill, isPending)
+				s.removeWaybillFromMap(savedOrderInfo, bill)
+				if order.VendorID != bill.WaybillVendorID && !isPending {
+					if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
+						s.SelfDeliverDelievered(order)
+					} else {
+						s.Swtich2SelfDelivered(order)
+					}
+				}
+				if !s.isBillCandidate(order, bill) {
+					// 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达
+					// 典型的一个：1223633660228537567
+					globals.SugarLogger.Infof("OnWaybillStatusChanged Delivered order(%d, %s) bill(%d, %s), bill:%v shouldn't get here", order.WaybillVendorID, order.VendorWaybillID, bill.WaybillVendorID, bill.VendorWaybillID, bill)
+					if order.WaybillVendorID == model.VendorIDUnknown {
+						s.updateOrderByBill(order, bill, false)
+					}
+				}
+				if !isPending {
+					weixinmsg.NotifyWaybillStatus(bill, order)
+				}
+			}
+		}
+	}
+	return err
+}
+
+func (s *DefScheduler) addWaybill2Map(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
+	if _, ok := savedOrderInfo.waybills[bill.WaybillVendorID]; ok {
+		if bill.WaybillVendorID != bill.OrderVendorID { // 购买平台重复发相同号的新运单是正常的，京东就是
+			globals.SugarLogger.Warnf("addWaybill2Map bill:%v already exists", bill)
+		}
+	}
+	savedOrderInfo.waybills[bill.WaybillVendorID] = bill
+}
+
+func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
+	if _, ok := savedOrderInfo.waybills[bill.WaybillVendorID]; ok {
+		delete(savedOrderInfo.waybills, bill.WaybillVendorID)
+	}
+}
+
+func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, excludeBill *model.Waybill) (err error) {
+	order := savedOrderInfo.order
+	globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, excludeBill:%v", order.VendorOrderID, order.Status, excludeBill)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin { // 订单在配送中被取消时就是配送中状态
+		if savedOrderInfo.isNeed3rdDelivery {
+			if savedOrderInfo.retryCount <= maxWaybillRetryCount {
+				successCount := 0
+				for _, vendorID := range savedOrderInfo.supported3rdCarriers {
+					if s.DeliveryPlatformHandlers[vendorID] != nil && s.DeliveryPlatformHandlers[vendorID].Use4CreateWaybill && savedOrderInfo.waybills[vendorID] == nil && (excludeBill == nil || vendorID != excludeBill.WaybillVendorID) {
+						if err = s.CreateWaybill(vendorID, order); err == nil {
+							successCount++
+						}
+					}
+				}
+				if successCount != 0 {
+					savedOrderInfo.retryCount++
+					err = nil
+				} else {
+					globals.SugarLogger.Infof("createWaybillOn3rdProviders, orderID:%s all failed", order.VendorOrderID)
+					err = scheduler.ErrCanNotCreateAtLeastOneWaybill
+				}
+			} else {
+				globals.SugarLogger.Infof("createWaybillOn3rdProviders [运营]同一订单orderID:%s尝试了%d次创建运单失败, 停止调度，如果还需要发单，请人工处理", order.VendorOrderID, savedOrderInfo.retryCount)
+
+				tmpLog := &legacymodel.TempLog{
+					VendorOrderID:    order.VendorOrderID,
+					RefVendorOrderID: order.VendorOrderID,
+					Msg:              fmt.Sprintf("createWaybillOn3rdProviders, orderID:%s failed %d times, stop schedule", order.VendorOrderID, savedOrderInfo.retryCount),
+				}
+				db := orm.NewOrm()
+				db.Insert(tmpLog)
+			}
+		} else {
+			globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, store:%d dont't support 3rd delivery platform", order.VendorOrderID, jxutils.GetJxStoreIDFromOrder(order))
+		}
+	} else {
+		globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d doesn't match model.OrderStatusFinishedPickup, bypass", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill) (err error) {
+	globals.SugarLogger.Debugf("cancelOtherWaybills, orderID:%s, bill:%v", savedOrderInfo.order.VendorOrderID, bill2Keep)
+	for _, v := range savedOrderInfo.waybills {
+		if (v.OrderVendorID != v.WaybillVendorID) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
+			s.CancelWaybill(v)
+		}
+	}
+	return nil
+}
+
+func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInfo, bill *model.Waybill, retryCount int, duration time.Duration) {
+	order := savedOrderInfo.order
+	globals.SugarLogger.Debugf("swtich2SelfDeliverWithRetry orderID:%s", order.VendorOrderID)
+	if order.WaybillVendorID != order.VendorID {
+		if err := s.Swtich2SelfDeliver(order); err != nil {
+			globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry failed, bill:%v, err:%v", bill, err)
+			if retryCount > 0 {
+				time.AfterFunc(duration, func() {
+					jxutils.CallMsgHandlerAsync(func() {
+						s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, retryCount-1, duration)
+					}, order.VendorOrderID)
+				})
+			} else {
+				globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry finally failed, orderID:%s bill:%v, err:%v", order.VendorOrderID, bill, err)
+
+				tmpLog := &legacymodel.TempLog{
+					VendorOrderID:    bill.VendorWaybillID,
+					RefVendorOrderID: order.VendorOrderID,
+					Msg:              fmt.Sprintf("swtich2SelfDeliverWithRetry finally failed, orderID:%s bill:%v, err:%v", order.VendorOrderID, bill, err),
+				}
+				db := orm.NewOrm()
+				db.Insert(tmpLog)
+
+				if s.CancelWaybill(bill) == nil {
+					// 转自送失败的取消，要将订单中的运单状态更新
+					if s.isBillCandidate(order, bill) {
+						bill.WaybillVendorID = model.VendorIDUnknown
+						s.updateOrderByBill(order, bill, false)
+					}
+				}
+			}
+		} else {
+			savedOrderInfo.isSwitched2SelfDelivery = true
+		}
+	} else {
+		// 进到这里的原因是，在这个时间点，购物平台物流已经抢单（但抢单消息还没有被收到），所以转自送会失败 （比如：818810379000941），更好的做法应该是判断Swtich2SelfDeliver的返回值，这种情况下就不得试了
+		globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry orderID:%s status is wrong(maybe purchase platform accepted waybill)", order.VendorOrderID)
+		// globals.SugarLogger.Warnf("swtich2SelfDeliverWithRetry orderID:%s status is wrong, order details:%v", order.VendorOrderID, order)
+	}
+}
+
+// 这个函数这样写的原因是适应一些消息错序
+func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isAutoLoad bool) *WatchOrderInfo {
+	globals.SugarLogger.Debugf("loadSavedOrderFromMap status:%v", status)
+	universalOrderID := jxutils.ComposeUniversalOrderID(status.RefVendorOrderID, status.RefVendorID)
+	var realSavedInfo *WatchOrderInfo
+	if savedInfo, ok := s.orderMap.Load(universalOrderID); ok {
+		realSavedInfo = savedInfo.(*WatchOrderInfo)
+	}
+	if isAutoLoad && (realSavedInfo == nil || !model.IsOrderSolid(realSavedInfo.order)) {
+		if realSavedInfo == nil {
+			realSavedInfo = NewWatchOrderInfo(nil)
+			s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime)
+		} else {
+			globals.SugarLogger.Infof("loadSavedOrderFromMap order is incomplete, orderID:%s, load it", status.RefVendorOrderID)
+		}
+		if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil {
+			realSavedInfo.SetOrder(order)
+		} else {
+			realSavedInfo.SetOrder(&model.GoodsOrder{
+				VendorOrderID:   status.RefVendorOrderID,
+				VendorID:        status.RefVendorID,
+				Status:          status.Status,
+				StatusTime:      status.StatusTime,
+				OrderCreatedAt:  status.StatusTime,
+				WaybillVendorID: model.VendorIDUnknown,
+			})
+			globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s", status.VendorOrderID)
+		}
+	}
+	return realSavedInfo
+}
+
+func (s *DefScheduler) stopTimer(savedOrderInfo *WatchOrderInfo) {
+	if savedOrderInfo.timer != nil {
+		globals.SugarLogger.Debugf("stopTimer orderID:%s", savedOrderInfo.order.VendorOrderID)
+		savedOrderInfo.timer.Stop()
+		savedOrderInfo.timerStatus = 0
+		savedOrderInfo.timerStatusType = scheduler.TimerStatusTypeUnknown
+		savedOrderInfo.timer = nil
+	}
+}
+
+func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Waybill, isPending bool) {
+	order := savedOrderInfo.order
+	status := order.Status
+	statusType := scheduler.TimerStatusTypeOrder
+	statusTime := order.StatusTime
+	if bill != nil {
+		status = bill.Status
+		statusType = scheduler.TimerStatusTypeWaybill
+		statusTime = bill.StatusTime
+	}
+	globals.SugarLogger.Debugf("resetTimer, orderID:%s statusType:%d status:%v", order.VendorOrderID, statusType, status)
+	if statusType != savedOrderInfo.timerStatusType || status >= savedOrderInfo.timerStatus { // 新设置的TIMER不能覆盖状态在其后的TIMER，如果状态回绕，需要注意
+		config := s.mergeOrderStatusConfig(statusType, status, order.VendorID)
+		if config == nil || config.TimerType != scheduler.TimerTypeByPass {
+			s.stopTimer(savedOrderInfo)
+		}
+		if config != nil && config.TimeoutAction != nil && config.TimerType != scheduler.TimerTypeByPass {
+			// 对于自动拣货，以订单中的设置为准
+			if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusAccepted && savedOrderInfo.autoPickupTimeoutMinute > 1 {
+				config.Timeout = time.Duration(savedOrderInfo.autoPickupTimeoutMinute) * time.Minute
+			}
+			var timeout time.Duration
+			switch config.TimerType {
+			case scheduler.TimerTypeBaseNow:
+				timeout = config.Timeout
+			case scheduler.TimerTypeBaseStatusTime:
+				timeout = statusTime.Sub(time.Now()) + config.Timeout
+			case scheduler.TimerTypeBaseExpectedDeliveredTime:
+				if order.BusinessType == model.BusinessTypeDingshida && order.ExpectedDeliveredTime != utils.DefaultTimeValue {
+					statusTime = order.ExpectedDeliveredTime.Add(-time2Delivered)
+				}
+				timeout = statusTime.Sub(time.Now()) + config.Timeout
+			default:
+				panic("TimerType is wrong!!!")
+			}
+			if config.TimeoutGap != 0 {
+				timeout += time.Duration(rand.Int31n(int32(config.TimeoutGap))) * time.Second
+			}
+			if isPending && timeout < pendingOrderTimerMaxSecond*time.Second { // 如果是PENDING的订单，则将其分布到2--5秒内，让后续事件有机会执行
+				timeout = time.Duration(jxutils.MapValue2Scope(int64(timeout), -pendingOrderTimerMinMinSecond*1000, pendingOrderTimerMaxSecond*1000, pendingOrderTimerMinSecond*1000, pendingOrderTimerMaxSecond*1000)) * time.Millisecond
+			} else if timeout < 0 {
+				timeout = 0
+			}
+			if timeout == 0 {
+				config.TimeoutAction(savedOrderInfo)
+			} else {
+				timerName := ""
+				if statusType == scheduler.TimerStatusTypeOrder {
+					timerName = model.OrderStatusName[status]
+				} else if statusType == scheduler.TimerStatusTypeWaybill {
+					timerName = model.WaybillStatusName[status]
+				}
+				savedOrderInfo.timerStatusType = statusType
+				savedOrderInfo.timerStatus = status
+				savedOrderInfo.timer = time.AfterFunc(timeout, func() {
+					jxutils.CallMsgHandlerAsync(func() {
+						globals.SugarLogger.Debugf("fire timer:%s, orderID:%s", timerName, order.VendorOrderID)
+						config.TimeoutAction(savedOrderInfo)
+						savedOrderInfo.timerStatus = 0
+						savedOrderInfo.timerStatusType = scheduler.TimerStatusTypeUnknown
+					}, order.VendorOrderID)
+				})
+			}
+			globals.SugarLogger.Debugf("resetTimer, orderID:%s, status:%d, timeout:%v", order.VendorOrderID, status, timeout)
+		}
+	}
+}
+
+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 {
+			db = orm.NewOrm()
+		}
+		user := &legacymodel.BlackClient{
+			Mobile: userMobile,
+		}
+		if err := db.Read(user, "Mobile"); err != nil {
+			if err != orm.ErrNoRows {
+				globals.SugarLogger.Errorf("read data error:%v, data:%v, vendorID:%d", err, user, vendorID)
+			}
+			// 在访问数据库出错的情况下，也需要自动接单
+			handleType = 1
+		} else {
+			// 强制拒单
+			globals.SugarLogger.Infof("force reject order:%s, vendorID:%d", orderID, vendorID)
+			handleType = -1
+		}
+	} else {
+		globals.SugarLogger.Infof("order:%s, vendorID:%d, mobile is empty, should accept order", orderID, vendorID)
+		handleType = 1
+	}
+	if handleType == 1 {
+		handler(true)
+	} else if handleType == -1 {
+		handler(false)
+	}
+	return handleType
+}
+
+func (s *DefScheduler) mergeOrderStatusConfig(statusType, status int, purchaseVendorID int) (retVal *StatusActionConfig) {
+	vendorTimeout := s.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(statusType, status)
+	defConfig := s.defWorkflowConfig[statusType][status]
+	if defConfig == nil {
+		return nil
+	}
+	retVal = &StatusActionConfig{}
+	if defConfig != nil {
+		*retVal = *defConfig
+	}
+	if vendorTimeout != 0 {
+		retVal.Timeout = vendorTimeout
+	}
+	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
+	order.LockStatus = status.LockStatus
+	return order
+}
+
+func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Waybill, revertStatus bool) {
+	if order.Status > model.OrderStatusEndBegin {
+		return
+	}
+	if bill.WaybillVendorID == model.VendorIDUnknown {
+		bill.VendorWaybillID = ""
+	}
+	partner.CurOrderManager.UpdateWaybillVendorID(bill, revertStatus)
+	order.WaybillVendorID = bill.WaybillVendorID
+	order.VendorWaybillID = bill.VendorWaybillID
+	if revertStatus {
+		order.Status = model.OrderStatusFinishedPickup
+	}
+}
+
+func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) {
+	return s.PickupGoods(order)
+}
+
+func (s *DefScheduler) isBillCandidate(order *model.GoodsOrder, bill *model.Waybill) bool {
+	return order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID
+}
--- a/business/jxcallback/scheduler/scheduler.go
+++ b/business/jxcallback/scheduler/scheduler.go
@@ -0,0 +1,231 @@
+package scheduler
+
+import (
+	"errors"
+	"fmt"
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+const (
+	StoreDeliveryTypeCrowdSourcing = 0 //缺省，平台众包配送，可转自送
+	StoreDeliveryTypeByPlatform    = 1 //平台专送
+	StoreDeliveryTypeByStore       = 2 //完全门店自送
+)
+
+const (
+	TimerStatusTypeUnknown = -1
+	TimerStatusTypeOrder   = 0
+	TimerStatusTypeWaybill = 1
+)
+
+const (
+	TimerTypeNoOverride                = 0 // GetStatusActionConfig 返回表示不修改缺省配置
+	TimerTypeByPass                    = 1
+	TimerTypeBaseNow                   = 2
+	TimerTypeBaseStatusTime            = 3
+	TimerTypeBaseExpectedDeliveredTime = 4 // 如果是定时达，以expected delivery time倒推的时间当成statusTime（之后与TimerTypeBaseStatusTime一样），否则与TimerTypeBaseStatusTime相同
+)
+
+var (
+	CurrentScheduler Scheduler
+)
+
+var (
+	ErrStatusIsNotOKForOperation     = errors.New("当前状态操作无效")
+	ErrCanNotCreateAtLeastOneWaybill = errors.New("一个运单都不能创建")
+	ErrCanNotFindOrder               = errors.New("不能找到订单（一般是由于事件错序）")
+	ErrCanNotFindWaybill             = errors.New("不能找到运单（一般是由于事件错序）")
+	ErrOrderIsNotSolid               = errors.New("订单是临时订单，不完整，不能用于创建运单")
+)
+
+type DeliveryPlatformHandlerInfo struct {
+	Handler           partner.IDeliveryPlatformHandler
+	Use4CreateWaybill bool
+}
+
+type Scheduler interface {
+	RegisterPurchasePlatform(vendorID int, handler partner.IPurchasePlatformHandler)
+	RegisterDeliveryPlatform(vendorID int, handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool)
+
+	// 以下是订单
+	OnOrderNew(order *model.GoodsOrder, isPending bool) (err error)
+	OnOrderStatusChanged(status *model.OrderStatus, isPending bool) (err error)
+
+	// 以下是运单
+	OnWaybillStatusChanged(bill *model.Waybill, isPending bool) (err error)
+}
+
+type BaseScheduler struct {
+	PurchasePlatformHandlers map[int]partner.IPurchasePlatformHandler
+	DeliveryPlatformHandlers map[int]*DeliveryPlatformHandlerInfo
+	IsReallyCallPlatformAPI  bool
+}
+
+func (c *BaseScheduler) Init() {
+	c.PurchasePlatformHandlers = make(map[int]partner.IPurchasePlatformHandler)
+	c.DeliveryPlatformHandlers = make(map[int]*DeliveryPlatformHandlerInfo)
+}
+
+func (c *BaseScheduler) RegisterPurchasePlatform(vendorID int, handler partner.IPurchasePlatformHandler) {
+	if !(vendorID >= model.VendorIDPurchaseBegin && vendorID <= model.VendorIDPurchaseEnd) {
+		panic(fmt.Sprintf("purchase vendor:%d is illegal", vendorID))
+	}
+	if _, ok := c.PurchasePlatformHandlers[vendorID]; ok {
+		panic(fmt.Sprintf("purchase vendor:%d, already exists", vendorID))
+	}
+	c.PurchasePlatformHandlers[vendorID] = handler
+}
+
+func (c *BaseScheduler) RegisterDeliveryPlatform(vendorID int, handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool) {
+	if !(vendorID >= model.VendorIDDeliveryBegin && vendorID <= model.VendorIDDeliveryEnd) {
+		panic(fmt.Sprintf("delivery vendor:%d is illegal", vendorID))
+	}
+	if _, ok := c.DeliveryPlatformHandlers[vendorID]; ok {
+		panic(fmt.Sprintf("delivery vendor:%d, already exists", vendorID))
+	}
+	c.DeliveryPlatformHandlers[vendorID] = &DeliveryPlatformHandlerInfo{
+		Handler:           handler,
+		Use4CreateWaybill: isUse4CreateWaybill,
+	}
+}
+
+func (c *BaseScheduler) GetPurchasePlatformFromVendorID(vendorID int) partner.IPurchasePlatformHandler {
+	return c.PurchasePlatformHandlers[vendorID]
+}
+
+func (c *BaseScheduler) GetDeliveryPlatformFromVendorID(vendorID int) *DeliveryPlatformHandlerInfo {
+	return c.DeliveryPlatformHandlers[vendorID]
+}
+
+func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	globals.SugarLogger.Infof("AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusNew {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogErrorWithInfo(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt)
+			}, "AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
+		}
+	} else {
+		globals.SugarLogger.Infof("AcceptOrRefuseOrder orderID:%s, status:%d is not suitable, isAcceptIt:%t", order.VendorOrderID, order.Status, isAcceptIt)
+	}
+	return err
+}
+func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("PickupGoods orderID:%s", order.VendorOrderID)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusAccepted {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogErrorWithInfo(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order)
+			}, "PickupGoods orderID:%s", order.VendorOrderID)
+		}
+	} else {
+		globals.SugarLogger.Infof("PickupGoods orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (c *BaseScheduler) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogErrorWithInfo(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDeliver(order)
+			}, "Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
+			if err == nil { // 因为有些平台转自送后，不会再发送订单在配送中消息过来，所以成功后就强制设置状态为配送中
+				order.Status = model.OrderStatusDelivering
+			}
+		}
+	} else {
+		globals.SugarLogger.Infof("Swtich2SelfDeliver orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (c *BaseScheduler) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("Swtich2SelfDelivered orderID:%s", order.VendorOrderID)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogError(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDelivered(order)
+			}, "Swtich2SelfDelivered orderID:%s", order.VendorOrderID)
+		}
+	} else {
+		globals.SugarLogger.Infof("Swtich2SelfDelivered orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievering orderID:%s", order.VendorOrderID)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogError(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievering(order)
+			}, "SelfDeliverDelievering orderID:%s", order.VendorOrderID)
+			if err == nil { // 因为有些平台设置配送中后，不会发送订单在配送中消息过来，所以成功后就强制设置状态为配送中
+				order.Status = model.OrderStatusDelivering
+			}
+		}
+	} else if order.Status == model.OrderStatusDelivering {
+		globals.SugarLogger.Debugf("SelfDeliverDelievering orderID:%s, status:%d already ok", order.VendorOrderID, order.Status)
+	} else {
+		globals.SugarLogger.Infof("SelfDeliverDelievering orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s", order.VendorOrderID)
+	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering {
+		if c.IsReallyCallPlatformAPI {
+			err = utils.CallFuncLogError(func() error {
+				return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order)
+			}, "SelfDeliverDelievered orderID:%s", order.VendorOrderID)
+		}
+	} else {
+		globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
+	}
+	return err
+}
+
+func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Infof("CreateWaybill orderID:%s, vendorID:%d", order.VendorOrderID, platformVendorID)
+	if !model.IsOrderSolid(order) { // 如果订单是不完整的
+		globals.SugarLogger.Warnf("CreateWaybill orderID:%s, vendorID:%d is not solid!!!", order.VendorOrderID, platformVendorID)
+		return ErrOrderIsNotSolid
+	}
+	if c.IsReallyCallPlatformAPI {
+		handlerInfo := c.GetDeliveryPlatformFromVendorID(platformVendorID)
+		if handlerInfo.Use4CreateWaybill {
+			if err = handlerInfo.Handler.CreateWaybill(order); err != nil {
+				globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
+			}
+		}
+	}
+	return err
+}
+
+func (c *BaseScheduler) CancelWaybill(bill *model.Waybill) (err error) {
+	globals.SugarLogger.Infof("CancelWaybill bill:%v", bill)
+	if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID {
+		if handlerInfo := c.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
+			err = utils.CallFuncLogError(func() error {
+				return handlerInfo.Handler.CancelWaybill(bill)
+			}, "CancelWaybill bill:%v", bill)
+			globals.SugarLogger.Debugf("CancelWaybill bill:%v canceled by myself", bill)
+		}
+	}
+	return err
+}
+
+type BasePurchasePlatform struct {
+}
+
+func (p *BasePurchasePlatform) GetStatusActionTimeout(statusType, status int) time.Duration {
+	return 0
+}