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

- 修复调用OnAfsOrderNew的判断条件错误的BUG

Browse Source 
- ebai.OnAfsOrderMsg导致死循环的问题
This commit is contained in:
gazebo
2019-05-11 18:18:10 +08:00
parent acacc7a1b2
commit 7a3becaefe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/partner/purchase/ebai/order_afs.go
View File

@@ -45,11 +45,11 @@ func (c *PurchaseHandler) isAfsMsg(msg *ebaiapi.CallbackMsg) bool {
} }
func (c *PurchaseHandler) OnAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) { func (c *PurchaseHandler) OnAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) {
jxutils.CallMsgHandler(func() { utils.CallFuncAsync(func() {
utils.CallFuncAsync(func() { jxutils.CallMsgHandler(func() {
retVal = c.onAfsOrderMsg(msg) retVal = c.onAfsOrderMsg(msg)
}) }, jxutils.ComposeUniversalOrderID(GetOrderIDFromMsg(msg), model.VendorIDEBAI))
}, jxutils.ComposeUniversalOrderID(GetOrderIDFromMsg(msg), model.VendorIDEBAI)) })
return retVal return retVal
} }
@@ -71,7 +71,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
// SkuBoxMoney: afsInfo.MealBoxMoney, // SkuBoxMoney: afsInfo.MealBoxMoney,
} }
if msg.Cmd == ebaiapi.CmdOrderPartRefund { if msg.Cmd == ebaiapi.CmdOrderPartRefund {
if orderStatus.Status <= model.AfsOrderStatusNew { if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew {
partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo) partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo)
afsOrder.VendorReasonType = partRefundData.ReasonType afsOrder.VendorReasonType = partRefundData.ReasonType
afsOrder.ReasonType = c.convertAfsReasonType(partRefundData.ReasonType) afsOrder.ReasonType = c.convertAfsReasonType(partRefundData.ReasonType)
@@ -98,7 +98,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
} }
} }
} else if msg.Cmd == ebaiapi.CmdOrderUserCancel { } else if msg.Cmd == ebaiapi.CmdOrderUserCancel {
if orderStatus.Status <= model.AfsOrderStatusNew { if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew {
if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(afsOrder.VendorOrderID, afsOrder.VendorID); err2 == nil { if orderFinancial, err2 := partner.CurOrderManager.LoadOrderFinancial(afsOrder.VendorOrderID, afsOrder.VendorID); err2 == nil {
afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg) afsOrder = c.OrderFinancialDetail2Refund(orderFinancial, msg)
cancelData := msg.Data.(*ebaiapi.CBUserCancelInfo) cancelData := msg.Data.(*ebaiapi.CBUserCancelInfo)
@@ -111,7 +111,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
} }
} }
var err error var err error
if orderStatus.Status <= model.AfsOrderStatusNew { if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew {
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
} else { } else {
err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus) err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus)

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

@@ -73,7 +73,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jd
if err == nil { if err == nil {
var err error var err error
status := c.callbackAfsMsg2Status(msg, afsInfo) status := c.callbackAfsMsg2Status(msg, afsInfo)
if status.Status <= model.AfsOrderStatusNew { if status.Status == model.AfsOrderStatusWait4Approve || status.Status == model.AfsOrderStatusNew {
afsOrder := c.buildAfsOrder(afsInfo) afsOrder := c.buildAfsOrder(afsInfo)
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, status) err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, status)
} else { } else {