From 0383c172418c3c9481d829b71a814c9c40582c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 13 May 2020 16:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 6b6449c88..40c290569 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,6 +2,7 @@ package jdshop
 
 import (
 	"regexp"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -316,14 +317,14 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
-	// data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
-	// uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
+	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
@@ -334,18 +335,18 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		ImgIndex: 2,
 	}
 	if storeSku.Img2 == "" {
-		img2.ImgURL = storeSku.Img
-		// 	img2.ImgURL = uploadResult.PictureURL
-		// } else {
-		// 	data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	img2.ImgURL = uploadResult2.PictureURL
+		// img2.ImgURL = storeSku.Img
+		img2.ImgURL = uploadResult.PictureURL
+	} else {
+		data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
+		}
+		uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
+		}
+		img2.ImgURL = uploadResult2.PictureURL
 	}
 	images = append(images, img1)
 	images = append(images, img2)