From 7d9a4f1750af304bec8d82e4b129aec384613217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 22 Apr 2020 10:51:02 +0800
Subject: [PATCH] =?UTF-8?q?addskuname=E8=87=B4=E5=91=BDbug=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 7581a9b6c..5c043394c 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -788,12 +788,12 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2} {
 		if imgName != "" {
 			dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
-			if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
-				picType = false
-			}
 			if err = err2; err != nil {
 				return nil, err
 			}
+			if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
+				picType = false
+			}
 		}
 	}
 
@@ -803,12 +803,12 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 
 	if skuNameExt.DescImg != "" {
 		dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name+"desc", skuNameExt.DescImg, model.ImgTypeDesc, false)
-		if dataRes.ResourceType == model.MimeTypeGif {
-			return nil, fmt.Errorf("商品详情图片不能上传gif格式的图片！")
-		}
 		if err = err2; err != nil {
 			return nil, err
 		}
+		if dataRes.ResourceType == model.MimeTypeGif {
+			return nil, fmt.Errorf("商品详情图片不能上传gif格式的图片！")
+		}
 	}
 
 	dao.Begin(db)