From 16d738cca1b88b5425157bf90195f898ba0f6bac Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 29 Apr 2019 17:35:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=A5=BF=E7=99=BE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4=E5=8D=95=E7=89=B9=E6=AE=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=BF=85=E9=A1=BB=E8=A6=81?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E5=90=8E=E8=83=BD=E6=89=8D?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go   |  3 ++-
 business/partner/purchase/ebai/order.go | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index e02e97ffa..7bad91b80 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -379,9 +379,10 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
 						if order.LockStatus != model.OrderStatusUnknown {
 							globals.SugarLogger.Warnf("addOrderStatus refOrderID:%s, orderID:%s, order.LockStatus:%d, status.LockStatus:%d", orderStatus.RefVendorOrderID, orderStatus.VendorOrderID, order.LockStatus, orderStatus.Status)
 						}
+						order.Flag &= ^int8(model.OrderFlagMaskUserApplyCancel)
 						order.LockStatus = orderStatus.Status
 						order.LockStatusTime = orderStatus.StatusTime
-						updateFields = append(updateFields, "LockStatus", "LockStatusTime")
+						updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag")
 					}
 				}
 				if model.IsOrderFinalStatus(orderStatus.Status) {
diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index b6f2c7832..cb6f15ccb 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -401,15 +401,21 @@ 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 []*ebaiapi.RefundSku
-	for _, sku := range removedSkuList {
-		skuList = append(skuList, &ebaiapi.RefundSku{
-			CustomeSkuID: utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku)),
-			Number:       utils.Int2Str(sku.Count),
-		})
+	// 饿百必须要确认订单后才能调整单
+	if order.Status < model.OrderStatusFinished {
+		err = c.PickupGoods(order, false, ctx.GetUserName())
 	}
-	if globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderPartRefund(order.VendorOrderID, skuList)
+	if err == nil {
+		var skuList []*ebaiapi.RefundSku
+		for _, sku := range removedSkuList {
+			skuList = append(skuList, &ebaiapi.RefundSku{
+				CustomeSkuID: utils.Int2Str(jxutils.GetSkuIDFromOrderSku(sku)),
+				Number:       utils.Int2Str(sku.Count),
+			})
+		}
+		if globals.EnableEbaiStoreWrite {
+			err = api.EbaiAPI.OrderPartRefund(order.VendorOrderID, skuList)
+		}
 	}
 	return err
 }