From 38d91b461cb6940fe023fa29af70b4ebab3c3f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 18 Oct 2024 18:04:26 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/mtwm/order.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 7d4507bdf..3d7d5b5d8 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -615,13 +615,16 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 	if isSelfDelivery {
 		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
 	}
+	if err != nil && strings.Contains(err.Error(), "商家接单后1分钟内不能确认已完成备货") {
+		partner.CurOrderManager.OnOrderMsg(order, "订单自动拣货失败", err.Error())
+		return err
+	}
 	if err == nil || strings.Contains(err.Error(), "808") {
 		// 配送类型只能为美团配送或美团企客配送 level:0, code:808
 		c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
 		return nil
 	}
-	partner.CurOrderManager.OnOrderMsg(order, "订单自动拣货失败", err.Error())
-	return err
+	return nil
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {