From f3939687edaca9ab232ea9fee3fd53ae18931b37 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 11 Apr 2019 19:46:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20ebai.OnCallbackMsg=E4=B8=AD=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BA=8B=E4=BB=B6=E5=90=8E=E6=89=8D=E4=BC=9A?= =?UTF-8?q?=E8=B0=83=E7=94=A8GetOrderIDFromMsg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/callback.go | 22 +++++++++++-------- .../{ebai_order.go => ebai_callback.go} | 0 2 files changed, 13 insertions(+), 9 deletions(-) rename controllers/{ebai_order.go => ebai_callback.go} (100%) diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index b3273ce67..e7cc9464c 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -8,15 +8,19 @@ import ( ) func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { - orderID := GetOrderIDFromMsg(msg) - jxutils.CallMsgHandler(func() { - switch msg.Cmd { - case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel: - response = CurPurchaseHandler.onOrderMsg(msg) - case ebaiapi.CmdOrderDeliveryStatus: - response = CurPurchaseHandler.onWaybillMsg(msg) - } - }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDEBAI)) + if msg.Cmd == ebaiapi.CmdOrderCreate || + msg.Cmd == ebaiapi.CmdOrderStatus || + msg.Cmd == ebaiapi.CmdOrderUserCancel { + orderID := GetOrderIDFromMsg(msg) + jxutils.CallMsgHandler(func() { + switch msg.Cmd { + case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus, ebaiapi.CmdOrderUserCancel: + response = CurPurchaseHandler.onOrderMsg(msg) + case ebaiapi.CmdOrderDeliveryStatus: + response = CurPurchaseHandler.onWaybillMsg(msg) + } + }, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDEBAI)) + } if msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { utils.CallFuncAsync(func() { OnFinancialMsg(msg) diff --git a/controllers/ebai_order.go b/controllers/ebai_callback.go similarity index 100% rename from controllers/ebai_order.go rename to controllers/ebai_callback.go