- call SyncStoreSkus synchronously in mtwm.FullSyncStoreSkus

- handle mtps except event in status event handler too (美团配送的运单异常事件会发到status的回调来)

controllers/mtps_order.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"net/http"
 
+	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/mtps"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
@@ -15,9 +16,19 @@ type MtpsController struct {
 
 func (c *MtpsController) Status() {
 	if c.Ctx.Input.Method() == http.MethodPost {
-		obj, callbackResponse := api.MtpsAPI.GetOrderCallbackMsg(c.Ctx.Request)
-		if callbackResponse == nil {
-			callbackResponse = mtps.OnWaybillMsg(obj)
+		var callbackResponse *mtpsapi.CallbackResponse
+		if c.GetString("exception_id") != "" { // 美团配送的回调设置好象有问题，配送异常也会发到这里来，作一下兼容处理
+			var obj *mtpsapi.CallbackOrderExceptionMsg
+			obj, callbackResponse = api.MtpsAPI.GetOrderExceptionCallbackMsg(c.Ctx.Request)
+			if callbackResponse == nil {
+				callbackResponse = mtps.OnWaybillExcept(obj)
+			}
+		} else {
+			var obj *mtpsapi.CallbackOrderMsg
+			obj, callbackResponse = api.MtpsAPI.GetOrderCallbackMsg(c.Ctx.Request)
+			if callbackResponse == nil {
+				callbackResponse = mtps.OnWaybillMsg(obj)
+			}
 		}
 		c.Data["json"] = callbackResponse
 		c.ServeJSON()