From 1e3715456d1ee6533e4a7aa108df3342b39772c9 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 6 Sep 2018 09:50:17 +0800
Subject: [PATCH] - comment

---
 business/jxstore/cms/store.go |  4 ++--
 controllers/cms_store.go      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 86d7cad1e..ce1b2e513 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -70,9 +70,9 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i
 
 	params2 := make([]interface{}, 0)
 	if keyword != "" {
-		sql += " (t1.name LIKE ? OR t1.address LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ?"
 		keywordLike := "%" + keyword + "%"
-		params2 = append(params2, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
+		sql += " (t1.name LIKE ? OR t1.address LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ?"
+		params2 = append(params2, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
 
 		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
 			sql += " OR t1.id = ? OR t1.city_code = ? OR t1.district_code = ? OR t1.lng = ? OR t1.lat = ?"
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index 9ce5af041..ca0467cbe 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -14,11 +14,11 @@ type StoreController struct {
 }
 
 // @Title 得到地点（省，城市，区）信息
-// @Description parentCode与vendorID必传入一个，vendorID的意思是得到所有与这个厂商相关的城市列表
+// @Description parentCode与vendorID必传入一个，vendorID的意思是得到所有与这个厂商相关的城市列表。地点级别：省为1，市为2，区为3，注意直辖市也要分省与市级
 // @Param	token			header		string	true	"认证token"
-// @Param	parentCode		query		int		false	"上级地点code。地点级别：省为1，市为2，区为3，缺省为市"
+// @Param	parentCode		query		int		false	"上级地点code，这个指的是国家标准CODE（中国为：100000，北京为：110000，北京市为：110100），不是数据库中的ID"
 // @Param	vendorID		query		int		false	"得到所有与这个厂商相关的省与城市列表"
-// @Param	includeDisabled	query		bool	false	"是否包括禁用的城市"
+// @Param	includeDisabled	query		bool	false	"是否包括禁用的城市（缺省不包括）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetPlaces [get]
@@ -61,8 +61,8 @@ func (c *StoreController) UpdatePlaces() {
 // @Param	placeLevel		query		int		false	"所属地点级别"
 // @Param	address			query		string	false	"门店地址"
 // @Param	tel				query		string	false	"电话"
-// @Param	fromStatus		query		int		false	"起始状态"
-// @Param	toStatus		query		int		false	"结束状态"
+// @Param	fromStatus		query		int		false	"起始状态（-1：禁用；0：休息，关店；1：正常开店）"
+// @Param	toStatus		query		int		false	"结束状态（-1：禁用；0：休息，关店；1：正常开店）"
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"
 // @Param	pageSize		query		int		false	"门店列表页大小（缺省为50）"
 // @Success 200 {object} controllers.CallResult