From 4841592daa289562a49da7943cff6b6acf194955 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 14 Nov 2018 07:29:47 +0800 Subject: [PATCH] - fk ebai order_id,GetOrderIDFromMsg --- business/partner/purchase/ebai/callback.go | 14 ++++++++------ business/partner/purchase/ebai/order.go | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index 9a48a79b3..991bfdd6d 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -8,12 +8,7 @@ import ( ) func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { - orderID := "" - if true { //msg.Cmd == ebaiapi.CmdOrderCreate { // 与测试时情况不一样，好像线上全改成string了 - orderID = msg.Body["order_id"].(string) - } else { - orderID = utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"])) - } + orderID := GetOrderIDFromMsg(msg) jxutils.CallMsgHandler(func() { switch msg.Cmd { case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus: @@ -24,3 +19,10 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDEBAI)) return response } + +func GetOrderIDFromMsg(msg *ebaiapi.CallbackMsg) string { + if tryOrderID, ok := msg.Body["order_id"].(string); ok { + return tryOrderID + } + return utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"])) +} diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 4b27e96b7..2aa9d04d0 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -171,7 +171,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. } func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { - vendorOrderID := msg.Body["order_id"].(string) + vendorOrderID := GetOrderIDFromMsg(msg) order, err := c.GetOrder(vendorOrderID) if err == nil { err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus) @@ -184,7 +184,7 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus { body := msg.Body vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(body["status"])) - orderID := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"])) + orderID := GetOrderIDFromMsg(msg) orderStatus := &model.OrderStatus{ VendorOrderID: orderID, VendorID: model.VendorIDEBAI,