From ae0f9d5f7260b5e2fcc2f22c9ae3cb562457dd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 14 Apr 2020 17:25:46 +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=E7=BB=88=E6=9E=81=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 234b2eeac..446080ffd 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2008,20 +2008,34 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint stri
 				//需要把图片传到七牛云上
 				if !strings.Contains(skuName.Img, "image.jxc4.com") {
 					if resBinary, _, err := jxutils.DownloadFileByURL(skuName.Img); err == nil {
-						time.Sleep(time.Second / 4)
 						if downloadURL, err := jxutils.UploadExportContent(resBinary, 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