From 3b095fef4f714ba305a9f6377f28afd778754fb7 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 10:08:55 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 2fcea1c63..e02c5ecb0 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -73,6 +73,8 @@ type StoreExt struct {
 	CourierMapStr  string `json:"-"`
 	PayeeBankName  string `json:"payeeBankName"` // 开户行名称
 	LinkStoreCount int    `json:"linkStoreCount"`
+	BrandName      string `json:"brandName"`
+	BrandLogo      string `json:"brandLogo"`
 	// StoreMaps     []map[string]interface{} `orm:"-"`
 	// CourierMaps   []map[string]interface{} `orm:"-"`
 	StoreMaps   []*model.StoreMap        `json:"StoreMaps"`
@@ -220,6 +222,7 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
 	LEFT JOIN user om ON om.mobile <> '' AND om.mobile = t1.operator_phone AND om.deleted_at = ?
 	LEFT JOIN user om2 ON om2.mobile <> '' AND om2.mobile = t1.operator_phone2 AND om2.deleted_at = ?
 	LEFT JOIN user om3 ON om3.mobile <> '' AND om3.mobile = t1.operator_phone3 AND om3.deleted_at = ?
+	LEFT JOIN brand br ON br.id = t1.brand_id
 	`
 	sqlFromParams = []interface{}{
 		utils.DefaultTimeValue,
@@ -472,6 +475,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 	province.name province_name,
 	city.name city_name,
 	district.name district_name,
+	br.name brand_name,
+	br.logo brand_logo,
 	(SELECT COUNT(*) FROM store t11 WHERE t11.link_store_id = t1.id) link_store_count
 	` + sql + `
 	ORDER BY t1.id DESC