liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove mtwmapi.MsgTypeOrderModified

Browse Source
This commit is contained in:
gazebo
2019-04-16 17:20:40 +08:00
parent 8083f2f638
commit 0f871847e9
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -102,7 +102,7 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus st
} }
}() }()
if order.Status == model.OrderStatusUnknown { if order.Status == model.OrderStatusUnknown {
order.Status = model.OrderStatusNew order.Status = model.OrderStatusAccepted
} }
status := model.Order2Status(order) status := model.Order2Status(order)
status.Status = model.OrderStatusAdjust status.Status = model.OrderStatusAdjust

2
business/model/const.go
View File

@@ -161,6 +161,7 @@ const (
const ( const (
OrderStatusMsg = -100 OrderStatusMsg = -100
OrderStatusAdjust = -35 // 订单调整完成
OrderStatusWait4Pay = -30 // 下单待支付，微盟在这个时间发新订单事件 OrderStatusWait4Pay = -30 // 下单待支付，微盟在这个时间发新订单事件
OrderStatusUnlocked = -25 OrderStatusUnlocked = -25
OrderStatusLocked = -20 OrderStatusLocked = -20
@@ -171,7 +172,6 @@ const (
OrderStatusUnknown = 0 OrderStatusUnknown = 0
OrderStatusNew = 5 // 新订单 OrderStatusNew = 5 // 新订单
OrderStatusAdjust = 8 // 订单调整
OrderStatusAccepted = 10 // 已经接单，也即待出库，待拣货 OrderStatusAccepted = 10 // 已经接单，也即待出库，待拣货
OrderStatusFinishedPickup = 15 // 拣货完成 OrderStatusFinishedPickup = 15 // 拣货完成
OrderStatusDelivering = 20 // 开始配送，配送员已取货，从这里开始就是运单消息了 OrderStatusDelivering = 20 // 开始配送，配送员已取货，从这里开始就是运单消息了

6
business/partner/purchase/ebai/order.go
View File

@@ -33,9 +33,9 @@ const (
var ( var (
VendorStatus2StatusMap = map[string]int{ VendorStatus2StatusMap = map[string]int{
ebaiapi.OrderStatusNew: model.OrderStatusNew, ebaiapi.OrderStatusNew: model.OrderStatusNew,
fakeAcceptOrder: model.OrderStatusAccepted, fakeAcceptOrder: model.OrderStatusAccepted,
fakePartRefundFinished: model.OrderStatusAdjust, // fakePartRefundFinished: model.OrderStatusAdjust,
ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup, ebaiapi.OrderStatusAccepted: model.OrderStatusFinishedPickup,
fakeUserApplyCancel: model.OrderStatusApplyCancel, fakeUserApplyCancel: model.OrderStatusApplyCancel,
ebaiapi.OrderStatusCourierAccepted: model.OrderStatusDelivering, ebaiapi.OrderStatusCourierAccepted: model.OrderStatusDelivering,

2
business/partner/purchase/jd/order.go
View File

@@ -20,7 +20,7 @@ var (
VendorStatus2StatusMap = map[string]int{ VendorStatus2StatusMap = map[string]int{
jdapi.OrderStatusPurchased: model.OrderStatusNew, jdapi.OrderStatusPurchased: model.OrderStatusNew,
jdapi.OrderStatusNew: model.OrderStatusNew, jdapi.OrderStatusNew: model.OrderStatusNew,
jdapi.OrderStatusAdjust: model.OrderStatusNew, jdapi.OrderStatusAdjust: model.OrderStatusAdjust,
jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted, jdapi.OrderStatusWaitOutStore: model.OrderStatusAccepted,
jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup, jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
jdapi.OrderStatusDelivering: model.OrderStatusDelivering, jdapi.OrderStatusDelivering: model.OrderStatusDelivering,

8
business/partner/purchase/mtwm/order.go
View File

@@ -147,14 +147,10 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) { func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) {
var err error var err error
if msg.Cmd == mtwmapi.MsgTypeNewOrder || msg.Cmd == mtwmapi.MsgTypeOrderModified { if msg.Cmd == mtwmapi.MsgTypeNewOrder {
order, orderMap, err2 := c.getOrder(GetOrderIDFromMsg(msg)) order, orderMap, err2 := c.getOrder(GetOrderIDFromMsg(msg))
if err = err2; err == nil { if err = err2; err == nil {
if msg.Cmd == mtwmapi.MsgTypeNewOrder { err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus)
err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus)
} else {
err = partner.CurOrderManager.OnOrderAdjust(order, order.VendorStatus)
}
if err == nil { if err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
if msg.Cmd == mtwmapi.MsgTypeNewOrder { if msg.Cmd == mtwmapi.MsgTypeNewOrder {