- 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/partner/purchase/elm/elm.go
+++ b/business/partner/purchase/elm/elm.go
@@ -0,0 +1,65 @@
+package elm
+
+import (
+	"git.rosy.net.cn/baseapi/platformapi/elmapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+type Controller struct {
+}
+
+func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) {
+	if msg.Type == elmapi.MsgTypeOrderValid {
+		innerMsg := make(map[string]interface{})
+		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
+		if err != nil {
+			retVal = elmapi.Err2CallbackResponse(err, "")
+		} else {
+			innerMsg["msgType"] = msg.Type
+			retVal = new(OrderController).OnOrderNewMsg(innerMsg)
+		}
+	} else if msg.Type > elmapi.MsgTypeOrderValid && msg.Type < elmapi.MsgTypeUserApplyCancel {
+		var innerMsg elmapi.CallbackOrderStatusMsg
+		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
+		if err != nil {
+			retVal = elmapi.Err2CallbackResponse(err, "")
+		} else {
+			innerMsg.MsgType = msg.Type
+			retVal = new(OrderController).OnOrderStatusMsg(&innerMsg)
+		}
+	} else if msg.Type >= elmapi.MsgTypeUserApplyCancel && msg.Type < elmapi.MsgTypeUserUrgeOrder {
+		var innerMsg elmapi.CallbackOrderCancelRefundMsg
+		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
+		if err != nil {
+			retVal = elmapi.Err2CallbackResponse(err, "")
+		} else {
+			innerMsg.MsgType = msg.Type
+			retVal = new(OrderController).OnOrderCancelRefundMsg(&innerMsg)
+		}
+	} else if msg.Type == elmapi.MsgTypeUserUrgeOrder {
+		var innerMsg elmapi.CallbackOrderUrgeMsg
+		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
+		if err != nil {
+			retVal = elmapi.Err2CallbackResponse(err, "")
+		} else {
+			innerMsg.MsgType = msg.Type
+			jxutils.CallMsgHandler(func() {
+				retVal = new(OrderController).onOrderUserUrgeOrder(&innerMsg)
+			}, jxutils.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
+		}
+	} else if msg.Type >= elmapi.MsgTypeWaybillWait4DeliveryVendor && msg.Type <= elmapi.MsgTypeRejectedSystemError {
+		var innerMsg elmapi.CallbackWaybillStatusMsg
+		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
+		if err != nil {
+			retVal = elmapi.Err2CallbackResponse(err, "")
+		} else {
+			innerMsg.MsgType = msg.Type
+			retVal = new(WaybillController).OnWaybillStatusMsg(&innerMsg)
+		}
+	} else {
+		retVal = elmapi.SuccessResponse
+	}
+	return retVal
+}
--- a/business/partner/purchase/elm/order.go
+++ b/business/partner/purchase/elm/order.go
@@ -0,0 +1,313 @@
+package elm
+
+import (
+	"fmt"
+	"math"
+	"strings"
+	"time"
+
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+
+	"git.rosy.net.cn/baseapi/platformapi/elmapi"
+	"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/business/partner"
+	"git.rosy.net.cn/jx-callback/legacy/freshfood"
+)
+
+const (
+	acceptOrderDelay = 270 * time.Second
+	fakePickedUp     = "fakefinishedpickup"
+)
+
+var (
+	VendorStatus2StatusMap = map[string]int{
+		elmapi.OrderStatusUnprocessed: model.OrderStatusNew,
+		elmapi.OrderStatusValid:       model.OrderStatusAccepted,
+		elmapi.OrderStatusPending:     model.OrderStatusNew,
+		elmapi.OrderStatusRefunding:   model.OrderStatusApplyRefund,
+		elmapi.OrderStatusInvalid:     model.OrderStatusCanceled,
+		elmapi.OrderStatusSettled:     model.OrderStatusFinished,
+	}
+)
+
+type OrderController struct {
+	scheduler.BasePurchasePlatform
+}
+
+func init() {
+	scheduler.CurrentScheduler.RegisterPurchasePlatform(model.VendorIDELM, new(OrderController))
+}
+
+func (c *OrderController) OnOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onOrderStatusMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	return retVal
+}
+
+func (c *OrderController) OnOrderNewMsg(msg map[string]interface{}) (retVal *elmapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onOrderNew(msg)
+	}, jxutils.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
+	return retVal
+}
+
+func (c *OrderController) OnOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onOrderCancelRefundMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	return retVal
+}
+
+func (c *OrderController) orderStatusMsg2Status(msg *elmapi.CallbackOrderStatusMsg) *model.OrderStatus {
+	orderStatus := &model.OrderStatus{
+		VendorOrderID:    msg.OrderID,
+		VendorID:         model.VendorIDELM,
+		OrderType:        model.OrderTypeOrder,
+		RefVendorOrderID: msg.OrderID,
+		RefVendorID:      model.VendorIDELM,
+		VendorStatus:     c.stateAndType2Str(msg.State, msg.MsgType),
+		StatusTime:       utils.Timestamp2Time(msg.UpdateTime),
+	}
+	return orderStatus
+}
+
+func (c *OrderController) cancelRefundMsg2Status(msg *elmapi.CallbackOrderCancelRefundMsg) *model.OrderStatus {
+	orderStatus := &model.OrderStatus{
+		VendorOrderID:    msg.OrderID,
+		VendorID:         model.VendorIDELM,
+		OrderType:        model.OrderTypeOrder,
+		RefVendorOrderID: msg.OrderID,
+		RefVendorID:      model.VendorIDELM,
+		VendorStatus:     c.stateAndType2Str(msg.RefundStatus, msg.MsgType),
+		StatusTime:       utils.Timestamp2Time(msg.UpdateTime),
+	}
+	return orderStatus
+}
+
+func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
+	status := c.orderStatusMsg2Status(msg)
+	switch msg.MsgType {
+	case elmapi.MsgTypeOrderAccepted:
+		status.Status = model.OrderStatusAccepted
+	case elmapi.MsgTypeOrderCanceled, elmapi.MsgTypeOrderInvalid, elmapi.MsgTypeOrderForceInvalid:
+		status.Status = model.OrderStatusCanceled
+	case elmapi.MsgTypeOrderFinished:
+		status.Status = model.OrderStatusFinished
+	default:
+		globals.SugarLogger.Warnf("onOrderStatusMsg elm msg:%v not handled", msg)
+		return elmapi.SuccessResponse
+	}
+	err := partner.CurOrderManager.OnOrderStatusChanged(status)
+
+	// 直接跳到拣货完成
+	if msg.MsgType == elmapi.MsgTypeOrderAccepted {
+		status.Status = model.OrderStatusFinishedPickup
+		status.VendorStatus = fakePickedUp
+		err = partner.CurOrderManager.OnOrderStatusChanged(status)
+	}
+	// if globals.HandleLegacyJxOrder && err == nil {
+	// 	c.legacyElmOrderStatusChanged(status)
+	// }
+	return elmapi.Err2CallbackResponse(err, status.VendorStatus)
+}
+
+func (c *OrderController) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
+	status := c.cancelRefundMsg2Status(msg)
+	switch msg.MsgType {
+	case elmapi.MsgTypeUserApplyCancel:
+		status.Status = model.OrderStatusApplyCancel
+	case elmapi.MsgTypeUserApplyRefund:
+		status.Status = model.OrderStatusApplyRefund
+	default:
+		status.Status = model.OrderStatusUnknown
+	}
+	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus)
+}
+
+func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
+	result, err := api.ElmAPI.GetOrder(orderID)
+	if err == nil {
+		phoneList := result["phoneList"].([]interface{})
+		consigneeMobile := ""
+		if len(phoneList) > 0 {
+			consigneeMobile = utils.Interface2String(phoneList[0])
+		}
+
+		// globals.SugarLogger.Debug(result)
+		order = &model.GoodsOrder{
+			VendorOrderID:         orderID,
+			VendorID:              model.VendorIDELM,
+			VendorStoreID:         utils.Int64ToStr(utils.MustInterface2Int64(result["shopId"])),
+			StoreID:               int(utils.Str2Int64WithDefault(utils.Interface2String(result["openId"]), 0)),
+			StoreName:             result["shopName"].(string),
+			ConsigneeName:         utils.FilterMb4(result["consignee"].(string)),
+			ConsigneeMobile:       consigneeMobile,
+			ConsigneeAddress:      utils.FilterMb4(result["address"].(string)),
+			BuyerComment:          utils.FilterMb4(strings.Trim(utils.Interface2String(result["description"]), "\n\r\t ")),
+			ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue),
+			VendorStatus:          utils.Interface2String(result["status"]), // 取订单的原始status，不合并消息类型（因为当前消息类型没有意义）
+			OrderSeq:              int(utils.MustInterface2Int64(result["daySn"])),
+			StatusTime:            utils.Str2Time(result["activeAt"].(string)),
+			OriginalData:          utils.FilterMb4(string(utils.MustMarshal(result))),
+			ActualPayPrice:        jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalPrice"])),
+			Skus:                  []*model.OrderSku{},
+		}
+		order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
+		if result["book"].(bool) {
+			order.BusinessType = model.BusinessTypeDingshida
+		} else {
+			order.BusinessType = model.BusinessTypeImmediate
+		}
+		deliveryGeo := strings.Split(utils.Interface2String(result["deliveryGeo"]), ",")
+		if len(deliveryGeo) == 2 {
+			order.CoordinateType = model.CoordinateTypeMars
+			order.ConsigneeLng = jxutils.StandardCoordinate2Int(utils.Str2Float64(deliveryGeo[0]))
+			order.ConsigneeLat = jxutils.StandardCoordinate2Int(utils.Str2Float64(deliveryGeo[1]))
+		}
+
+		for _, group2 := range result["groups"].([]interface{}) {
+			group := group2.(map[string]interface{})
+			for _, product2 := range group["items"].([]interface{}) {
+				product := product2.(map[string]interface{})
+				sku := &model.OrderSku{
+					VendorOrderID: orderID,
+					VendorID:      model.VendorIDELM,
+					Count:         int(utils.MustInterface2Int64(product["quantity"])),
+					SkuID:         int(utils.Str2Int64WithDefault(utils.Interface2String(product["extendCode"]), 0)),
+					VendorSkuID:   utils.Int64ToStr(utils.MustInterface2Int64(product["vfoodId"])),
+					SkuName:       product["name"].(string),
+					SalePrice:     jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
+					Weight:        int(math.Round(utils.Interface2FloatWithDefault(product["weight"], 0.0))),
+				}
+				order.Skus = append(order.Skus, sku)
+				order.SkuCount++
+				order.GoodsCount += sku.Count
+				order.SalePrice += sku.SalePrice * int64(sku.Count)
+				order.Weight += sku.Weight * sku.Count
+			}
+		}
+		setOrederDetailFee(result, order)
+	}
+	return order, err
+}
+
+func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
+	orderActivities, ok := result["orderActivities"].([]interface{})
+	if ok {
+		for _, value := range orderActivities {
+			activity := value.(map[string]interface{})
+			categoryId := utils.MustInterface2Int64(activity["categoryId"])
+			restaurantPart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["restaurantPart"]))
+			elemePart := -jxutils.StandardPrice2Int(utils.MustInterface2Float64(activity["elemePart"]))
+			if _, ok := model.ElmSkuPromotion[int(categoryId)]; ok {
+				order.SkuPmFee += restaurantPart
+				order.SkuPmSubsidy += elemePart
+			} else {
+				order.OrderPmFee += restaurantPart
+				order.OrderPmSubsidy += elemePart
+			}
+		}
+	}
+	order.PlatformFeeRate = int16(utils.MustInterface2Float64(result["serviceRate"]))
+}
+
+//
+func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
+	// todo 这里应该可以直接用msg里的内容，而不用再次去查
+	order, err := c.GetOrder(msg["orderId"].(string))
+	if err == nil {
+		order.VendorStatus = c.stateAndType2Str(order.VendorStatus, elmapi.MsgTypeOrderValid)
+		err = partner.CurOrderManager.OnOrderNew(order, c.stateAndType2Str(msg["status"].(string), elmapi.MsgTypeOrderValid))
+		// if globals.HandleLegacyJxOrder && err == nil {
+		// 	c.legacyWriteElmOrder(order)
+		// }
+	}
+	return elmapi.Err2CallbackResponse(err, "elm onOrderNew")
+}
+
+func (c *OrderController) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg) *elmapi.CallbackResponse {
+	status := &model.OrderStatus{
+		VendorOrderID:    msg.OrderID,
+		VendorID:         model.VendorIDELM,
+		OrderType:        model.OrderTypeOrder,
+		RefVendorOrderID: msg.OrderID,
+		RefVendorID:      model.VendorIDELM,
+		Status:           model.OrderStatusApplyUrgeOrder,
+		VendorStatus:     utils.Int2Str(msg.MsgType),
+		StatusTime:       utils.Timestamp2Time(msg.UpdateTime),
+	}
+	if globals.ReallyCallPlatformAPI {
+		freshfood.FreshFoodAPI.ELMClientUrgeOrder(msg.OrderID)
+	}
+	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus)
+}
+
+func (c *OrderController) stateAndType2Str(state string, msgType int) string {
+	return fmt.Sprintf("%s-%d", state, msgType)
+}
+
+func (c *OrderController) spliltCompositeState(compositeState string) (state string, msgType int) {
+	index := strings.Index(compositeState, "-")
+	if index >= 0 {
+		msgType = int(utils.Str2Int64(compositeState[index+1:]))
+		if msgType == 0 {
+			globals.SugarLogger.Debug(compositeState)
+		}
+		return compositeState[:index], msgType
+	}
+	return compositeState, 0
+}
+
+// IPurchasePlatformHandler
+func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int {
+	state, _ := c.spliltCompositeState(vendorStatus)
+	if status, ok := VendorStatus2StatusMap[state]; ok {
+		return status
+	}
+	return model.OrderStatusUnknown
+}
+
+func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	if isAcceptIt {
+		err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
+	} else {
+		err = api.ElmAPI.CancelOrder(order.VendorOrderID, elmapi.CancelOrderTypeOthers, "")
+	}
+	return err
+}
+
+// 饿了么没有拣货这个状态，直接返回成功
+// 真实流程中也不会调用这个方法，因为接收订单后状态会直接转移到已拣货
+func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) {
+	return nil
+}
+
+func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
+	err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
+	return err
+}
+
+// 饿了么转商家自送后，没有确认送达的概念，空操作
+func (c *OrderController) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+	return nil
+}
+
+func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+	return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
+}
+
+func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
+}
+
+func (c *OrderController) GetStatusActionTimeout(statusType, status int) time.Duration {
+	if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusNew {
+		return acceptOrderDelay // 饿了么开了专送店的订单没有拣货状态，接单后就为拣货完成，所以要延迟接单，否则门店来不及备货
+	}
+	return 0
+}
--- a/business/partner/purchase/elm/order_legacy.go
+++ b/business/partner/purchase/elm/order_legacy.go
@@ -0,0 +1,44 @@
+package elm
+
+import (
+	"git.rosy.net.cn/baseapi/utils"
+	"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"
+)
+
+// 为了兼容之前的表，造出原来需要的数据
+func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err error) {
+	db := orm.NewOrm()
+	_, msgType := c.spliltCompositeState(order.VendorStatus)
+	legacyOrder := &legacymodel.Elemeorder2{
+		Orderid:        order.VendorOrderID,
+		Type:           msgType,
+		Consignee:      order.ConsigneeName,
+		Mobile:         order.ConsigneeMobile,
+		OrderCreatedAt: utils.Time2Str(order.StatusTime),
+	}
+	_, err = db.Insert(legacyOrder)
+	if err != nil {
+		globals.SugarLogger.Infof("legacyWriteElmOrder orderID:%s insert error:%v", order.VendorOrderID, err)
+	}
+	return err
+}
+
+func (c *OrderController) legacyElmOrderStatusChanged(status *model.OrderStatus) (err error) {
+	db := orm.NewOrm()
+	legacyOrder := &legacymodel.Elemeorder2{
+		Orderid: status.VendorOrderID,
+	}
+	if err = db.Read(legacyOrder, "Orderid"); err == nil {
+		_, legacyOrder.Type = c.spliltCompositeState(status.VendorStatus)
+		utils.CallFuncLogError(func() error {
+			_, err = db.Update(legacyOrder, "Type")
+			return err
+		}, "legacyWriteElmOrder status:%v", status)
+	} else {
+		globals.SugarLogger.Infof("legacyElmOrderStatusChanged db.Read status:%v, error:%v", status, err)
+	}
+	return err
+}
--- a/business/partner/purchase/elm/order_test.go
+++ b/business/partner/purchase/elm/order_test.go
@@ -0,0 +1,33 @@
+package elm
+
+import (
+	"testing"
+
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"git.rosy.net.cn/jx-callback/globals/db"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+	//E:/goprojects/src/git.rosy.net.cn/jx-callback/conf/app.conf
+	///Users/xujianhua/go/src/git.rosy.net.cn/jx-callback/conf/app.conf
+	beego.InitBeegoBeforeTest("Users/xujianhua/go/src/git.rosy.net.cn/jx-callback/conf/app.conf")
+	beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test
+
+	globals.Init()
+	db.Init()
+	api.Init()
+}
+
+func TestGetOrder(t *testing.T) {
+	orderID := "3025427524410871880"
+	order, err := new(OrderController).GetOrder(orderID)
+	if err != nil {
+		panic(err.Error())
+	}
+	if order.VendorOrderID != orderID {
+		panic(err.Error())
+	}
+}
--- a/business/partner/purchase/elm/waybill.go
+++ b/business/partner/purchase/elm/waybill.go
@@ -0,0 +1,70 @@
+package elm
+
+import (
+	"fmt"
+
+	"git.rosy.net.cn/baseapi/platformapi/elmapi"
+	"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/partner"
+	"git.rosy.net.cn/jx-callback/globals/api"
+)
+
+type WaybillController struct {
+}
+
+func (c *WaybillController) OnWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onWaybillStatusMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
+	return retVal
+}
+
+func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
+	order := c.callbackMsg2Waybill(msg)
+	if msg.MsgType == elmapi.MsgTypeWaybillWait4Courier { //MsgTypeWaybillWait4Courier事件与JD的新运单事件的时间机制更相似
+		order.Status = model.WaybillStatusNew
+	} else if msg.MsgType == elmapi.MsgTypeWaybillPickingUp {
+		if result, err := api.ElmAPI.GetOrder(msg.OrderID); err == nil {
+			order.DesiredFee = jxutils.StandardPrice2Int(utils.Interface2FloatWithDefault(result["deliverFee"], 0.0) +
+				utils.Interface2FloatWithDefault(result["vipDeliveryFeeDiscount"], 0.0))
+		}
+		order.Status = model.WaybillStatusAccepted
+	} else if msg.MsgType == elmapi.MsgTypeWaybillCourierArrived {
+		order.Status = model.WaybillStatusCourierArrived
+	} else if msg.MsgType == elmapi.MsgTypeWaybillDelivering {
+		order.Status = model.WaybillStatusDelivering
+	} else if msg.MsgType == elmapi.MsgTypeWaybillDelivered {
+		order.Status = model.WaybillStatusDelivered
+	} else if msg.MsgType >= elmapi.MsgTypeWaybillCanceledByMerchant && msg.MsgType <= elmapi.MsgTypeWaybillCanceledBySystem {
+		order.Status = model.WaybillStatusCanceled
+	} else if msg.MsgType >= elmapi.MsgTypeWaybillFailedCallLate &&
+		msg.MsgType <= elmapi.MsgTypeRejectedSystemError &&
+		msg.MsgType != elmapi.MsgTypeDeiverBySelf {
+		order.Status = model.WaybillStatusFailed
+	} else {
+		// MsgTypeWaybillWait4DeliveryVendor
+		// MsgTypeDeiverBySelf
+		order.Status = model.WaybillStatusUnknown
+	}
+	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
+}
+
+func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatusMsg) (retVal *model.Waybill) {
+	retVal = &model.Waybill{
+		VendorOrderID:   msg.OrderID,
+		OrderVendorID:   model.VendorIDELM,
+		VendorWaybillID: msg.OrderID,
+		WaybillVendorID: model.VendorIDELM,
+		CourierName:     msg.Name,
+		CourierMobile:   msg.Phone,
+		VendorStatus:    c.composeState(msg.State, msg.SubState, msg.MsgType),
+		StatusTime:      utils.Timestamp2Time(msg.UpdateAt / 1000),
+	}
+	return retVal
+}
+
+func (c *WaybillController) composeState(state, subState string, msgType int) string {
+	return fmt.Sprintf("%s-%d", state, msgType)
+}
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -0,0 +1,237 @@
+package jd
+
+import (
+	"strings"
+
+	"git.rosy.net.cn/baseapi/platformapi/autonavi"
+	"git.rosy.net.cn/baseapi/platformapi/jdapi"
+	"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/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"git.rosy.net.cn/jx-callback/legacy/freshfood"
+)
+
+var (
+	VendorStatus2StatusMap = map[string]int{
+		jdapi.OrderStatusPurchased:      model.OrderStatusNew,
+		jdapi.OrderStatusNew:            model.OrderStatusNew,
+		jdapi.OrderStatusAdjust:         model.OrderStatusNew,
+		jdapi.OrderStatusWaitOutStore:   model.OrderStatusAccepted,
+		jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
+		jdapi.OrderStatusDelivering:     model.OrderStatusDelivering,
+		jdapi.OrderStatusDelivered:      model.OrderStatusDelivered,
+		jdapi.OrderStatusCanceled:       model.OrderStatusCanceled,
+
+		jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel,
+		jdapi.OrderStatusLocked:          model.OrderStatusLocked,
+		jdapi.OrderStatusUnlocked:        model.OrderStatusUnlocked,
+	}
+)
+
+type OrderController struct {
+	scheduler.BasePurchasePlatform
+}
+
+func init() {
+	scheduler.CurrentScheduler.RegisterPurchasePlatform(model.VendorIDJD, new(OrderController))
+}
+
+func (c *OrderController) OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onOrderMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
+	return retVal
+}
+
+func (c *OrderController) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+	if jdapi.OrderStatusNew == msg.StatusID {
+		retVal = c.onOrderNew(msg)
+	} else if jdapi.OrderStatusAdjust == msg.StatusID {
+		retVal = c.onOrderAdjust(msg)
+	} else {
+		status := c.callbackMsg2Status(msg)
+		if msg.StatusID == jdapi.OrderStatusAddComment || msg.StatusID == jdapi.OrderStatusModifyComment {
+			if globals.ReallyCallPlatformAPI {
+				freshfood.FreshFoodAPI.JDOrderComment(msg)
+			}
+		}
+		err := partner.CurOrderManager.OnOrderStatusChanged(status)
+		// if globals.HandleLegacyJxOrder && err == nil {
+		// 	c.legacyJdOrderStatusChanged(status)
+		// }
+		retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
+	}
+	return retVal
+}
+
+func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
+	result, err := api.JdAPI.QuerySingleOrder(orderID)
+	// globals.SugarLogger.Info(result)
+	if err == nil {
+		order = &model.GoodsOrder{
+			VendorOrderID:         orderID,
+			VendorID:              model.VendorIDJD,
+			VendorStoreID:         result["produceStationNo"].(string),
+			StoreID:               int(utils.Str2Int64WithDefault(utils.Interface2String(result["produceStationNoIsv"]), 0)),
+			StoreName:             result["produceStationName"].(string),
+			ConsigneeName:         utils.FilterMb4(result["buyerFullName"].(string)),
+			ConsigneeMobile:       result["buyerMobile"].(string),
+			ConsigneeAddress:      utils.FilterMb4(result["buyerFullAddress"].(string)),
+			CoordinateType:        model.CoordinateTypeMars,
+			BuyerComment:          utils.FilterMb4(strings.Trim(utils.Interface2String(result["orderBuyerRemark"]), "\n\r\t ")),
+			ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["orderPreEndDeliveryTime"]), utils.DefaultTimeValue),
+			VendorStatus:          utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])),
+			OrderSeq:              int(utils.MustInterface2Int64(result["orderNum"])),
+			StatusTime:            utils.Str2Time(result["orderPurchaseTime"].(string)),
+			OriginalData:          utils.FilterMb4(string(utils.MustMarshal(result))),
+			ActualPayPrice:        utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
+			Skus:                  []*model.OrderSku{},
+		}
+		order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
+		businessTage := utils.Interface2String(result["businessTag"])
+		if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
+			order.BusinessType = model.BusinessTypeImmediate
+		} else {
+			order.BusinessType = model.BusinessTypeDingshida
+		}
+		coordinateType := utils.Interface2Int64WithDefault(result["buyerCoordType"], 1)
+		originalLng := utils.MustInterface2Float64(result["buyerLng"])
+		originalLat := utils.MustInterface2Float64(result["buyerLat"])
+		if coordinateType == 1 {
+			lng, lat, err2 := api.AutonaviAPI.CoordinateConvert(originalLng, originalLat, autonavi.CoordSysGPS)
+			if err2 == nil {
+				originalLng = lng
+				originalLat = lat
+			} else {
+				// 如果没有转成功，保留原始数据
+				order.CoordinateType = model.CoordinateTypeGPS
+			}
+		}
+		order.ConsigneeLng = jxutils.StandardCoordinate2Int(originalLng)
+		order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
+		// discounts := result["discount"].(map[string]interface{})
+		for _, product2 := range result["product"].([]interface{}) {
+			product := product2.(map[string]interface{})
+			sku := &model.OrderSku{
+				VendorOrderID: orderID,
+				VendorID:      model.VendorIDJD,
+				Count:         int(utils.MustInterface2Int64(product["skuCount"])),
+				SkuID:         int(utils.Str2Int64WithDefault(utils.Interface2String(product["skuIdIsv"]), 0)),
+				VendorSkuID:   utils.Int64ToStr(utils.MustInterface2Int64(product["skuId"])),
+				SkuName:       product["skuName"].(string),
+				Weight:        int(utils.MustInterface2Float64(product["skuWeight"]) * 1000),
+				SalePrice:     utils.MustInterface2Int64(product["skuJdPrice"]),
+				PromotionType: int(utils.MustInterface2Int64(product["promotionType"])),
+			}
+			if product["isGift"].(bool) {
+				sku.SkuType = 1
+			}
+			order.Skus = append(order.Skus, sku)
+			order.SkuCount++
+			order.GoodsCount += sku.Count
+			order.SalePrice += sku.SalePrice * int64(sku.Count)
+			order.Weight += sku.Weight * sku.Count
+		}
+		setOrederDetailFee(result, order)
+	}
+	return order, err
+}
+
+func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
+	order.BoxFee = utils.MustInterface2Int64(result["packagingMoney"])
+	order.PlatformFeeRate = model.JdPlatformFeeRate
+	order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
+}
+
+//
+func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
+	order, err := c.GetOrder(msg.BillID)
+	if err == nil {
+		err = partner.CurOrderManager.OnOrderNew(order, msg.StatusID)
+		// if err == nil {
+		// 	c.legacyWriteJdOrder(order, false)
+		// }
+	}
+	return jdapi.Err2CallbackResponse(err, "jd onOrderNew")
+}
+
+func (c *OrderController) onOrderAdjust(msg *jdapi.CallbackOrderMsg) *jdapi.CallbackResponse {
+	order, err := c.GetOrder(msg.BillID)
+	if err == nil {
+		err = partner.CurOrderManager.OnOrderAdjust(order, msg.StatusID)
+		// if globals.HandleLegacyJxOrder && err == nil {
+		// 	c.legacyWriteJdOrder(order, true)
+		// }
+	}
+	return jdapi.Err2CallbackResponse(err, "jd onOrderAdjust")
+}
+
+func (c *OrderController) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model.OrderStatus {
+	orderStatus := &model.OrderStatus{
+		VendorOrderID:    msg.BillID,
+		VendorID:         model.VendorIDJD,
+		OrderType:        model.OrderTypeOrder,
+		RefVendorOrderID: msg.BillID,
+		RefVendorID:      model.VendorIDJD,
+		VendorStatus:     msg.StatusID,
+		Status:           c.GetStatusFromVendorStatus(msg.StatusID),
+		StatusTime:       utils.Str2Time(msg.Timestamp),
+		Remark:           msg.Remark,
+	}
+	return orderStatus
+}
+
+// IPurchasePlatformHandler
+func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int {
+	if status, ok := VendorStatus2StatusMap[vendorStatus]; ok {
+		return status
+	}
+	return model.OrderStatusUnknown
+}
+
+func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	_, err = api.JdAPI.OrderAcceptOperate(order.VendorOrderID, isAcceptIt)
+	return err
+}
+
+func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID)
+	return err
+}
+
+func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.ModifySellerDelivery(order.VendorOrderID)
+	if err != nil {
+		if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 {
+			globals.SugarLogger.Infof("Swtich2SelfDeliver failed with error:%v try get current status", err)
+			if order2, err2 := c.GetOrder(order.VendorOrderID); err2 == nil {
+				var mapData map[string]interface{}
+				if err2 = utils.UnmarshalUseNumber([]byte(order2.OriginalData), &mapData); err2 == nil {
+					if utils.Interface2String(mapData["deliveryCarrierNo"]) == "2938" { // 当前已经是自送状态了
+						err = nil
+					}
+				}
+			}
+		}
+	}
+	return err
+}
+
+func (c *OrderController) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.DeliveryEndOrder(order.VendorOrderID)
+	return err
+}
+
+func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+	_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID)
+	return err
+}
+
+// 京东送达接口都是一样的
+func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+	return c.Swtich2SelfDelivered(order)
+}
--- a/business/partner/purchase/jd/order_legacy.go
+++ b/business/partner/purchase/jd/order_legacy.go
@@ -0,0 +1,49 @@
+package jd
+
+import (
+	"git.rosy.net.cn/baseapi/utils"
+	"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"
+)
+
+// 为了兼容之前的表，造出原来需要的数据
+func (c *OrderController) legacyWriteJdOrder(order *model.GoodsOrder, delOldFirst bool) (err error) {
+	db := orm.NewOrm()
+	if delOldFirst {
+		db.Raw("DELETE FROM jdorder2 WHERE jdorderid = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
+	}
+	legacyOrder := &legacymodel.Jdorder2{
+		Code:            "0",
+		Jdorderid:       utils.Str2Int64(order.VendorOrderID),
+		Orderstatus:     int(utils.Str2Int64(order.VendorStatus)),
+		Orderstatustime: utils.Time2Str(order.StatusTime),
+		Success:         1,
+		Cityname:        "all",
+	}
+	_, err = db.Insert(legacyOrder)
+	if err != nil {
+		globals.SugarLogger.Infof("legacyWriteJdOrder orderID:%s insert error:%v", order.VendorOrderID, err)
+	}
+	return err
+}
+
+func (c *OrderController) legacyJdOrderStatusChanged(status *model.OrderStatus) (err error) {
+	db := orm.NewOrm()
+	legacyOrder := &legacymodel.Jdorder2{
+		Jdorderid: utils.Str2Int64(status.VendorOrderID),
+	}
+
+	if err = db.Read(legacyOrder, "Jdorderid"); err == nil {
+		utils.CallFuncLogError(func() error {
+			legacyOrder.Orderstatus = int(utils.Str2Int64(status.VendorStatus))
+			legacyOrder.Orderstatustime = utils.Time2Str(status.StatusTime)
+			_, err = db.Update(legacyOrder, "Orderstatus", "Orderstatustime")
+			return err
+		}, "legacyJdOrderStatusChanged, status:%v", status)
+	} else {
+		globals.SugarLogger.Infof("legacyJdOrderStatusChanged db.Read status:%v, error:%v", status, err)
+	}
+	return err
+}
--- a/business/partner/purchase/jd/order_test.go
+++ b/business/partner/purchase/jd/order_test.go
@@ -0,0 +1,42 @@
+package jd
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"git.rosy.net.cn/jx-callback/globals/db"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+	beego.InitBeegoBeforeTest("/Users/xujianhua/go/src/git.rosy.net.cn/jx-callback/conf/app.conf")
+	beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test
+
+	globals.Init()
+	db.Init()
+	api.Init()
+}
+
+func TestSwitch2SelfDeliver(t *testing.T) {
+	orderID := "817540316000041"
+	if order, err := orderman.CurOrderManager.LoadOrder(orderID, model.VendorIDJD); err == nil {
+		// globals.SugarLogger.Debug(order)
+		c := new(OrderController)
+		if err = c.Swtich2SelfDeliver(order); err == nil {
+		} else {
+			t.Fatal(err.Error())
+		}
+	} else {
+		t.Fatal(err.Error())
+	}
+}
+
+func TestGetOrder(t *testing.T) {
+	_, err := new(OrderController).GetOrder("815536199000222")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+}
--- a/business/partner/purchase/jd/waybill.go
+++ b/business/partner/purchase/jd/waybill.go
@@ -0,0 +1,65 @@
+package jd
+
+import (
+	"git.rosy.net.cn/baseapi/platformapi/jdapi"
+	"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/partner"
+	"git.rosy.net.cn/jx-callback/globals/api"
+)
+
+type WaybillController struct {
+}
+
+func (c *WaybillController) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
+	jxutils.CallMsgHandler(func() {
+		retVal = c.onWaybillMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJD))
+	return retVal
+}
+
+func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
+	order := c.callbackMsg2Waybill(msg)
+	switch msg.DeliveryStatus {
+	case jdapi.DeliveryStatusWait4Grap:
+		order.Status = model.WaybillStatusNew
+	case jdapi.DeliveryStatusAccepted:
+		if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil {
+			// 默认配送费=订单应付运费(orderReceivableFreight)
+			//订单应付运费为未优惠前应付运费(满免优惠，运费优惠券，VIP免基础运费，用户小费)ps：用户小费是用户给配送员的小费
+			order.DesiredFee = utils.Interface2Int64WithDefault(result["orderReceivableFreight"], 0) +
+				utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) +
+				utils.Interface2Int64WithDefault(result["tips"], 0)
+		}
+		order.Status = model.WaybillStatusAccepted
+	case jdapi.DeliveryStatusCourierCanceled:
+		order.Status = model.WaybillStatusCanceled
+	case jdapi.DeliveryStatusCourierArrived:
+		order.Status = model.WaybillStatusCourierArrived
+	case jdapi.DeliveryStatusGotGoods:
+		order.Status = model.WaybillStatusDelivering
+	case jdapi.DeliveryStatusFinished:
+		order.Status = model.WaybillStatusDelivered
+	case jdapi.DeliveryStatusFailedDelivery, jdapi.DeliveryStatusFailedGetGoods:
+		order.Status = model.WaybillStatusFailed
+	default:
+		order.Status = model.WaybillStatusUnknown
+	}
+	return jdapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
+}
+
+func (c *WaybillController) callbackMsg2Waybill(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *model.Waybill) {
+	retVal = &model.Waybill{
+		VendorOrderID:   msg.OrderID,
+		OrderVendorID:   model.VendorIDJD,
+		VendorWaybillID: msg.OrderID,
+		WaybillVendorID: model.VendorIDJD,
+		CourierName:     msg.DeliveryManName,
+		CourierMobile:   msg.DeliveryManPhone,
+		VendorStatus:    msg.DeliveryStatus,
+		StatusTime:      utils.Str2Time(msg.DeliveryStatusTime),
+		Remark:          msg.Remark,
+	}
+	return retVal
+}