From 3be7e0f136fe752a53c96392ef9e3c093eb35bc5 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 1 May 2019 17:17:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=BE=8E=E5=9B=A2=E5=A4=96=E5=8D=96?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E6=97=B6=EF=BC=8C=E5=85=88=E8=A6=81?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/order.go | 26 +++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index e57288b61..9ed533bb7 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -384,17 +384,23 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
 }
 
 func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
-	var skuList []*mtwmapi.RefundSku
-	for _, sku := range removedSkuList {
-		skuID := utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku))
-		skuList = append(skuList, &mtwmapi.RefundSku{
-			AppFoodCode: skuID,
-			SkuID:       skuID,
-			Count:       sku.Count,
-		})
+	// 美团外卖必须要确认订单后才能调整单
+	if order.Status < model.OrderStatusFinished {
+		err = c.PickupGoods(order, false, ctx.GetUserName())
 	}
-	if globals.EnableMtwmStoreWrite {
-		err = api.MtwmAPI.OrderApplyPartRefund(utils.Str2Int64(order.VendorOrderID), reason, skuList)
+	if err == nil {
+		var skuList []*mtwmapi.RefundSku
+		for _, sku := range removedSkuList {
+			skuID := utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku))
+			skuList = append(skuList, &mtwmapi.RefundSku{
+				AppFoodCode: skuID,
+				SkuID:       skuID,
+				Count:       sku.Count,
+			})
+		}
+		if globals.EnableMtwmStoreWrite {
+			err = api.MtwmAPI.OrderApplyPartRefund(utils.Str2Int64(order.VendorOrderID), reason, skuList)
+		}
 	}
 	return err
 }