1
This commit is contained in:
@@ -2,11 +2,8 @@ package controllers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
|
|
||||||
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
|
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
|
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
|
||||||
@@ -27,7 +24,6 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
|
|||||||
msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
|
msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
|
||||||
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
||||||
globals.SugarLogger.Debugf("------mtmsg := %s", utils.Format4Output(msg, false))
|
globals.SugarLogger.Debugf("------mtmsg := %s", utils.Format4Output(msg, false))
|
||||||
globals.SugarLogger.Debugf("------callbackResponse := %s", utils.Format4Output(callbackResponse, false))
|
|
||||||
}
|
}
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
vendorStoreId := msg.FormData.Get("app_poi_code")
|
vendorStoreId := msg.FormData.Get("app_poi_code")
|
||||||
@@ -42,29 +38,30 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
|
|||||||
if vendorStoreId != "" {
|
if vendorStoreId != "" {
|
||||||
storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "")
|
storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "")
|
||||||
if storeDetail == nil {
|
if storeDetail == nil {
|
||||||
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
|
||||||
globals.SugarLogger.Debugf("-----美团订单非菜市消息推送-%s,服务平台:%s", utils.Format4Output(msg, false), web.BConfig.RunMode)
|
|
||||||
}
|
|
||||||
switch web.BConfig.RunMode {
|
switch web.BConfig.RunMode {
|
||||||
case model.ServerTypeVegetable, "dev":
|
case model.ServerTypeVegetable, "dev":
|
||||||
callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits)
|
callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits)
|
||||||
case model.ServerTypeFruits:
|
case model.ServerTypeFruits:
|
||||||
callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet)
|
callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet)
|
||||||
case model.ServerTypePet:
|
case model.ServerTypePet:
|
||||||
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("cmd:%s,storeId:%s", msgType, vendorStoreId))
|
//ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "美团菜市推果园,果园退超市未找到门店", fmt.Sprintf("美团菜市推果园cmd:%s,storeId:%s", msgType, vendorStoreId))
|
||||||
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "")
|
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
|
||||||
globals.SugarLogger.Debugf("------callbackResponse2 := %s", utils.Format4Output(callbackResponse, false))
|
|
||||||
}
|
|
||||||
c.Data["json"] = callbackResponse
|
c.Data["json"] = callbackResponse
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
||||||
|
globals.SugarLogger.Debugf("------msg := %s", utils.Format4Output(msg, false))
|
||||||
|
globals.SugarLogger.Debugf("------msgType := %s", utils.Format4Output(msgType, false))
|
||||||
|
}
|
||||||
callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
|
callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
|
||||||
|
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
|
||||||
|
globals.SugarLogger.Debugf("------callbackResponse := %s", utils.Format4Output(callbackResponse, false))
|
||||||
|
}
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
|
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user