From 256b7b659395c770dfee82935beb37110fd22ce8 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 26 Dec 2019 09:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8Cupc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index b4d180b3f..69bb3ca00 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -659,19 +659,14 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	if hasSensitiveWord, err := CheckHasSensitiveWord(skuNameExt.Name); hasSensitiveWord {
 		return nil, err
 	}
-	if utils.Pointer2String(skuNameExt.Upc) == "" {
+	upc := utils.Pointer2String(skuNameExt.Upc)
+	if upc == "" {
 		skuNameExt.Upc = nil
+	} else if !jxutils.IsUpcValid(upc) {
+		return nil, fmt.Errorf("upc:%s不合法，请仔细检查", upc)
 	}
+
 	db := dao.GetDB()
-	// if skuNameExt.Upc != "" {
-	// 	err = dao.GetEntity(db, &skuNameExt.SkuName, "Upc")
-	// 	if err == nil {
-	// 		return nil, fmt.Errorf("UPC:%s重复", skuNameExt.Upc)
-	// 	} else if !dao.IsNoRowsError(err) {
-	// 		return nil, err
-	// 	}
-	// 	err = nil
-	// }
 	skuNameExt.SkuName.Status = model.SkuStatusNormal
 	if skuNameExt.IsSpu == 1 {
 		return nil, fmt.Errorf("不允许创建多规格商品")
@@ -794,21 +789,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 		if valid["Upc"] != nil {
 			if upc, _ := valid["Upc"].(string); upc == "" {
 				valid["Upc"] = nil
+			} else if !jxutils.IsUpcValid(upc) {
+				return 0, fmt.Errorf("upc:%s不合法，请仔细检查", upc)
 			}
 		}
 		globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
-		// if upc, _ := valid["Upc"].(string); upc != "" {
-		// 	skuName := &model.SkuName{
-		// 		Upc: upc,
-		// 	}
-		// 	err = dao.GetEntity(db, skuName, "Upc")
-		// 	if err == nil {
-		// 		return 0, fmt.Errorf("UPC:%s重复", upc)
-		// 	} else if !dao.IsNoRowsError(err) {
-		// 		return 0, err
-		// 	}
-		// 	err = nil
-		// }
 		for _, imgName := range []string{"img", "img2"} {
 			if valid[imgName] != nil {
 				if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {