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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-15 17:44:01 +08:00
parent aedb4e7649
commit 4f26f319ce
1 changed files with 18 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2108,24 +2108,6 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
return retVal, err
}
skuName.Img = downloadURL
// if resBinary, _, err := jxutils.DownloadFileByURL(result.Img); err == nil {
// if downloadURL, err := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+"origin"+result.Img[strings.LastIndex(result.Img, "/")+1:len(result.Img)]); err == nil {
// resBinary2, _, err := jxutils.DownloadFileByURL(downloadURL + model.SkuNameImgStandard)
// downloadURL2, err := jxutils.UploadExportContent(resBinary2, utils.Int64ToStr(time.Now().Unix())+downloadURL[strings.LastIndex(downloadURL, "/")+1:len(downloadURL)])
// if err == nil {
// skuName.Img = downloadURL2
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
} else {
skuName.Img = model.NOSkuNameImg
}
@@ -2314,36 +2296,6 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
return retVal, err
}
skuName.Img = downloadURL
// if resBinary, _, err := jxutils.DownloadFileByURL(skuName.Img); err == nil {
// if downloadURL, err := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+"origin"+skuName.Img[strings.LastIndex(skuName.Img, "/")+1:len(skuName.Img)]); err == nil {
// if img, _, err := datares.Binary2Image(resBinary, http.DetectContentType(resBinary)); err == nil {
// if img.Bounds().Dx() != datares.MainImgWidth || img.Bounds().Dy() != datares.MainImgHeight {
// if resBinary2, _, err := jxutils.DownloadFileByURL(downloadURL + model.SkuNameImgStandard); err == nil {
// if downloadURL2, err := jxutils.UploadExportContent(resBinary2, utils.Int64ToStr(time.Now().Unix())+skuName.Img[strings.LastIndex(skuName.Img, "/")+1:len(skuName.Img)]); err == nil {
// skuName.Img = downloadURL2
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// skuName.Img = downloadURL
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
// } else {
// retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
// return retVal, err
// }
}
skuName.Status = model.SkuStatusNormal
skuName.IsGlobal = model.YES
@@ -2353,6 +2305,24 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
skuName.CategoryID = categoryID
}
skuName.Skus[0].Status = model.SkuStatusNormal
if skuName.Img == model.NOSkuNameImg {
result, _ := api.MtwmAPI.GetStandardProductListWithCond(*skuName.Upc)
if result != nil {
imgs := strings.Split(result.Pic, ",")
if len(imgs) == 1 {
skuName.Img = imgs[0]
}
if len(imgs) == 2 {
skuName.Img = imgs[0]
skuName.Img2 = imgs[1]
}
if len(imgs) >= 3 {
skuName.Img = imgs[0]
skuName.Img2 = imgs[1]
skuName.Img3 = imgs[2]
}
}
}
_, err = AddSkuName(ctx, skuName, ctx.GetUserName())
if err != nil {
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}