From c2ba5b28c940433cea279a01ea5db17ee0e7d16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=9B=E5=BB=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81over=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 77e3791e9..ef4f5b482 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -317,46 +317,41 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	// desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style="width: auto; height: auto; max-width: 100%;">`
-	createSkuParamWare.MobileDesc = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
-	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
-	// }
+	pic1, err := uploadImg(storeSku.Img, storeSku.Name, "1")
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
-		ImgURL:   storeSku.Img,
+		ImgURL:   pic1,
 	}
 	img2 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		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 = pic1
+	} else {
+		pic2, err2 := uploadImg(storeSku.Img, storeSku.Name, "2")
+		err = err2
+		img2.ImgURL = pic2
 	}
 	images = append(images, img1)
 	images = append(images, img2)
 	createSkuParamWare.Images = images
-	//end
+
+	//商品详情拼接
+	var desc string
+	if storeSku.DescImg != "" {
+		pic3, err2 := uploadImg(storeSku.DescImg, storeSku.Name, "desc")
+		err = err2
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `<img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+	} else {
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+	}
+	createSkuParamWare.MobileDesc = desc
+	createSkuParamWare.Introduction = desc
 
 	//设置商品属性值
 	var (
@@ -440,3 +435,15 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	}
 	return createSkuParamWare, createSkuParamSkus, err
 }
+
+func uploadImg(img, name, index string) (imgURL string, err error) {
+	data, _, err := jxutils.DownloadFileByURL(img)
+	if err != nil {
+		return imgURL, err
+	}
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, name+index)
+	if err != nil {
+		return imgURL, err
+	}
+	return uploadResult.PictureURL, err
+}