From abd0fcdf4adc63af78201f9c703b7bf18b373354 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, 6 Jan 2021 18:18:17 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync_store_sku.go | 2 +-
 business/model/dao/store_sku.go        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index dcdca9a0d..94f30b1fe 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -94,7 +94,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
 								return nil, err
 							}
 						}
-						if vendorID == model.VendorIDEBAI && storeID == 667281 && catInfo.VendorOrgCode == "34665" {
+						if vendorID == model.VendorIDEBAI && catInfo.VendorOrgCode == "34665" && catInfo.CityCode == 510100 {
 							catInfo.Name = catInfo.ExdName
 							catInfo.Seq = catInfo.ExdSeq
 						}
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3e36587bb..167242787 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -47,6 +47,7 @@ type SkuStoreCatInfo struct {
 	StoreCatSeq        int
 	StoreParentCatName string
 	IsSysCat           int
+	CityCode           int
 }
 
 type StoreSkuSyncInfo struct {
@@ -372,7 +373,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in
 	t4p.name parent_cat_name,
 	tsp.store_category_name store_parent_cat_name,
 	t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status,
-	t1.is_sys_cat, t1.vendor_org_code
+	t1.is_sys_cat, t1.vendor_org_code,
+	t6.city_code
 	FROM store_sku_category_map t5
 	JOIN sku_category t4 ON t5.category_id = t4.id AND t4.deleted_at = ?
 	LEFT JOIN store_category_map ts ON ts.store_id = t5.store_id AND ts.category_id = t4.id AND ts.deleted_at = ?
@@ -399,6 +401,7 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in
 	LEFT JOIN store_category_map tsp ON tsp.store_id = t5.store_id AND tsp.category_id = t4p.id AND tsp.deleted_at = ?
 	LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5.store_id = t5p.store_id AND t5p.deleted_at = ?
 	LEFT JOIN store_map t1 ON t1.store_id = t5.store_id AND t1.vendor_id = ?
+	LEFT JOIN store t6 ON t6.id = t5.store_id 
 	WHERE t5.store_id = ? AND t5.deleted_at = ? AND t4.is_sync <> ?`
 	sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorID, storeID, utils.DefaultTimeValue, model.YES)
 	if mustDirty {