diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 955b64c5a..6dbbc6c91 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -21,9 +21,10 @@ func OnCallbackMsg(msg *mtwmapi.CallbackMsg, msgType string) (response *mtwmapi. // 获取平台门店id //_, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), GetVendorStoreIDFromMsg(msg), model.VendorIDMTWM, GetVendorAppIdFromMsg(msg)) //if err != nil && strings.Contains(err.Error(), "no row found") { - // forwardOrderToGy(msg, msgType) + //forwardOrderToGy(msg, msgType) // return mtwmapi.SuccessResponse //} + if CurPurchaseHandler != nil { if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged { response = CurPurchaseHandler.onStoreStatusChanged(msg) diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 39e4e921f..b3a55bba8 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -3,6 +3,7 @@ package mtwm import ( "errors" "fmt" + "github.com/astaxie/beego/server/web" "math" "net/url" "regexp" @@ -355,6 +356,9 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap if err == nil { utils.CallFuncAsync(func() { if msg.Cmd == mtwmapi.MsgTypeNewOrder { + if order.VendorOrderID == "2301091492659134406" && web.BConfig.RunMode == "jxgy" { + globals.SugarLogger.Debugf("============orderMap %s", utils.Format4Output(orderMap, false)) + } c.OnOrderDetail(orderMap, partner.CreatedPeration) } else { c.OnOrderDetail(orderMap, partner.UpdatedPeration) diff --git a/controllers/mtwm_callback.go b/controllers/mtwm_callback.go index 93c558c2d..0e390d635 100644 --- a/controllers/mtwm_callback.go +++ b/controllers/mtwm_callback.go @@ -4,8 +4,6 @@ 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" @@ -22,29 +20,48 @@ type MtwmController struct { func (c *MtwmController) onCallbackMsg(msgType string) { c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request) - globals.SugarLogger.Debugf("===========msg := %s", utils.Format4Output(msg, false)) if callbackResponse == nil { - if web.BConfig.RunMode != "jxgy" { // 订单查询不到所属门店默认为果园订单 - vendorStoreId := msg.FormData.Get("app_poi_code") - if vendorStoreId == "" { - vendorStoreId = msg.FormData.Get("wm_poi_id") - } - if msgType == mtwmapi.MsgTypeOrderFinishedPickup { - finishedPickup := FinishedPickup{} - 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 { - // 推送到果园 - pushMTWMOrder2GY(msg.FormData, msgType) - c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") - c.ServeJSON() - return - } - } + vendorStoreId := msg.FormData.Get("app_poi_code") + if vendorStoreId == "" { + vendorStoreId = msg.FormData.Get("wm_poi_id") } + if msgType == mtwmapi.MsgTypeOrderFinishedPickup { + finishedPickup := FinishedPickup{} + json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup) + vendorStoreId = finishedPickup.AppPoiCode + } + if vendorStoreId == "9472886" { + globals.SugarLogger.Debugf("=====msg.FormData:%s", utils.Format4Output(msg.FormData, false)) + globals.SugarLogger.Debugf("=====msgType:%s", utils.Format4Output(msgType, false)) + } + //if web.BConfig.RunMode != "jxgy" { // 订单查询不到所属门店默认为果园订单 + // vendorStoreId := msg.FormData.Get("app_poi_code") + // if vendorStoreId == "" { + // vendorStoreId = msg.FormData.Get("wm_poi_id") + // } + // if msgType == mtwmapi.MsgTypeOrderFinishedPickup { + // finishedPickup := FinishedPickup{} + // json.Unmarshal([]byte(msg.FormData.Get("pick_up_data")), &finishedPickup) + // vendorStoreId = finishedPickup.AppPoiCode + // } + // if vendorStoreId != "" { + // storeDetail, err2 := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDMTWM, "") + // + // if storeDetail == nil { + // // 推送到果园 + // if vendorStoreId == "9472886" { + // globals.SugarLogger.Debugf("=====store:%s", utils.Format4Output(storeDetail, false)) + // globals.SugarLogger.Debugf("=====storeerr2:%s", utils.Format4Output(err2, false)) + // globals.SugarLogger.Debugf("=====msg.FormData:%s", utils.Format4Output(msg.FormData, false)) + // globals.SugarLogger.Debugf("=====msgType:%s", utils.Format4Output(msgType, false)) + // } + // pushMTWMOrder2GY(msg.FormData, msgType) + // c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "") + // c.ServeJSON() + // return + // } + // } + //} callbackResponse = mtwm.OnCallbackMsg(msg, msgType) if callbackResponse == nil {