Merge remote-tracking branch 'origin/jxstore' into lcw

This commit is contained in:
renyutian
2019-03-21 16:48:27 +08:00
4 changed files with 31 additions and 16 deletions

View File

@@ -133,14 +133,16 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
if msg.Cmd == mtwmapi.MsgTypeNewOrder || msg.Cmd == mtwmapi.MsgTypeOrderModified {
order, orderMap, err2 := c.getOrder(GetOrderIDFromMsg(msg))
if err = err2; err == nil {
utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap)
})
if msg.Cmd == mtwmapi.MsgTypeNewOrder {
err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus)
} else {
err = partner.CurOrderManager.OnOrderAdjust(order, order.VendorStatus)
}
if err == nil {
utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap)
})
}
}
} else {
// todo 好像没有“商家已收到”消息回调,是否需要模拟?