From d67a730c50d29b4027054374e0068e907698ff4b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 20 May 2019 09:39:59 +0800
Subject: [PATCH] =?UTF-8?q?-=20store=E4=B8=AD=E5=86=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B8=82=E5=9C=BA=EF=BC=8C=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 10 +++++++++-
 business/model/store.go       | 16 ++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 950a8133d..b18f43e28 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -115,6 +115,14 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 	t1.licence2_code,
 	t1.licence2_valid,
 	t1.licence2_expire,
+	t1.market_man_name,
+	t1.market_man_phone,
+	t1.jx_brand_fee,
+	t1.market_add_fee,
+	t1.payee_name,
+	t1.payee_account_no,
+	t1.payee_bank_branch_name,
+	t1.payee_bank_name,
 
 	city.name city_name,
 	district.name district_name,
@@ -252,7 +260,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 	}
 
 	sql += sqlWhere + `
-	GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45
+	GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53
 	ORDER BY t1.id DESC
 	LIMIT ? OFFSET ?`
 	pageSize = jxutils.FormalizePageSize(pageSize)
diff --git a/business/model/store.go b/business/model/store.go
index 8c022adb2..4459e33ec 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -160,15 +160,15 @@ type Store struct {
 	Licence2Valid  string `orm:"size(32)" json:"licence2Valid"`  // 有效期开始
 	Licence2Expire string `orm:"size(32)" json:"licence2Expire"` // 有效期结束
 
-	// MarketManName  string // 市场负责人姓名
-	// MarketManPhone string // 市场负责人电话
-	// JxBrandFee     int64  // 京西品牌费
-	// MarketAddFee   int64  // 市场附加费
+	MarketManName  string // 市场负责人姓名
+	MarketManPhone string // 市场负责人电话
+	JxBrandFee     int64  // 京西品牌费
+	MarketAddFee   int64  // 市场附加费
 
-	// PayeeName           string // 收款人姓名
-	// PayeeAccountNo      string // 收款账号
-	// PayeeBankBranchName string // 开户银行
-	// PayeeBankName       string // 开户支行
+	PayeeName           string // 收款人姓名
+	PayeeAccountNo      string // 收款账号
+	PayeeBankBranchName string // 开户银行
+	PayeeBankName       string // 开户支行
 }
 
 func (*Store) TableUnique() [][]string {