From 00770ef83f8aeb5992d05455267d54764667f4ee 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 Jan 2021 17:35:28 +0800
Subject: [PATCH] aa

---
 business/model/dao/sku.go       | 14 +++++++++++---
 business/model/dao/store_sku.go |  4 ++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index 35da21905..8a7fdad42 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -190,16 +190,23 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 	t1.*,
 	t1m.vendor_thing_id vendor_cat_id,
 	t1m.sync_status cat_sync_status,
-
+	a.is_jx_cat,
+	b.vendor_category_name,
+	b.vendor_category_seq,
 	t1pm.id parent_map_id,
 	t1p.name parent_cat_name,
 	t1pm.vendor_thing_id parent_vendor_cat_id,
 	t1pm.sync_status parent_cat_sync_status
 	FROM sku_category t1
-	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?`
+	LEFT JOIN thing_map t1m ON t1m.thing_id = t1.id AND t1m.thing_type = ? AND t1m.deleted_at = ?
+	LEFT JOIN vendor_org_code a ON a.vendor_org_code = t1m.vendor_org_code AND a.vendor_id = t1m.vendor_id AND a.deleted_at = ?
+	LEFT JOIN vendor_category_map b ON b.vendor_org_code = t1m.vendor_org_code AND b.vendor_id = t1m.vendor_id AND b.category_id = t1m.category_id AND b.deleted_at = ?
+	`
 	sqlParams := []interface{}{
 		model.ThingTypeCategory,
 		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
 	}
 	if len(vendorIDs) > 0 {
 		sql += " AND t1m.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
@@ -213,10 +220,11 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 	LEFT JOIN sku_category t1p ON t1p.id = t1.parent_id
 	LEFT JOIN thing_map t1pm ON t1pm.thing_id = t1p.id AND t1pm.thing_type = ? AND t1m.deleted_at = ?
 		AND t1pm.vendor_id = t1m.vendor_id AND t1pm.vendor_org_code = t1m.vendor_org_code
+	LEFT JOIN vendor_category_map c ON c.vendor_org_code = t1pm.vendor_org_code AND c.vendor_id = t1pm.vendor_id AND c.category_id = t1pm.category_id AND c.deleted_at = ?
 	WHERE 1 = 1
 	AND t1.is_sync <> ?
 	`
-	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, model.YES)
+	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, utils.DefaultTimeValue, model.YES)
 	if mustDirty {
 		sql += " AND t1m.sync_status IS NOT NULL AND t1m.sync_status <> 0"
 	} else {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index b37713100..e1b87fa7f 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -48,6 +48,10 @@ type SkuStoreCatInfo struct {
 	StoreParentCatName string
 	IsSysCat           int
 	CityCode           int
+	IsJxCat            int
+
+	VendorCategoryName string
+	VendorCategorySeq  int
 }
 
 type StoreSkuSyncInfo struct {