From 244c653398593cbb9fd3d3732ae7303f795f0d2b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 2 Dec 2019 15:07:16 +0800
Subject: [PATCH] =?UTF-8?q?mtwm.AcceptOrRefuseOrder=E4=B8=AD=E5=AE=B9?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/order.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 29ca7481b..f55f8be1b 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -428,7 +428,13 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 			// err = api.MtwmAPI.OrderReceived(utils.Str2Int64(order.VendorOrderID))
 			err = api.MtwmAPI.OrderConfirm(utils.Str2Int64(order.VendorOrderID))
 			if err != nil {
-				globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)
+				if utils.IsErrMatch(err, utils.Int2Str(mtwmapi.ErrCodeOpFailed), []string{
+					"订单已经确认过了",
+				}) {
+					err = nil
+				} else {
+					globals.SugarLogger.Warnf("mtwm AcceptOrRefuseOrder orderID:%s failed with err:%v", order.VendorOrderID, err)
+				}
 			}
 		}
 		// if err == nil {