From 245dee347a0b881aaa415f1a466695452c630357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 24 Aug 2023 15:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8B=A3=E8=B4=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/order.go | 35 ++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 7b736f1fd..c4f84abad 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -514,13 +514,36 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 }
 
 func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	isSelfDelivery = model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)
-	if isSelfDelivery {
-		if globals.EnableMtwmStoreWrite {
-			err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
-		}
+	api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
+	orderDetail, err := api.OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), false)
+	if err != nil {
+		return err
 	}
-	if err == nil || strings.Contains(err.Error(), "808") { // 配送类型只能为美团配送或美团企客配送 level:0, code:808
+
+	// 美团专送、快送、混合送、美团企客
+	logisticsCode := utils.Interface2String(orderDetail["logistics_code"])
+	isSelfDelivery = logisticsCode == mtwmapi.PeiSongTypeMTZSJM || logisticsCode == mtwmapi.PeiSongTypeMTZSZJ || logisticsCode == mtwmapi.PeiSongTypeKuaiDi || logisticsCode == mtwmapi.PeiSongTypeMixed || logisticsCode == mtwmapi.PeiSongTypeQiKe
+	//1001-专送（加盟）；1002-专送（自建）
+	//2002-快送；3001-混合送（专送+快送)
+	//4015-企客远距离配送
+	//此接口适用于美团专送、快送、混合送、美团企客的订单确认备货完成
+	//PeiSongTypeSelf      = "0000" // 商家自配
+	//PeiSongTypeQuHuo     = "0002" // 趣活
+	//PeiSongTypeDada      = "0016" // 达达
+	//PeiSongTypeE         = "0033" // E代送
+	//PeiSongTypeMTZSJM    = "1001" // 美团专送-加盟
+	//PeiSongTypeMTZSZJ    = "1002" // 美团专送-自建
+	//PeiSongTypeMTZSPT    = "1003" // 美团跑腿（原众包）
+	//PeiSongTypeMTZSDL    = "1004" // 美团专送-城市代理
+	//PeiSongTypeJiaoMa    = "2001" // 角马
+	//PeiSongTypeKuaiDi    = "2002" // 快送
+	//PeiSongTypeWholeCity = "2010" // 全城送
+	//PeiSongTypeMixed     = "3001" // 混合送（即美团专送+快送）
+	if isSelfDelivery {
+		err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
+	}
+	if err == nil || strings.Contains(err.Error(), "808") {
+		// 配送类型只能为美团配送或美团企客配送 level:0, code:808
 		c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
 		return nil
 	}