From 1a58e4c889097e08dd4839be336d3f03aab394b9 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 31 May 2019 14:55:23 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A4=84=E7=90=86=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BA=8B=E4=BB=B6=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/order.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index f717feb96..8246b5165 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -36,6 +36,7 @@ const ( var ( VendorStatus2StatusMap = map[string]int{ + ebaiapi.CmdOrderCreate: model.OrderStatusNew, ebaiapi.OrderStatusNew: model.OrderStatusNew, fakeAcceptOrder: model.OrderStatusAccepted, ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, @@ -303,7 +304,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. return nil } if ebaiapi.CmdOrderCreate == msg.Cmd { - retVal = c.onOrderNew(msg) + retVal = c.onOrderNew(msg, status) } else { var err error if status != nil { @@ -322,11 +323,11 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. return retVal } -func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { +func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg, orderStatus *model.OrderStatus) (response *ebaiapi.CallbackResponse) { vendorOrderID := GetOrderIDFromMsg(msg) order, orderMap, err := c.getOrder(vendorOrderID) if err == nil { - if err = partner.CurOrderManager.OnOrderNew(order, c.callbackMsg2Status(msg)); err == nil { + if err = partner.CurOrderManager.OnOrderNew(order, orderStatus); err == nil { utils.CallFuncAsync(func() { c.OnOrderDetail(orderMap, partner.CreatedPeration) })