1
This commit is contained in:
@@ -2,15 +2,9 @@ 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"
|
||||
"git.rosy.net.cn/jx-callback/globals"
|
||||
"git.rosy.net.cn/jx-callback/globals/api"
|
||||
"github.com/astaxie/beego/server/web"
|
||||
"net/http"
|
||||
@@ -35,25 +29,25 @@ 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 {
|
||||
globals.SugarLogger.Debugf("-----美团订单非菜市消息推送-%s", utils.Format4Output(msg, false))
|
||||
switch web.BConfig.RunMode {
|
||||
case model.ServerTypeVegetable:
|
||||
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 {
|
||||
// globals.SugarLogger.Debugf("-----美团订单非菜市消息推送-%s", utils.Format4Output(msg, false))
|
||||
// switch web.BConfig.RunMode {
|
||||
// case model.ServerTypeVegetable:
|
||||
// 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 {
|
||||
|
||||
Reference in New Issue
Block a user