From 764beca88691318e24b40454edd81b5492c6c581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 6 Jan 2025 10:56:03 +0800 Subject: [PATCH] 1 --- controllers/mtwm_callback.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 6214338ed..f514217e1 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -2,11 +2,8 @@ package controllers import ( "encoding/json" - "fmt" - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "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/dao" "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) 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("------callbackResponse := %s", utils.Format4Output(callbackResponse, false)) } if callbackResponse == nil { vendorStoreId := msg.FormData.Get("app_poi_code") @@ -42,29 +38,30 @@ func (c *MtwmController) onCallbackMsg(msgType string) { if vendorStoreId != "" { storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") 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 { case model.ServerTypeVegetable, "dev": callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits) case model.ServerTypeFruits: callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, 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), "") 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.ServeJSON() 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) + 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 { callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") }