liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-01-08 13:51:09 +08:00
parent 991e456db2
commit 6f23ade250
2 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
controllers/ebai_callback.go
View File

@@ -4,9 +4,11 @@ import (
"encoding/json" "encoding/json"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"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"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"sync"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai" "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
@@ -18,30 +20,33 @@ type EbaiController struct {
web.Controller web.Controller
} }
var EBaiVendorStoreIDList = new(sync.Map)
func (c *EbaiController) Msg() { func (c *EbaiController) Msg() {
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request) obj, callbackResponse := api.EbaiAPI.GetCallbackMsg(c.Ctx.Request)
if callbackResponse == nil { if callbackResponse == nil {
//vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"]) vendorStoreId, _ := utils.TryInterface2Int64(obj.Body["platform_shop_id"])
//if vendorStoreId != 0 { if _, have := EBaiVendorStoreIDList.Load(vendorStoreId); vendorStoreId != 0 && !have {
// storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreId), model.VendorIDEBAI, "") storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreId), model.VendorIDEBAI, "")
// if storeDetail == nil { if storeDetail == nil {
// globals.SugarLogger.Debugf("-----饿百订单非菜市消息推送-%s", utils.Format4Output(obj, false)) switch web.BConfig.RunMode {
// switch web.BConfig.RunMode { case model.ServerTypeVegetable:
// case model.ServerTypeVegetable: callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false))
// callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypeFruits, utils.Struct2Map(obj, "", false)) case model.ServerTypeFruits:
// case model.ServerTypeFruits: callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false))
// callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false)) case model.ServerTypePet:
// case model.ServerTypePet: //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("饿了么菜市推果园cmd:%s,storeId:%s", obj.Cmd, vendorStoreId))
// //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)
// 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
// return }
// } c.Data["json"] = callbackResponse
// c.Data["json"] = callbackResponse c.ServeJSON()
// c.ServeJSON() return
// return } else {
// } EBaiVendorStoreIDList.Store(vendorStoreId, model.YES)
//} }
}
callbackResponse = ebai.OnCallbackMsg(obj) callbackResponse = ebai.OnCallbackMsg(obj)
} }
if callbackResponse == nil { if callbackResponse == nil {

47
controllers/mtwm_callback.go
View File

@@ -2,8 +2,12 @@ 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/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/partner/purchase/mtwm" "git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
@@ -11,6 +15,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
"sync"
"time" "time"
) )
@@ -18,6 +23,8 @@ type MtwmController struct {
web.Controller web.Controller
} }
var MTWMVendorStoreIDMap = new(sync.Map)
func (c *MtwmController) onCallbackMsg(msgType string) { func (c *MtwmController) onCallbackMsg(msgType string) {
msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request) msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
if callbackResponse == nil { if callbackResponse == nil {
@@ -30,24 +37,28 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup) json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup)
vendorStoreId = finishedPickup.AppPoiCode vendorStoreId = finishedPickup.AppPoiCode
} }
//if vendorStoreId != "" { if vendorStoreId == "" {
// storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "美团菜市推果园,果园退超市未找到门店", fmt.Sprintf("美团菜市推果园,获取平台门店ID异常cmd:%s,storeId:%s", msgType, vendorStoreId))
// if storeDetail == nil { }
// switch web.BConfig.RunMode { if _, have := MTWMVendorStoreIDMap.Load(vendorStoreId); vendorStoreId != "" && !have {
// case model.ServerTypeVegetable, "dev": storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "")
// callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits) if storeDetail == nil {
// case model.ServerTypeFruits: switch web.BConfig.RunMode {
// callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet) case model.ServerTypeVegetable, "dev":
// case model.ServerTypePet: callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits)
// //ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "美团菜市推果园,果园退超市未找到门店", fmt.Sprintf("美团菜市推果园cmd:%s,storeId:%s", msgType, vendorStoreId)) case model.ServerTypeFruits:
// callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "") callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet)
// return case model.ServerTypePet:
// } callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "")
// c.Data["json"] = callbackResponse return
// c.ServeJSON() }
// return c.Data["json"] = callbackResponse
// } c.ServeJSON()
//} return
} else {
MTWMVendorStoreIDMap.Store(vendorStoreId, model.YES)
}
}
callbackResponse = mtwm.OnCallbackMsg(msg, msgType) callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
if callbackResponse == nil { if callbackResponse == nil {