liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

校验upc

Browse Source
This commit is contained in:
gazebo
2019-12-26 09:55:49 +08:00
parent 44a0caade0
commit 256b7b6593
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
business/jxstore/cms/sku.go
View File

@@ -659,19 +659,14 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
if hasSensitiveWord, err := CheckHasSensitiveWord(skuNameExt.Name); hasSensitiveWord { if hasSensitiveWord, err := CheckHasSensitiveWord(skuNameExt.Name); hasSensitiveWord {
return nil, err return nil, err
} }
if utils.Pointer2String(skuNameExt.Upc) == "" { upc := utils.Pointer2String(skuNameExt.Upc)
if upc == "" {
skuNameExt.Upc = nil skuNameExt.Upc = nil
} else if !jxutils.IsUpcValid(upc) {
return nil, fmt.Errorf("upc:%s不合法，请仔细检查", upc)
} }
db := dao.GetDB() 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 skuNameExt.SkuName.Status = model.SkuStatusNormal
if skuNameExt.IsSpu == 1 { if skuNameExt.IsSpu == 1 {
return nil, fmt.Errorf("不允许创建多规格商品") return nil, fmt.Errorf("不允许创建多规格商品")
@@ -794,21 +789,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
if valid["Upc"] != nil { if valid["Upc"] != nil {
if upc, _ := valid["Upc"].(string); upc == "" { if upc, _ := valid["Upc"].(string); upc == "" {
valid["Upc"] = nil 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)) 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"} { for _, imgName := range []string{"img", "img2"} {
if valid[imgName] != nil { if valid[imgName] != nil {
if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" { if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {