This commit is contained in:
suyl
2021-11-02 09:28:47 +08:00
parent 31cd85a5d4
commit 2edc33468a

View File

@@ -841,22 +841,22 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
} }
} }
picType := true //picType := true
for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} { //for _, imgName := range []string{skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5} {
if imgName != "" { // if imgName != "" {
dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false) // dataRes, err2 := datares.TryRegisterDataResource(ctx, skuNameExt.Name, imgName, model.ImgTypeMain, false)
if err = err2; err != nil { // if err = err2; err != nil {
return nil, err // return nil, err
} // }
if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng { // if dataRes.ResourceType == model.MimeTypeJpeg || dataRes.ResourceType == model.MimeTypePng {
picType = false // picType = false
} // }
} // }
} //}
if picType { //if picType {
return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片") // return nil, fmt.Errorf("商品图片应至少包含一张非gif格式的图片")
} //}
if skuNameExt.DescImg != "" { if skuNameExt.DescImg != "" {
dataRes, 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)
@@ -964,17 +964,17 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
return 0, fmt.Errorf("upc:%s不合法请仔细检查", 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))
for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} { // for _, imgName := range []string{"img", "img2", "img3", "img4", "img5"} {
if valid[imgName] != nil { // if valid[imgName] != nil {
if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" { // if imgStr := utils.Interface2String(valid[imgName]); imgStr != "" {
_, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true) // _, err2 := datares.TryRegisterDataResource(ctx, skuName.Name, valid[imgName].(string), model.ImgTypeMain, true)
if err = err2; err != nil { // if err = err2; err != nil {
return 0, err // return 0, err
} // }
} // }
} // }
} // }
if valid["descImg"] != nil { if valid["descImg"] != nil {
descImg := valid["descImg"].(string) descImg := valid["descImg"].(string)