diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index ef9b9a898..6e9621909 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -102,7 +102,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus st } }() if order.Status == model.OrderStatusUnknown { - order.Status = model.OrderStatusNew + order.Status = model.OrderStatusAccepted } status := model.Order2Status(order) status.Status = model.OrderStatusAdjust diff --git a/business/model/const.go b/business/model/const.go index 40825387d..67ef93475 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -161,6 +161,7 @@ const ( const ( OrderStatusMsg = -100 + OrderStatusAdjust = -35 // 订单调整完成 OrderStatusWait4Pay = -30 // 下单待支付,微盟在这个时间发新订单事件 OrderStatusUnlocked = -25 OrderStatusLocked = -20 @@ -171,7 +172,6 @@ const ( OrderStatusUnknown = 0 OrderStatusNew = 5 // 新订单 - OrderStatusAdjust = 8 // 订单调整 OrderStatusAccepted = 10 // 已经接单,也即待出库,待拣货 OrderStatusFinishedPickup = 15 // 拣货完成 OrderStatusDelivering = 20 // 开始配送,配送员已取货,从这里开始就是运单消息了 diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 70df2407c..a9a2a6b47 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -33,9 +33,9 @@ const ( var ( VendorStatus2StatusMap = map[string]int{ - ebaiapi.OrderStatusNew: model.OrderStatusNew, - fakeAcceptOrder: model.OrderStatusAccepted, - fakePartRefundFinished: model.OrderStatusAdjust, + ebaiapi.OrderStatusNew: model.OrderStatusNew, + fakeAcceptOrder: model.OrderStatusAccepted, + // fakePartRefundFinished: model.OrderStatusAdjust, ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, fakeUserApplyCancel: model.OrderStatusApplyCancel, ebaiapi.OrderStatusCourierAccepted: model.OrderStatusDelivering, diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 546801545..14dc50da6 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -20,7 +20,7 @@ var ( VendorStatus2StatusMap = map[string]int{ jdapi.OrderStatusPurchased: model.OrderStatusNew, jdapi.OrderStatusNew: model.OrderStatusNew, - jdapi.OrderStatusAdjust: model.OrderStatusNew, + jdapi.OrderStatusAdjust: model.OrderStatusAdjust, jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted, jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup, jdapi.OrderStatusDelivering: model.OrderStatusDelivering, diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index cd730c7ee..f4270dc69 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -147,14 +147,10 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) { var err error - if msg.Cmd == mtwmapi.MsgTypeNewOrder || msg.Cmd == mtwmapi.MsgTypeOrderModified { + if msg.Cmd == mtwmapi.MsgTypeNewOrder { order, orderMap, err2 := c.getOrder(GetOrderIDFromMsg(msg)) if err = err2; err == nil { - if msg.Cmd == mtwmapi.MsgTypeNewOrder { - err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus) - } else { - err = partner.CurOrderManager.OnOrderAdjust(order, order.VendorStatus) - } + err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus) if err == nil { utils.CallFuncAsync(func() { if msg.Cmd == mtwmapi.MsgTypeNewOrder {