From 6c4fd0a9724969d915dbaad44530781766a458cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Sun, 16 Jul 2023 19:59:02 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/mtps/waybill.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 045a1ce83..1fefc3b46 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -89,6 +89,11 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg
 
 func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
 	order, goodsOrder := c.callbackMsg2Waybill(msg)
+	//查不到订单可能就是果园的订单
+	if goodsOrder == nil && beego.BConfig.RunMode != "jxgy" {
+		c.pushToGy(msg)
+		return mtpsapi.SuccessResponse
+	}
 	// 多次取消,只处理第一次
 	if msg.Status == mtpsapi.OrderStatusCanceled {
 		orderStatus, _ := orderman.FixedOrderManager.GetWayBillStatusList(msg.OrderID, msg.MtPeisongID, model.VendorIDMTPS)
@@ -133,13 +138,6 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 		return mtpsapi.SuccessResponse
 	}
 
-	order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID)
-	//查不到订单可能就是果园的订单
-	if order2 == nil && beego.BConfig.RunMode != "jxgy" {
-		c.pushToGy(msg)
-		return mtpsapi.SuccessResponse
-	}
-
 	// 加入调度器
 	err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 	switch order.OrderVendorID {