From 1523099d3a7418f35ce67e4857f03f914de252ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 14 Jul 2025 09:37:45 +0800 Subject: [PATCH] 1 --- controllers/mtwm_callback.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 2ce2c6874..323d8dbc9 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -3,9 +3,11 @@ package controllers import ( "encoding/json" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" + "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/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" "io/ioutil" @@ -21,6 +23,7 @@ type MtwmController struct { } var MTWMVendorStoreIDMap = new(sync.Map) +var StoreMap2Gy = make(map[string]string, 0) func (c *MtwmController) onCallbackMsg(msgType string) { msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request) @@ -40,6 +43,7 @@ func (c *MtwmController) onCallbackMsg(msgType string) { if storeDetail == nil { switch web.BConfig.RunMode { case model.ServerTypeVegetable, "dev": + StoreMap2Gy[vendorStoreId] = "1" callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypeFruits) case model.ServerTypeFruits: callbackResponse = pushMTWMOrder2GY(msg.FormData, msgType, model.ServerTypePet) @@ -47,7 +51,8 @@ func (c *MtwmController) onCallbackMsg(msgType string) { callbackResponse = mtwmapi.Err2CallbackResponse(nil, "") // mtwmapi.Err2CallbackResponse(fmt.Errorf("美团菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", msgType, vendorStoreId), "") return } - c.Data["json"] = callbackResponse + //c.Data["json"] = callbackResponse + c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") c.ServeJSON() return } else { @@ -61,6 +66,9 @@ func (c *MtwmController) onCallbackMsg(msgType string) { } } + if time.Now().After(utils.Str2Time("2025-07-14 12:40:00")) { + globals.SugarLogger.Debugf("StoreMap2Gy-----%s", utils.Format4Output(StoreMap2Gy, false)) + } c.Data["json"] = callbackResponse c.ServeJSON() }