From 3153ee6ea9a93959a7b68a6b82666342a382b3d0 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 24 Sep 2019 12:01:04 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E5=BA=97=E6=97=B6=EF=BC=8C=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=9B=B4=E6=96=B0=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 95088a846..8c9bd2eb9 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1074,7 +1074,12 @@ func addStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
 			storeDetail.VendorID = vendorID
 			storeDetail.VendorStoreID = storeCourierMap.VendorStoreID
 			if err = updateCourierStore(ctx, storeDetail); err != nil {
-				return nil, err
+				if vendorID != model.VendorIDMTPS {
+					return nil, err
+				}
+				// 如果是美团配送，强制忽略更新错
+				globals.SugarLogger.Infof("addStoreCourierMap storeID:%d, vendorID:%d failed with err:%v", storeID, vendorID, err)
+				err = nil
 			}
 		}
 		dao.WrapAddIDCULDEntity(storeCourierMap, ctx.GetUserName())