1

business/partner/delivery/mtps/waybill.go

@@ -250,12 +250,15 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
 		StatusTime:       utils.Timestamp2Time(msg.Timestamp),
 		Remark:           msg.CancelReason,
 	}
-	retVal.VendorOrderID, retVal.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID)
-	good, err := partner.CurOrderManager.LoadOrder(msg.OrderID, model.VendorIDMTWM)
+	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}
+	err := dao.GetRow(dao.GetDB(), &good, sql, sqlParams)
 	if err != nil || good == nil || good.VendorOrderID == "" {
 		retVal.OrderVendorID = 0
 	} else {
 		retVal.OrderVendorID = good.VendorID
+		retVal.VendorOrderID = good.VendorOrderID
 	}
 	return retVal, good
 }