From a586e62aa371e9b97c5837ea8206dc63dd2183c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Sat, 19 Apr 2025 15:03:44 +0800
Subject: [PATCH] 1

---
 .../partner/purchase/tao_vegetable/order.go   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index 09aa4cbf1..949dda2cb 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -548,17 +548,17 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 
 // PickupGoods 拣货
 func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	if isSelfDelivery {
-		param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
-		if err != nil {
-			return err
-		}
-		err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param)
-		if err != nil {
-			return err
-		}
-		c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
+	//if isSelfDelivery { // 淘宝订货单不关系自提还是平台配送都需要拣货
+	param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
+	if err != nil {
+		return err
 	}
+	err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param)
+	if err != nil {
+		return err
+	}
+	c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
+	//}
 
 	return err
 }