From b65f5ed0a00f948279b491a996a1c035da0b643b Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 22 Jul 2019 08:55:25 +0800 Subject: [PATCH] =?UTF-8?q?-=20GetStores=20API=E5=A2=9E=E5=8A=A0POST?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BB=A5=E6=96=B9=E4=BE=BF=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E5=A4=A7=E9=87=8F=E5=8F=82=E6=95=B0=20=E6=96=B0=E5=A2=9EstoreI?= =?UTF-8?q?Ds=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8F=AF=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E8=A6=81=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=9F=8E=E5=B8=82=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8CstoreID=E5=8F=82=E6=95=B0=E4=B8=8E=E6=96=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=98=AF=E6=88=96=E7=9A=84=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 17 ++++++++++++++--- controllers/cms_store.go | 13 ++----------- routers/commentsRouter_controllers.go | 11 +---------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 51fd244ed..8d559be77 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -272,9 +272,20 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa sqlWhere += ")" } - if params["storeID"] != nil { - sqlWhere += " AND t1.id = ?" - sqlWhereParams = append(sqlWhereParams, params["storeID"].(int)) + if params["storeID"] != nil || params["storeIDs"] != nil { + var storeIDs []int + if params["storeIDs"] != nil { + if err = jxutils.Strings2Objs(utils.Interface2String("storeIDs"), &storeIDs); err != nil { + return nil, err + } + } + if params["storeID"] != nil { + storeIDs = append(storeIDs, params["storeID"].(int)) + } + if len(storeIDs) > 0 { + sqlWhere += " AND t1.id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")" + sqlWhereParams = append(sqlWhereParams, storeIDs) + } } if params["name"] != nil { sqlWhere += " AND t1.name LIKE ?" diff --git a/controllers/cms_store.go b/controllers/cms_store.go index e95c0f494..67f85e514 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -18,6 +18,7 @@ type StoreController struct { // @Param token header string true "认证token" // @Param keyword query string false "查询关键字（可以为空，为空表示不限制）" // @Param storeID query int false "门店ID" +// @Param storeIDs query string false "门店ID列表" // @Param name query string false "门店名称（不要求完全一致）" // @Param placeID query int false "所属地点ID" // @Param placeLevel query int false "所属地点级别" @@ -39,7 +40,7 @@ type StoreController struct { // @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /GetStores [get] +// @router /GetStores [get,post] func (c *StoreController) GetStores() { c.callGetStores(func(params *tStoreGetStoresParams) (retVal interface{}, errCode string, err error) { timeList, err := jxutils.BatchStr2Time(params.OrderTimeFrom, params.OrderTimeTo) @@ -129,16 +130,6 @@ func (c *StoreController) CreateStore() { }) } -// @Title 空方法，占位用 -// @Description 空方法，占位用 -// @Param token header string true "认证token" -// @Param payload formData string true "json数据，store对象" -// @Success 200 {object} controllers.CallResult -// @Failure 200 {object} controllers.CallResult -// @router /ZZZZZ [put] -func (c *StoreController) ZZZZZ() { -} - // @Title 得到门店映射信息 // @Description 得到门店映射信息 // @Param token header string true "认证token" diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index ce8d8dbfa..ce0ab33aa 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1298,7 +1298,7 @@ func init() { beego.ControllerComments{ Method: "GetStores", Router: `/GetStores`, - AllowHTTPMethods: []string{"get"}, + AllowHTTPMethods: []string{"get","post"}, MethodParams: param.Make(), Filters: nil, Params: nil}) @@ -1375,15 +1375,6 @@ func init() { Filters: nil, Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], - beego.ControllerComments{ - Method: "ZZZZZ", - Router: `/ZZZZZ`, - AllowHTTPMethods: []string{"put"}, - MethodParams: param.Make(), - Filters: nil, - Params: nil}) - beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], beego.ControllerComments{ Method: "CopyStoreSkus",