From 471b2c63fc9a61bd837c2d9165dde80a127405de 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, 24 Dec 2019 13:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=85=E9=94=80=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 4cef4929f..b773238f0 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -2190,7 +2190,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 		var skuNameList []*model.SkuName
 		//未关注，不可售的商品nameID列表
 		sql := `
-			SELECT DISTINCT b.name_id id
+			SELECT DISTINCT b.name_id id,1 brand_id
 			FROM store_sku_bind a
 			JOIN sku b ON a.sku_id = b.id AND b.deleted_at = ?
 			WHERE a.deleted_at = ?
@@ -2203,7 +2203,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 								AND a.store_id = ?
 								AND a.status = ?)
 			UNION 
-			SELECT DISTINCT a.name_id id
+			SELECT DISTINCT a.name_id id,0 brand_id
 			FROM sku a
 			LEFT JOIN (SELECT DISTINCT b.name_id 
 						FROM store_sku_bind a
@@ -2235,6 +2235,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 		}
 		for _, v := range skuNameAndPlace {
 			if skuNameMap[v.ID] != nil {
+				v.Type = v.BrandID
 				skuNameAndPlaceList = append(skuNameAndPlaceList, v)
 			}
 		}
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3a4623055..82d24bd31 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -202,6 +202,7 @@ type SkuNameAndPlace struct {
 	CityName string `json:"cityName"`
 	Sequence int    `json:"sequence"`
 	Count    int    `json:"count"`
+	Type     int    `json:"type"`
 }
 
 // todo 应该通过需要同步的skuid来驱动同步分类，而不是当前这种分开的逻辑