From cfa09f94bea29b755704d1a590469931054c230b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sun, 28 Oct 2018 12:55:44 +0800
Subject: [PATCH] - user statuss for GetStores

---
 business/jxstore/cms/store.go | 15 ++++++++-------
 controllers/cms_store.go      |  3 +--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 3ca28c6df..25e7f2869 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -163,14 +163,15 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 		sqlWhereParams = append(sqlWhereParams, "%"+params["tel"].(string)+"%")
 	}
 
-	if params["fromStatus"] != nil {
-		fromStatus := params["fromStatus"].(int)
-		toStatus := fromStatus
-		if params["toStatus"] != nil {
-			toStatus = params["toStatus"].(int)
+	if params["statuss"] != nil {
+		var statuss []int
+		if err = utils.UnmarshalUseNumber([]byte(params["statuss"].(string)), &statuss); err != nil {
+			return nil, err
+		}
+		if len(statuss) > 0 {
+			sqlWhere += " AND t1.status IN (" + dao.GenQuestionMarks(len(statuss)) + ")"
+			sqlWhereParams = append(sqlWhereParams, statuss)
 		}
-		sqlWhere += " AND t1.status >= ? AND t1.status <= ?"
-		sqlWhereParams = append(sqlWhereParams, fromStatus, toStatus)
 	}
 
 	sql += sqlWhere + `
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index e11db43cc..3c87fb8de 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -21,8 +21,7 @@ type StoreController struct {
 // @Param	placeLevel		query		int		false	"所属地点级别"
 // @Param	address			query		string	false	"门店地址"
 // @Param	tel				query		string	false	"电话"
-// @Param	fromStatus		query		int		false	"查询起始状态（-1：禁用；0：休息，关店；1：正常开店）"
-// @Param	toStatus		query		int		false	"查询结束状态（-1：禁用；0：休息，关店；1：正常开店）"
+// @Param	statuss			query		string	false	"门店状态列表[-1,0,1]，（-1：禁用；0：休息，关店；1：正常开店）,缺省不限制"
 // @Param	vendorStoreCond	query		string	false	"查询关联门店的条件（如果此字段没有设置，vendorStoreConds无效），and：与，or：或，指的是vendorStoreConds里的条件间的关系，这组条件与其它条件都是与的关系"
 // @Param	vendorStoreConds	query	string		false	"为厂商条件对象{vendorID: cond}，注意vendorID是字符串形式，cond，-1：没有关联，0：不限定，1：有关联，缺省为0"
 // @Param	courierStoreCond	query	string		false	"查询关联门店的条件（如果此字段没有设置，courierStoreConds无效），and：与，or：或，指的是courierStoreConds里的条件间的关系，这组条件与其它条件都是与的关系"