1
This commit is contained in:
@@ -2,9 +2,6 @@ package mtwm
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"git.rosy.net.cn/jx-callback/business/partner/im"
|
||||
|
||||
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
||||
@@ -18,13 +15,6 @@ import (
|
||||
|
||||
// 美团回调接口
|
||||
func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi.CallbackResponse) {
|
||||
// 获取平台门店id
|
||||
//_, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), GetVendorStoreIDFromMsg(msg), model.VendorIDMTWM, GetVendorAppIdFromMsg(msg))
|
||||
//if err != nil && strings.Contains(err.Error(), "no row found") {
|
||||
//forwardOrderToGy(msg, msgType)
|
||||
// return mtwmapi.SuccessResponse
|
||||
//}
|
||||
|
||||
if CurPurchaseHandler != nil {
|
||||
if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged {
|
||||
response = CurPurchaseHandler.onStoreStatusChanged(msg)
|
||||
@@ -69,58 +59,6 @@ func GetVendorAppIdFromMsg(msg *mtwmapi.CallbackMsg) string {
|
||||
return msg.FormData.Get(mtwmapi.KeyAppID)
|
||||
}
|
||||
|
||||
func forwardOrderToGy(msg *mtwmapi.CallbackMsg, msgType string) {
|
||||
cl := http.Client{}
|
||||
callbackUrl := GetMsgCallBackUrl(msgType, msg.AppID)
|
||||
request, err := http.NewRequest(http.MethodPost, "http://callback-jxgy.jxc4.com/mtwm/"+callbackUrl, strings.NewReader(msg.FormData.Encode()))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
|
||||
cl.Do(request)
|
||||
}
|
||||
|
||||
func GetMsgCallBackUrl(msgType, appId string) string {
|
||||
interfaceUrl := ""
|
||||
switch msgType {
|
||||
case mtwmapi.MsgTypeWaybillStatus:
|
||||
interfaceUrl = "/waybillStatus"
|
||||
case mtwmapi.MsgTypeNewOrder:
|
||||
interfaceUrl = "/newOrder"
|
||||
case mtwmapi.MsgTypeOrderAccepted:
|
||||
interfaceUrl = "/orderAccepted"
|
||||
case mtwmapi.MsgTypeOrderFinished:
|
||||
interfaceUrl = "/orderFinished"
|
||||
case mtwmapi.MsgTypeOrderFinancial:
|
||||
interfaceUrl = "/orderFinancial"
|
||||
case mtwmapi.MsgTypeOrderCanceled:
|
||||
interfaceUrl = "/orderCanceled"
|
||||
case mtwmapi.MsgTypeUserUrgeOrder:
|
||||
interfaceUrl = "/userUrgeOrder"
|
||||
case mtwmapi.MsgTypePrivateNumberDowngrade:
|
||||
interfaceUrl = "/numberDowngrade"
|
||||
case mtwmapi.MsgTypeOrderModified:
|
||||
interfaceUrl = "/orderModified"
|
||||
case mtwmapi.MsgTypeOrderRefund:
|
||||
interfaceUrl = "/orderRefund"
|
||||
case mtwmapi.MsgTypeOrderPartialRefund:
|
||||
interfaceUrl = "/orderPartialRefund"
|
||||
case mtwmapi.MsgTypeOrderFinishedPickup:
|
||||
interfaceUrl = "/orderFinishedPickup"
|
||||
case mtwmapi.MsgTypeStoreStatusChanged:
|
||||
interfaceUrl = "/storeStatusChanged"
|
||||
case mtwmapi.MsgTypeStoreAuditStatusChanged:
|
||||
interfaceUrl = "/storeAuditStatusChanged"
|
||||
case mtwmapi.MsgTypeSkuDelete:
|
||||
interfaceUrl = "/skuDelete"
|
||||
case mtwmapi.MsgTypeStoreBind:
|
||||
interfaceUrl = "/storeBind"
|
||||
default:
|
||||
globals.SugarLogger.Errorf("美团超市[app_id :=%s ,callbackUrl := %s ]回调推送到果园错误,回调地址不正确", appId, msgType)
|
||||
}
|
||||
return interfaceUrl
|
||||
}
|
||||
|
||||
// OnImMsg im消息回调
|
||||
func OnImMsg(msg *mtwmapi.ImCallbackMsg) (response *mtwmapi.CallbackResponse) {
|
||||
//globals.SugarLogger.Debugf("OnImMsg test0124 msg:=%s", utils.Format4Output(msg, false))
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"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"
|
||||
"net/http"
|
||||
@@ -21,19 +18,7 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
|
||||
c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
|
||||
msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
|
||||
if callbackResponse == nil {
|
||||
vendorStoreId := msg.FormData.Get("app_poi_code")
|
||||
if vendorStoreId == "" {
|
||||
vendorStoreId = msg.FormData.Get("wm_poi_id")
|
||||
}
|
||||
if msgType == mtwmapi.MsgTypeOrderFinishedPickup {
|
||||
finishedPickup := FinishedPickup{}
|
||||
json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup)
|
||||
vendorStoreId = finishedPickup.AppPoiCode
|
||||
}
|
||||
if vendorStoreId == "9472886" {
|
||||
globals.SugarLogger.Debugf("=====msg.FormData:%s", utils.Format4Output(msg.FormData, false))
|
||||
globals.SugarLogger.Debugf("=====msgType:%s", utils.Format4Output(msgType, false))
|
||||
}
|
||||
// 定时任务在拉去,暂时不推送了
|
||||
//if web.BConfig.RunMode != "jxgy" { // 订单查询不到所属门店默认为果园订单
|
||||
// vendorStoreId := msg.FormData.Get("app_poi_code")
|
||||
// if vendorStoreId == "" {
|
||||
@@ -62,7 +47,6 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
|
||||
if callbackResponse == nil {
|
||||
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
|
||||
|
||||
Reference in New Issue
Block a user