diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index aaf9b269a..7c9124a11 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -6,31 +6,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" ) -// -//if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged { -//response = CurPurchaseHandler.onStoreStatusChanged(msg) -//} else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade { -//response = CurPurchaseHandler.onNumberDowngrade(msg) -//} else if msg.Cmd == mtwmapi.MsgTypeStoreBind { -// -//} else { -//if orderID := GetOrderIDFromMsg(msg); orderID != "" { -//jxutils.CallMsgHandler(func() { -//switch msg.Cmd { -//case mtwmapi.MsgTypeWaybillStatus: -//response = CurPurchaseHandler.onWaybillMsg(msg) -//default: -//response = CurPurchaseHandler.onOrderMsg(msg) -//} -//}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM)) -//} -///*if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { -// utils.CallFuncAsync(func() { -// OnFinancialMsg(msg) -// }) -//} */ -//} - func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) { if CurPurchaseHandler == nil { return &mtwmapi.CallbackResponse{Data: "CurPurchaseHandler init fail"} diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 93aa57167..25233beaa 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -2,7 +2,9 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/mtwmapi" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -12,9 +14,14 @@ type MtwmController struct { } func (c *MtwmController) onCallbackMsg(msgType string) { + c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request) + globals.SugarLogger.Debug(utils.Format4Output(msg, true)) if callbackResponse == nil { callbackResponse = mtwm.OnCallbackMsg(msg) + if callbackResponse == nil { + callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") + } } c.Data["json"] = callbackResponse c.ServeJSON()