From 92014171dfaf45bf7912ed452f2a149853101e62 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, 26 May 2020 14:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go                         |  1 +
 business/partner/purchase/jdshop/store_sku.go | 40 ++++++++++++++-----
 controllers/jds_callback.go                   |  2 +
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/business/model/sku.go b/business/model/sku.go
index 0a91336cb..3754220d3 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -18,6 +18,7 @@ const (
 	NoCatCatgoryID     = 291
 	NOSkuNameImg       = "https://image.jxc4.com/noGoodsImg.jpg"
 	SkuNameImgStandard = "?imageMogr2/thumbnail/!800x800r/gravity/Center/crop/800x800"
+	SkuNameImgToPng    = "?imageView2/0/format/png/q/75"
 )
 
 const (
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d8a845c05..20209018a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"regexp"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -67,6 +68,25 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				if err != nil {
 					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 					return failedList, err
+				} else {
+					//追加商品透图
+					imageURL := ""
+					img := v.Img
+					if img != "" {
+						suffix := img[strings.LastIndex(img, "."):]
+						if suffix != ".png" {
+							if resBinary, _, err := jxutils.DownloadFileByURL(img + model.SkuNameImgToPng); err == nil {
+								downloadURL, err2 := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix()))
+								err = err2
+								imageURL, err = uploadImg(downloadURL, name, "tou")
+							}
+						}
+					}
+					err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
+					if err2 != nil {
+						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+						return failedList, err
+					}
 				}
 				var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
 				var resultAttrs = make(map[string]int64)
@@ -133,13 +153,13 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					Value: "0",
 				},
 				&jdshopapi.CreateSkuParamFeatures{
-					Key:   "tssp", //支持分单？
+					Key:   "tssp", //支持自提
 					Value: "4",
 				},
-				&jdshopapi.CreateSkuParamFeatures{
-					Key:   "isSds", //支持自提？
-					Value: "1",
-				},
+				// &jdshopapi.CreateSkuParamFeatures{
+				// 	Key:   "isSds", //支持自提？
+				// 	Value: "1",
+				// },
 			}
 			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
@@ -514,13 +534,13 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Value: "0",
 		},
 		&jdshopapi.CreateSkuParamFeatures{
-			Key:   "tssp", //支持分单？
+			Key:   "tssp", //支持自提
 			Value: "4",
 		},
-		&jdshopapi.CreateSkuParamFeatures{
-			Key:   "isSds", //支持自提？
-			Value: "1",
-		},
+		// &jdshopapi.CreateSkuParamFeatures{
+		// 	Key:   "isSds", //支持分单
+		// 	Value: "1",
+		// },
 	}
 	createSkuParamWare.Features = features
 	//组合sku
diff --git a/controllers/jds_callback.go b/controllers/jds_callback.go
index 35bfb65b3..af05c996d 100644
--- a/controllers/jds_callback.go
+++ b/controllers/jds_callback.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -18,6 +19,7 @@ type JdsController struct {
 }
 
 func (c *JdsController) Msg() {
+	fmt.Println("testjdscll")
 	if c.Ctx.Input.Method() == http.MethodPost {
 		ctx := c.Ctx
 		ctx.Request.Body = ioutil.NopCloser(bytes.NewReader(ctx.Input.RequestBody))