From 909455763f39b256bc3250fe08324e1834524e4a Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 10 Jun 2019 14:27:15 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E4=B8=8E=E7=BE=8E?=
 =?UTF-8?q?=E5=9B=A2=E5=A4=96=E5=8D=96AdjustOrder=E4=B8=AD=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8PickupGoods=E4=BF=AE=E6=AD=A3=E4=B8=BAorder.Status=20<?=
 =?UTF-8?q?=20model.OrderStatusFinishedPickup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/ebai/order.go | 2 +-
 business/partner/purchase/mtwm/order.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 1b33a64cc..622fe7c31 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -476,7 +476,7 @@ 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) {
 	// 饿百必须要确认订单后才能调整单
-	if order.Status < model.OrderStatusFinished {
+	if order.Status < model.OrderStatusFinishedPickup {
 		err = c.PickupGoods(order, false, ctx.GetUserName())
 	}
 	if err == nil {
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 08517400f..04c178664 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -448,7 +448,7 @@ 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) {
 	// 美团外卖必须要确认订单后才能调整单
-	if order.Status < model.OrderStatusFinished {
+	if order.Status < model.OrderStatusFinishedPickup {
 		err = c.PickupGoods(order, false, ctx.GetUserName())
 	}
 	if err == nil {