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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-31 11:38:05 +08:00
parent 6378fa103d
commit 9564d04538
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,9 @@ import (
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
) )
func OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { func OnOrderMsg(msg *jdapi.CallbackOrderMsg, a *jdapi.API) (retVal *jdapi.CallbackResponse) {
if CurPurchaseHandler != nil { if CurPurchaseHandler != nil {
retVal = CurPurchaseHandler.OnOrderMsg(AppKey2OrgCode(msg.AppKey), msg) retVal = CurPurchaseHandler.OnOrderMsg(a, msg)
} }
return retVal return retVal
} }

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

@@ -59,9 +59,9 @@ var (
} }
) )
func (c *PurchaseHandler) OnOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { func (c *PurchaseHandler) OnOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
retVal = c.onOrderMsg(vendorOrgCode, msg) retVal = c.onOrderMsg(a, msg)
}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD)) }, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
return retVal return retVal
} }
@@ -82,8 +82,8 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
return err return err
} }
func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
a := getAPI(vendorOrgCode) // a := getAPI(vendorOrgCode)
if afsMsgMap[msg.MsgURL] { if afsMsgMap[msg.MsgURL] {
retVal = c.OnAfsOrderMsg(a, msg) retVal = c.OnAfsOrderMsg(a, msg)
} else { } else {
@@ -119,9 +119,9 @@ func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOr
// globals.SugarLogger.Warnf("京东取消拣货：%v", err2) // globals.SugarLogger.Warnf("京东取消拣货：%v", err2)
// } // }
// } // }
globals.SugarLogger.Debugf("OnOrderStatusChanged jd %s", vendorOrgCode) globals.SugarLogger.Debugf("OnOrderStatusChanged jd %s", AppKey2OrgCode(msg.AppKey))
globals.SugarLogger.Debug("OnOrderStatusChanged jd %s", utils.Format4Output(status, true)) globals.SugarLogger.Debug("OnOrderStatusChanged jd %v", utils.Format4Output(status, true))
err := partner.CurOrderManager.OnOrderStatusChanged(vendorOrgCode, status) err := partner.CurOrderManager.OnOrderStatusChanged(AppKey2OrgCode(msg.AppKey), status)
retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus) retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
} }
} }
@@ -388,16 +388,17 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
} }
func (c *PurchaseHandler) postFakeMsg(vendorOrgCode, vendorOrderID, vendorStatus string) { func (c *PurchaseHandler) postFakeMsg(vendorOrgCode, vendorOrderID, vendorStatus string) {
a := getAPI(vendorOrgCode)
msg := &jdapi.CallbackOrderMsg{ msg := &jdapi.CallbackOrderMsg{
CallbackMsg: &jdapi.CallbackMsg{ CallbackMsg: &jdapi.CallbackMsg{
AppKey: getAPI(vendorOrgCode).GetAppKey(), AppKey: a.GetAppKey(),
}, },
BillID: vendorOrderID, BillID: vendorOrderID,
StatusID: vendorStatus, StatusID: vendorStatus,
Timestamp: utils.Time2Str(time.Now()), Timestamp: utils.Time2Str(time.Now()),
} }
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
OnOrderMsg(msg) OnOrderMsg(msg, a)
}) })
} }

2
controllers/jd_callback.go
View File

@@ -40,7 +40,7 @@ func (c *DjswController) orderStatus() {
globals.SugarLogger.Debugf("jd deliverOrder 1") globals.SugarLogger.Debugf("jd deliverOrder 1")
callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) { callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) {
globals.SugarLogger.Debugf("jd deliverOrder 2", utils.Format4Output(callbackResponse, false)) globals.SugarLogger.Debugf("jd deliverOrder 2", utils.Format4Output(callbackResponse, false))
callbackResponse = jd.OnOrderMsg(obj.(*jdapi.CallbackOrderMsg)) callbackResponse = jd.OnOrderMsg(obj.(*jdapi.CallbackOrderMsg), a)
globals.SugarLogger.Debugf("jd deliverOrder 3", utils.Format4Output(callbackResponse, false)) globals.SugarLogger.Debugf("jd deliverOrder 3", utils.Format4Output(callbackResponse, false))
return callbackResponse return callbackResponse
}) })