From 8a51c158a4db8ffc05de05cbdf38c4423ae6949f 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, 25 Nov 2020 10:04:04 +0800
Subject: [PATCH] jdshop2

---
 business/partner/purchase/jdshop/jds.go       |  2 +-
 business/partner/purchase/jdshop/store_sku.go | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 2bdfa6fb2..d3951126a 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -59,7 +59,7 @@ func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgUR
 }
 
 func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
-	result, err := api.JdShopAPI.FindVendorCategories()
+	result, err := api.JdShop2API.FindVendorCategories()
 	for _, v := range result {
 		cat := &model.SkuVendorCategory{
 			VendorID:         model.VendorIDJDShop,
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 6738705c4..a1c119b90 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -67,7 +67,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					vv.VendorSkuID = vendorSkuID
 				}
 			} else {
-				createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
+				createSkuParamWare, createSkuParamSkus, _, err := buildCreateWareParam(v)
 				if err != nil {
 					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 					return failedList, err
@@ -474,7 +474,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (sta
 	return status, err
 }
 
-func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
+func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, wareSaveParam *jdshopapi.WareSaveParam, err error) {
 	var (
 		images      []*jdshopapi.CreateSkuParamImages
 		vendorCatID int
@@ -491,6 +491,14 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		vendorCatID = utils.Str2Int(storeSku.VendorCatID)
 	}
 	name := filterSensitiveWord(storeSku.Name)
+	wareSaveParam = &jdshopapi.WareSaveParam{
+		CategoryID: int(storeSku.VendorVendorCatID),
+		VenderID:   jdshopapi.VendorID2,
+		Length:     100,
+		Wide:       100,
+		Height:     100,
+		Weight:     utils.Int2Str(storeSku.Weight),
+	}
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
 		Title:         name,
 		ShopCategorys: []int{vendorCatID},
@@ -751,7 +759,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	}
 	//市场价固定500
 	createSkuParamWare.MarketPrice = 500
-	return createSkuParamWare, createSkuParamSkus, err
+	return createSkuParamWare, createSkuParamSkus, wareSaveParam, err
 }
 
 //京东商城上传图片，若平台上已经有了这个图就直接拿来用了