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

1

Browse Source
This commit is contained in:
邹宗楠
2022-04-15 09:42:20 +08:00
parent 3e3dd56ca6
commit 8a68945b5c
1 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,65 +523,27 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
} }
} }
if len(storeIDs2) == 0 { if len(storeIDs2) == 0 {
//storeIDs2 = append(storeIDs2, -1) storeIDs2 = append(storeIDs2, -1)
storeIDs2 = append(storeIDs2, storeIDs...)
} }
} else { } else {
if len(storeIDsMap) > 0 { if params["storeID"] != nil {
for k, _ := range storeIDsMap { if storeIDsMap[int(utils.Interface2Int64WithDefault(params["storeID"], 0))] == 0 {
storeIDs2 = append(storeIDs2, k) params["storeID"] = nil
} }
} else { } else {
storeIDs2 = append(storeIDs2, -1) if len(storeIDsMap) > 0 {
for k, _ := range storeIDsMap {
storeIDs2 = append(storeIDs2, k)
}
} else {
storeIDs2 = append(storeIDs2, -1)
}
} }
} }
if data, err := json.Marshal(storeIDs2); err == nil { if data, err := json.Marshal(storeIDs2); err == nil {
params["storeIDs"] = string(data) params["storeIDs"] = string(data)
} }
} }
// 查询用户门店
//configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
//storeIdInterface, _, err := GetMyStoreListNew(ctx, configs[0].Value)
//if err != nil {
// return nil, err
//}
//
//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 {