From cca21bda95d0d0fbbabd8054da054e0ecbcc6226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 10 Dec 2019 15:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=97=B6?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=A4=E6=96=AD=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 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index c9eb8e766..cdedfa20e 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -639,17 +639,28 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		skuNameExt.SpecUnit = skuNameExt.Skus[0].SpecUnit
 	}
 
+	picType := true
 	for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2} {
 		if imgName != "" {
-			_, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
+			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 picType {
+		return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片！")
+	}
+
 	if skuNameExt.DescImg != "" {
-		_, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name+"desc", skuNameExt.DescImg, model.ImgTypeDesc, false)
+		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
 		}