From a952ce7eb5d429f05ac2a6b5e1c1558e39c73817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 11:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go               |  5 +++--
 business/partner/purchase/jdshop/store_sku.go | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index c67eacea7..3599c6ed9 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -92,8 +92,8 @@ type StoreSkuSyncInfo struct {
 	Img2    string
 	DescImg string
 
-	VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
-
+	VendorVendorCatID int64  `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
+	CategoryName      string `json:"categoryName"`                //分类名
 	// sku的商家分类信息
 	SkuCatSyncStatus int8
 	SkuVendorCatID   string `orm:"column(sku_vendor_cat_id)"`
@@ -406,6 +406,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
+	t4.name category_name,
 	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d208a47c0..ab3f1e6a7 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -229,6 +229,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 		for _, v := range result {
 			if v.Name == storeCat.Name {
 				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+				break
 			}
 		}
 	}
@@ -366,13 +367,24 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
 	var (
-		images []*jdshopapi.CreateSkuParamImages
-		// desc   string
+		images      []*jdshopapi.CreateSkuParamImages
+		vendorCatID int
 	)
+	if storeSku.VendorCatID == "" {
+		resultCat, _ := api.JdShopAPI.FindShopCategories()
+		for _, v := range resultCat {
+			if v.Name == storeSku.CategoryName {
+				vendorCatID = int(v.CID)
+				break
+			}
+		}
+	} else {
+		vendorCatID = utils.Str2Int(storeSku.VendorCatID)
+	}
 	name := filterSensitiveWord(storeSku.Name)
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
 		Title:         name,
-		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
+		ShopCategorys: []int{vendorCatID},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
 		// TransportID:   jdshopapi.TransportID,