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

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

Browse Source
This commit is contained in:
renyutian
2019-03-21 16:48:27 +08:00
parent 0ee04cdd4d 81efff6380
commit 9fc122d7f0
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,10 +233,11 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap
vendorOrderID := GetOrderIDFromMsg(msg) vendorOrderID := GetOrderIDFromMsg(msg)
order, orderMap, err := c.getOrder(vendorOrderID) order, orderMap, err := c.getOrder(vendorOrderID)
if err == nil { if err == nil {
utils.CallFuncAsync(func() { if err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus); err == nil {
c.OnOrderDetail(orderMap) utils.CallFuncAsync(func() {
}) c.OnOrderDetail(orderMap)
err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus) })
}
} }
return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, map[string]interface{}{ return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, map[string]interface{}{
"source_order_id": vendorOrderID, "source_order_id": vendorOrderID,

4
business/partner/purchase/jd/financial.go
View File

@@ -144,3 +144,7 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac
} }
return afsOrder return afsOrder
} }
func (p *PurchaseHandler) OnOrderDetail(orderDetail map[string]interface{}) (err error) {
return err
}

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

@@ -61,7 +61,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi
return retVal return retVal
} }
func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) { func (c *PurchaseHandler) getOrder(orderID string) (order *model.GoodsOrder, orderMap map[string]interface{}, err error) {
globals.SugarLogger.Debugf("jd GetOrder orderID:%s", orderID) globals.SugarLogger.Debugf("jd GetOrder orderID:%s", orderID)
var ( var (
result map[string]interface{} result map[string]interface{}
@@ -91,6 +91,11 @@ func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err
// globals.SugarLogger.Warnf("jd GetOrder orderID:%s, GetRealMobile4Order failed with error:%v", orderID, err2) // globals.SugarLogger.Warnf("jd GetOrder orderID:%s, GetRealMobile4Order failed with error:%v", orderID, err2)
} }
} }
return order, result, err
}
func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
order, _, err = c.getOrder(orderID)
return order, err return order, err
} }
@@ -182,12 +187,13 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder)
// //
func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
order, err := c.GetOrder(msg.BillID) order, orderMap, err := c.getOrder(msg.BillID)
if err == nil { if err == nil {
err = partner.CurOrderManager.OnOrderNew(order, msg.StatusID) if err = partner.CurOrderManager.OnOrderNew(order, msg.StatusID); err == nil {
// if err == nil { utils.CallFuncAsync(func() {
// c.legacyWriteJdOrder(order, false) c.OnOrderDetail(orderMap)
// } })
}
} }
return jdapi.Err2CallbackResponse(err, "jd onOrderNew") return jdapi.Err2CallbackResponse(err, "jd onOrderNew")
} }
@@ -196,9 +202,11 @@ func (c *PurchaseHandler) onOrderAdjust(msg *jdapi.CallbackOrderMsg) *jdapi.Call
order, err := c.GetOrder(msg.BillID) order, err := c.GetOrder(msg.BillID)
if err == nil { if err == nil {
err = partner.CurOrderManager.OnOrderAdjust(order, msg.StatusID) err = partner.CurOrderManager.OnOrderAdjust(order, msg.StatusID)
// if globals.HandleLegacyJxOrder && err == nil { if err == nil {
// c.legacyWriteJdOrder(order, true) utils.CallFuncAsync(func() {
// } c.OnOrderDetail(orderMap)
})
}
} }
return jdapi.Err2CallbackResponse(err, "jd onOrderAdjust") return jdapi.Err2CallbackResponse(err, "jd onOrderAdjust")
} }

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

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