From 14379f270dafda52c20f1c628bff9148c7dcd222 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, 17 Sep 2020 18:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=AC=E4=B8=9C=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync2.go | 3 +++
 business/model/dao/sku.go     | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index 54546dcf3..9bbd8aef8 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -147,6 +147,9 @@ func SyncSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int,
 				if skuVendorInfo.ExdSkuID != "" {
 					return nil, err
 				}
+				if skuVendorInfo.SkuVendorMapCatID != "" {
+					skuVendorInfo.VendorVendorCatID = utils.Str2Int64(skuVendorInfo.SkuVendorMapCatID)
+				}
 				skuVendorInfo.SkuName = jxutils.ComposeSkuNameSync(skuVendorInfo.Prefix, skuVendorInfo.Name, skuVendorInfo.Comment, skuVendorInfo.Unit, skuVendorInfo.SpecQuality, skuVendorInfo.SpecUnit, 0, skuVendorInfo.ExPrefix, skuVendorInfo.ExPrefixBegin, skuVendorInfo.ExPrefixEnd)
 				skuVendorInfo.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuVendorInfo.Prefix, skuVendorInfo.Name, skuVendorInfo.Comment, skuVendorInfo.Unit, skuVendorInfo.SpecQuality, skuVendorInfo.SpecUnit, 0)
 				if skuVendorInfo.ImgWatermark != "" {
diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index 0b511a55c..ada9feefe 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -260,7 +260,8 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 	t3.jd_category_id vendor_vendor_cat_id,
 	tsu.ex_prefix, tsu.begin_at ex_prefix_begin, tsu.end_at ex_prefix_end, tsu.img_watermark,
 	t3m.sync_status cat_sync_status,
-	t3m.vendor_thing_id vendor_cat_id
+	t3m.vendor_thing_id vendor_cat_id,
+	tsy.vendor_category_id sku_vendor_map_cat_id
 
 	FROM sku t1
 	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?`
@@ -286,9 +287,10 @@ func GetSkusWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, nameIDs
 	LEFT JOIN data_resource t11 ON t11.main_url = t2.img
 	LEFT JOIN data_resource t12 ON t12.main_url = t2.img2
 	LEFT JOIN sku_exinfo_map tsu ON tsu.name_id = t2.id AND tsu.deleted_at = ? AND tsu.vendor_id = t1m.vendor_id
+	LEFT JOIN sku_vendor_category_map tsy ON tsy.name_id = t2.id AND tsy.vendor_id = ? AND tsy.deleted_at = ?
 	WHERE 1 = 1
 	`
-	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, utils.DefaultTimeValue)
+	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, utils.DefaultTimeValue, model.VendorIDJD, utils.DefaultTimeValue)
 	if mustDirty {
 		sql += " AND t1m.sync_status IS NOT NULL AND t1m.sync_status <> 0"
 	} else {