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

修复风控单可能发送新订单消息的bug

Browse Source
This commit is contained in:
gazebo
2019-10-25 11:30:05 +08:00
parent cf89a98a6f
commit dccc89baa9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -174,12 +174,14 @@ func init() {
partner.CurOrderManager.OnOrderMsg(order, "自动接单失败", err.Error()) partner.CurOrderManager.OnOrderMsg(order, "自动接单失败", err.Error())
// 为了解决京东新消息与接单消息乱序的问题 // 为了解决京东新消息与接单消息乱序的问题
if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 && errWithCode.IntCode() == -1 { if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 && errWithCode.IntCode() == -1 {
if order2, err2 := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).GetOrder(order.VendorOrderID); err2 == nil && order2.Status > order.Status { if order2, err2 := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).GetOrder(order.VendorOrderID); err2 == nil {
order.Status = order2.Status if order2.Status > order.Status {
jxutils.CallMsgHandlerAsync(func() { order.Status = order2.Status
sch.OnOrderStatusChanged(order, model.Order2Status(order2), false) jxutils.CallMsgHandlerAsync(func() {
}, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)) sch.OnOrderStatusChanged(order, model.Order2Status(order2), false)
err = nil }, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID))
err = nil
}
} else { } else {
err = err2 err = err2
} }