From 4f64332c534f64e5676d66b065153ff55a924e15 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 6 Jun 2019 20:32:46 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BA=AC=E4=B8=9C=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BA=8B=E4=BB=B6=E4=BB=A5=E5=9B=9E=E8=B0=83=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=B8=BA=E5=87=86=EF=BC=8C=E5=BC=BA=E5=88=B6Status?= =?UTF-8?q?=E4=B8=BAOrderStatusNew=EF=BC=88=E4=BA=8B=E4=BB=B632000?= =?UTF-8?q?=E4=B8=8E=E7=8A=B6=E6=80=8132000=E5=B9=B2=E6=89=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jd/order.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 6f2d45cf6..a5415fdb3 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -43,6 +43,9 @@ func (c *PurchaseHandler) OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi func (c *PurchaseHandler) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { status := c.callbackMsg2Status(msg) + if jdapi.StatusIDNewOrder == msg.StatusID { + status.Status = model.OrderStatusNew // 因为京东将事件32000与状态32000混用，事件32000可能是新订单，也可能是已接单，统一当成新订单处理 + } if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 { return nil } @@ -178,7 +181,7 @@ func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg, orderStatus *m order, orderMap, err := c.getOrder(msg.BillID) if err == nil { globals.SugarLogger.Debugf("onOrderNew2 orderID:%s", msg.BillID) - if err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)); err == nil { + if err = partner.CurOrderManager.OnOrderNew(order, orderStatus); err == nil { utils.CallFuncAsync(func() { c.OnOrderDetail(orderMap, partner.CreatedPeration) })