From 1766adf2034abd3b5e40bf8a9fea90bf78ddae21 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 25 Sep 2019 15:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAddSkuName=E4=B8=AD=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=90=88=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 57d64bcb7..d06080696 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -547,13 +547,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	}
 
 	db := dao.GetDB()
-	dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
-			dao.Rollback(db)
-			panic(r)
-		}
-	}()
 	if skuNameExt.Upc != "" {
 		err = dao.GetEntity(db, &skuNameExt.SkuName, "Upc")
 		if err == nil {
@@ -567,7 +560,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	if skuNameExt.IsSpu == 1 {
 		skuNameExt.SkuName.JdSyncStatus = model.SyncFlagNewMask
 	}
-	dao.WrapAddIDCULDEntity(&skuNameExt.SkuName, userName)
 	if skuNameExt.Unit == model.SpecialUnit {
 		skuNameExt.SpecQuality = float32(model.SpecialSpecQuality)
 		skuNameExt.SpecUnit = model.SpecialSpecUnit
@@ -579,18 +571,15 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	if globals.EnableStoreWrite {
 		imgContent, imgMD5, err := jxutils.DownloadFileByURL(skuNameExt.Img)
 		if err != nil {
-			dao.Rollback(db)
 			return nil, err
 		}
 		if skuNameExt.ImgHashCode == "" {
 			skuNameExt.ImgHashCode = imgMD5
 		} else if skuNameExt.ImgHashCode != imgMD5 {
-			dao.Rollback(db)
 			return nil, errors.New("图片HASH值不同")
 		}
 		imgHintMap, err := UploadImg2Platforms(ctx, nil, skuNameExt.Img, imgContent, "")
 		if err != nil {
-			dao.Rollback(db)
 			return nil, err
 		}
 		// skuNameExt.ImgWeimob = imgHintMap[model.VendorIDWSC]
@@ -600,10 +589,18 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 			skuNameExt.DescImgEbai, err = api.EbaiAPI.SkuUploadRTF(getAndSetEbaiUploadRTFShopID(), ebaiapi.BuildRFTFromImgs(skuNameExt.DescImg))
 		}
 		if err != nil {
-			dao.Rollback(db)
 			return nil, err
 		}
 	}
+
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db)
+			panic(r)
+		}
+	}()
+	dao.WrapAddIDCULDEntity(&skuNameExt.SkuName, userName)
 	if err = dao.CreateEntity(db, &skuNameExt.SkuName); err != nil {
 		dao.Rollback(db)
 		return nil, err
@@ -629,6 +626,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		}
 	}
 	dao.Commit(db)
+
 	tmpInfo, err := GetSkuNames(ctx, "", false, utils.Params2Map("nameID", skuNameExt.SkuName.ID), 0, 1)
 	if err != nil {
 		return nil, err