From 31aac2e7b1ea90de87c7ff5a120bb3c2230d3559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 10 Apr 2020 18:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEexcel=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=A0=87=E5=93=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 32acde898..7e3d63221 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1865,9 +1865,9 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint stri } if result.Img != "" { if resBinary, _, err := jxutils.DownloadFileByURL(result.Img); err == nil { - if downloadURL, err := jxutils.UploadExportContent(resBinary, result.Img[strings.LastIndex(result.Img, "/"):len(result.Img)]); err == nil { + if downloadURL, err := jxutils.UploadExportContent(resBinary, result.Img[strings.LastIndex(result.Img, "/")+1:len(result.Img)]); err == nil { resBinary2, _, err := jxutils.DownloadFileByURL(downloadURL + model.SkuNameImgStandard) - downloadURL2, err := jxutils.UploadExportContent(resBinary2, downloadURL[strings.LastIndex(downloadURL, "/"):len(downloadURL)]+utils.Int64ToStr(time.Now().Unix())) + downloadURL2, err := jxutils.UploadExportContent(resBinary2, utils.Int64ToStr(time.Now().Unix())+downloadURL[strings.LastIndex(downloadURL, "/")+1:len(downloadURL)]) if err == nil { skuName.Img = downloadURL2 } else { @@ -1926,6 +1926,14 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint stri skuName.Skus[0].SpecUnit = model.SpecialSpecUnit } else { productInfo := productInfos[0] + if productInfo.Name == "" { + if v.Name != "" { + productInfo.Name = v.Name + } else { + createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "需要填上一个合适的商品名！")) + continue + } + } skuNames2, _ := dao.GetSkuNames(db, nil, nil, productInfo.Name) if len(skuNames2) > 1 { createUpcSkuByExcelErrList = append(createUpcSkuByExcelErrList, buildCreateUpcSkuByExcelErr(v, "此商品名在京西库中查询出了大于1个商品！"))