From 7a7fe1b3daeccb57344b6097e0d5213d3c3e5174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 15 Mar 2022 17:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/callback.go | 47 +++++++++++-----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go
index 7c9124a11..1895cc947 100644
--- a/business/partner/purchase/mtwm/callback.go
+++ b/business/partner/purchase/mtwm/callback.go
@@ -7,36 +7,35 @@ import (
 )
 
 func OnCallbackMsg(msg *mtwmapi.CallbackMsg) (response *mtwmapi.CallbackResponse) {
-	if CurPurchaseHandler == nil {
-		return &mtwmapi.CallbackResponse{Data: "CurPurchaseHandler init fail"}
+	if CurPurchaseHandler != nil {
+		if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged {
+			response = CurPurchaseHandler.onStoreStatusChanged(msg)
+		} else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade {
+			response = CurPurchaseHandler.onNumberDowngrade(msg)
+		} else if msg.Cmd == mtwmapi.MsgTypeStoreBind {
+		}
+	} else {
+		if orderID := GetOrderIDFromMsg(msg); orderID != "" {
+			jxutils.CallMsgHandler(func() {
+				switch msg.Cmd {
+				case mtwmapi.MsgTypeWaybillStatus:
+					response = CurPurchaseHandler.onWaybillMsg(msg)
+				default:
+					response = CurPurchaseHandler.onOrderMsg(msg)
+				}
+			}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM))
+		}
+		/*if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
+			utils.CallFuncAsync(func() {
+				OnFinancialMsg(msg)
+			})
+		} */
 	}
-
-	// 获取orderId
-	orderID := GetOrderIDFromMsg(msg)
-	switch {
-	case msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged || msg.Cmd == mtwmapi.MsgTypeStoreAuditStatusChanged:
-		response = CurPurchaseHandler.onStoreStatusChanged(msg)
-	case msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade:
-		response = CurPurchaseHandler.onNumberDowngrade(msg)
-	case msg.Cmd == mtwmapi.MsgTypeStoreBind:
-		break
-	case orderID != "" && msg.Cmd == mtwmapi.MsgTypeWaybillStatus:
-		jxutils.CallMsgHandler(func() {
-			if msg.Cmd == mtwmapi.MsgTypeWaybillStatus {
-				response = CurPurchaseHandler.onWaybillMsg(msg)
-			} else {
-				response = CurPurchaseHandler.onOrderMsg(msg)
-			}
-		}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM))
-	}
-
 	return response
 }
-
 func GetOrderIDFromMsg(msg *mtwmapi.CallbackMsg) string {
 	return msg.FormData.Get(mtwmapi.KeyOrderID)
 }
-
 func GetVendorStoreIDFromMsg(msg *mtwmapi.CallbackMsg) string {
 	return msg.FormData.Get(mtwmapi.KeyAppPoiCode)
 }