diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 254da65da..d9f1dd99c 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -96,6 +96,13 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 		}
 	}
 
+	order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID)
+	//查不到订单可能就是果园的订单
+	if order2 == nil {
+		c.pushToGy(msg)
+		return mtpsapi.SuccessResponse
+	}
+
 	store, _ := dao.GetStoreDetail(dao.GetDB(), goodsOrder.JxStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode)
 	switch msg.Status {
 	case mtpsapi.OrderStatusWaitingForSchedule:
@@ -126,13 +133,6 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 	default:
 		return mtpsapi.SuccessResponse
 	}
-	order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID)
-	// order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID)
-	//查不到订单可能就是果园的订单
-	if order2 == nil {
-		c.pushToGy(msg)
-		return mtpsapi.SuccessResponse
-	}
 
 	//if msg.Status == mtpsapi.OrderStatusPickedUp {
 	//	order.Status = model.WaybillStatusCourierArrived
@@ -245,10 +245,8 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
 		Remark:           msg.CancelReason,
 	}
 	retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
-	var good *model.GoodsOrder
-	sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC  LIMIT 1 OFFSET 0`
-	sqlParams := []interface{}{msg.OrderID}
-	if err := dao.GetRow(dao.GetDB(), &good, sql, sqlParams); err != nil || good == nil || good.VendorOrderID == "" {
+	good, err := partner.CurOrderManager.LoadOrder(msg.OrderID, model.VendorIDMTWM)
+	if err != nil || good == nil || good.VendorOrderID == "" {
 		retVal.OrderVendorID = 0
 	} else {
 		retVal.OrderVendorID = good.VendorID