liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

退回

Browse Source
This commit is contained in:
邹宗楠
2022-04-13 12:41:48 +08:00
parent 79a843aa0c
commit f4e821b25f
1 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
business/jxstore/cms/store.go
View File

@@ -511,49 +511,77 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
briefLevel := int(utils.ForceInterface2Int64(params["briefLevel"])) briefLevel := int(utils.ForceInterface2Int64(params["briefLevel"]))
//权限 //权限
if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
// 查询用户门店 if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "") var storeIDs2 []int
storeIdInterface, _, err := GetMyStoreListNew(ctx, configs[0].Value) if params["storeIDs"] != nil {
if err != nil { var storeIDs []int
return nil, err if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
} for _, v := range storeIDs {
if storeIDsMap[v] != 0 {
storeIDsMap := storeIdInterface.([]map[string]interface{})
var storeIDs2 []int
if params["storeIDs"] != nil {
var storeIDs []int
if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
for _, v := range storeIDs {
for _, s := range storeIDsMap {
if s["id"].(int) != 0 && s["id"].(int) == v {
storeIDs2 = append(storeIDs2, v) storeIDs2 = append(storeIDs2, v)
} }
} }
} }
} if len(storeIDs2) == 0 {
} else { //storeIDs2 = append(storeIDs2, -1)
if params["storeID"] != nil { storeIDs2 = append(storeIDs2, storeIDs...)
intStoreId := int(utils.Interface2Int64WithDefault(params["storeID"], 0))
for _, v := range storeIDsMap {
if v["id"].(int) == intStoreId && intStoreId != 0 {
storeIDs2 = append(storeIDs2, intStoreId)
}
} }
} else { } else {
if len(storeIDsMap) > 0 { if len(storeIDsMap) > 0 {
for _, v := range storeIDsMap { for k, _ := range storeIDsMap {
storeIDs2 = append(storeIDs2, v["id"].(int)) storeIDs2 = append(storeIDs2, k)
} }
} else {
storeIDs2 = append(storeIDs2, -1)
} }
} }
if data, err := json.Marshal(storeIDs2); err == nil {
params["storeIDs"] = string(data)
}
} }
if len(storeIDs2) == 0 { // 查询用户门店
storeIDs2 = append(storeIDs2, -1) //configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
} //storeIdInterface, _, err := GetMyStoreListNew(ctx, configs[0].Value)
//if err != nil {
if data, err := json.Marshal(storeIDs2); err == nil { // return nil, err
params["storeIDs"] = string(data) //}
} //
//storeIDsMap := storeIdInterface.([]map[string]interface{})
//var storeIDs2 []int
//if params["storeIDs"] != nil {
// var storeIDs []int
// if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
// for _, v := range storeIDs {
// for _, s := range storeIDsMap {
// if s["id"].(int) != 0 && s["id"].(int) == v {
// storeIDs2 = append(storeIDs2, v)
// }
// }
// }
// }
//} else {
// if params["storeID"] != nil {
// intStoreId := int(utils.Interface2Int64WithDefault(params["storeID"], 0))
// for _, v := range storeIDsMap {
// if v["id"].(int) == intStoreId && intStoreId != 0 {
// storeIDs2 = append(storeIDs2, intStoreId)
// }
// }
// } else {
// if len(storeIDsMap) > 0 {
// for _, v := range storeIDsMap {
// storeIDs2 = append(storeIDs2, v["id"].(int))
// }
// }
// }
//}
//if len(storeIDs2) == 0 {
// storeIDs2 = append(storeIDs2, -1)
//}
//
//if data, err := json.Marshal(storeIDs2); err == nil {
// params["storeIDs"] = string(data)
//}
} }
sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo) sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo)
if err != nil { if err != nil {