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-12 16:44:03 +08:00
parent ec0bfd4707
commit 2779542538
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
business/jxcallback/orderman/orderman_ext.go
View File

@@ -8,6 +8,7 @@ import (
"strings" "strings"
"time" "time"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxstore/permission" "git.rosy.net.cn/jx-callback/business/jxstore/permission"
beego "github.com/astaxie/beego/server/web" beego "github.com/astaxie/beego/server/web"
@@ -312,42 +313,46 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
return nil, err return nil, err
} }
func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
var ( var db = dao.GetDB()
db = dao.GetDB()
//isJxIncomeArea = params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil
//begin, end int64
)
//权限 //权限
if permission.IsRoled(ctx) { //if permission.IsRoled(ctx) {
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { // // 查询用户门店
var storeIDs2 []int // configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
if params["storeIDs"] != nil { // storeIdInterface, _, err := cms.GetMyStoreListNew(ctx, configs[0].Value)
var storeIDs []int // if err != nil {
if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { // return nil, err
for _, v := range storeIDs { // }
if storeIDsMap[v] != 0 { // fmt.Println(storeIdInterface)
storeIDs2 = append(storeIDs2, v) // if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
} // var storeIDs2 []int
} // if params["storeIDs"] != nil {
} // var storeIDs []int
if len(storeIDs2) == 0 { // if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
storeIDs2 = append(storeIDs2, -1) // for _, v := range storeIDs {
} // if storeIDsMap[v] != 0 {
} else { // storeIDs2 = append(storeIDs2, v)
if len(storeIDsMap) > 0 { // }
for k, _ := range storeIDsMap { // }
storeIDs2 = append(storeIDs2, k) // }
} // if len(storeIDs2) == 0 {
} else { // storeIDs2 = append(storeIDs2, -1)
storeIDs2 = append(storeIDs2, -1) // }
} // } else {
} // if len(storeIDsMap) > 0 {
if data, err := json.Marshal(storeIDs2); err == nil { // for k, _ := range storeIDsMap {
params["storeIDs"] = string(data) // storeIDs2 = append(storeIDs2, k)
} // }
} // } else {
} // storeIDs2 = append(storeIDs2, -1)
// }
// }
// if data, err := json.Marshal(storeIDs2); err == nil {
// params["storeIDs"] = string(data)
// }
// }
//}
//if isJxIncomeArea { //if isJxIncomeArea {
// begin = utils.MustInterface2Int64(params["jxIncomeBegin"]) // begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
// end = utils.MustInterface2Int64(params["jxIncomeEnd"]) // end = utils.MustInterface2Int64(params["jxIncomeEnd"])