diff --git a/controllers/ebai_callback.go b/controllers/ebai_callback.go index c11b1792b..62d02c535 100644 --- a/controllers/ebai_callback.go +++ b/controllers/ebai_callback.go @@ -4,8 +4,6 @@ import ( "encoding/json" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals" "io/ioutil" "net/http" "strings" @@ -24,26 +22,26 @@ func (c *EbaiController) Msg() { if c.Ctx.Input.Method() == http.MethodPost { obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request) if callbackResponse == nil { - vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"]) - if vendorStoreId != 0 { - storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreId), model.VendorIDEBAI, "") - if storeDetail == nil { - globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) - switch web.BConfig.RunMode { - case model.ServerTypeVegetable: - callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false)) - case model.ServerTypeFruits: - callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) - case model.ServerTypePet: - //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("饿了么菜市推果园cmd:%s,storeId:%s", obj.Cmd, vendorStoreId)) - callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil) - return - } - c.Data["json"] = callbackResponse - c.ServeJSON() - return - } - } + //vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"]) + //if vendorStoreId != 0 { + // storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreId), model.VendorIDEBAI, "") + // if storeDetail == nil { + // globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) + // switch web.BConfig.RunMode { + // case model.ServerTypeVegetable: + // callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false)) + // case model.ServerTypeFruits: + // callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) + // case model.ServerTypePet: + // //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("饿了么菜市推果园cmd:%s,storeId:%s", obj.Cmd, vendorStoreId)) + // callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil) + // return + // } + // c.Data["json"] = callbackResponse + // c.ServeJSON() + // return + // } + //} callbackResponse = ebai.OnCallbackMsg(obj) } if callbackResponse == nil { diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 6d12970a3..5d7541ed8 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -4,7 +4,6 @@ import ( "encoding/json" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "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" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" @@ -31,24 +30,24 @@ func (c *MtwmController) onCallbackMsg(msgType string) { json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup) vendorStoreId = finishedPickup.AppPoiCode } - if vendorStoreId != "" { - storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") - if storeDetail == nil { - 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)) - callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "") - return - } - c.Data["json"] = callbackResponse - c.ServeJSON() - return - } - } + //if vendorStoreId != "" { + // storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") + // if storeDetail == nil { + // 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)) + // callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "") + // return + // } + // c.Data["json"] = callbackResponse + // c.ServeJSON() + // return + // } + //} callbackResponse = mtwm.OnCallbackMsg(msg, msgType) if callbackResponse == nil {