From a9cb391c5174cfa8566e7162202e7d5bac950450 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 10 May 2019 11:38:56 +0800
Subject: [PATCH] =?UTF-8?q?-=20AddStoreCourierMap=E5=AF=B9=E4=BA=8E?=
 =?UTF-8?q?=E8=BE=BE=E8=BE=BE=E9=97=A8=E5=BA=97=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index b04ce0b83..5cb282a91 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -797,9 +797,22 @@ func AddStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
 		dao.WrapAddIDCULDEntity(storeCourierMap, userName)
 		storeCourierMap.StoreID = storeID
 		storeCourierMap.VendorID = vendorID
+
 		if db == nil {
 			db = dao.GetDB()
 		}
+		if vendorID == model.VendorIDDada {
+			storeList, err2 := dao.GetMissingDadaStores(db, storeID, false)
+			if err = err2; err == nil && len(storeList) > 0 {
+				storeList[0].DadaStoreID = storeCourierMap.VendorStoreID
+				err = updateOrCreateDadaStore(storeList[0])
+			} else {
+				globals.SugarLogger.Debugf("AddStoreCourierMap GetMissingDadaStores error:%v, len(storeList):%d", err, len(storeList))
+			}
+		}
+		if err != nil {
+			return nil, err
+		}
 		dao.Begin(db)
 		defer func() {
 			if r := recover(); r != nil {
@@ -809,15 +822,6 @@ func AddStoreCourierMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID
 		}()
 		if err = dao.CreateEntity(db, storeCourierMap); err == nil {
 			dao.Commit(db)
-			if vendorID == model.VendorIDDada {
-				storeList, err2 := dao.GetMissingDadaStores(db, storeID, false)
-				if err = err2; err == nil && len(storeList) > 0 {
-					storeList[0].DadaStoreID = storeCourierMap.VendorStoreID
-					err = updateOrCreateDadaStore(storeList[0])
-				} else {
-					globals.SugarLogger.Debugf("AddStoreCourierMap GetMissingDadaStores error:%v, len(storeList):%d", err, len(storeList))
-				}
-			}
 			outStoreCourierMap = storeCourierMap
 			if err == nil {
 				_, err = CurVendorSync.SyncStore(ctx, db, storeCourierMap.VendorID, storeID, false, userName)
@@ -929,6 +933,7 @@ func updateOrCreateDadaStore(storeDetail *dao.StoreDetail2) (err error) {
 		}
 	}
 	if err != nil {
+		err = fmt.Errorf("门店ID:%d,门店名:%s,错误描述:%s", storeDetail.Store.ID, storeDetail.Name, err.Error())
 		globals.SugarLogger.Debugf("updateOrCreateDadaStore storeID:%d failed with error:%v", storeDetail.ID, err)
 	}
 	return err