From 786a0cadf4739ed5bc1d44324c61207c15cabf3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 1 Feb 2021 14:40:33 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 12 ++++++++++ business/jxstore/act/act.go | 5 +++-- business/jxstore/cms/store.go | 6 +++-- business/jxstore/cms/store_sku.go | 5 +++-- .../jxstore/{cms => permission}/permission.go | 2 +- controllers/permission.go | 22 +++++++++---------- 6 files changed, 34 insertions(+), 18 deletions(-) rename business/jxstore/{cms => permission}/permission.go (99%) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 0b8c514c4..f35ccbfd2 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -7,6 +7,8 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/business/jxstore/permission" + "github.com/astaxie/beego" "git.rosy.net.cn/jx-callback/globals/api" @@ -285,6 +287,16 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD 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) { globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr) + //权限 + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + var storeIDs2 []int + for k, _ := range storeIDsMap { + storeIDs2 = append(storeIDs2, k) + } + params["storeIDs"] = storeIDs2 + } + } orders, totalCount, err := dao.GetOrders(dao.GetDB(), nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize) if err == nil { pagedInfo = &model.PagedInfo{ diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 5f94e826a..9466cc196 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -8,6 +8,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils/errlist" "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/jxutils" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" @@ -527,8 +528,8 @@ func PreCreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRu func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, vendorOrgCode string, actRules []*ActOrderRuleParam, actStoreSku []*ActStoreSkuParam, isAsync bool) (hint string, err error) { //权限 - if cms.IsRoled(ctx) { - if storeIDsMap, err := cms.GetUserStoresResultMap(ctx.GetUserID()); err == nil { + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { var actStoreSku2 []*ActStoreSkuParam for _, v := range actStoreSku { if storeIDsMap[v.StoreID] != 0 { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b07a641ef..d888286b2 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -14,6 +14,8 @@ import ( "time" "unicode/utf8" + "git.rosy.net.cn/jx-callback/business/jxstore/permission" + "git.rosy.net.cn/jx-callback/business/authz" "git.rosy.net.cn/baseapi/platformapi/yinbaoapi" @@ -519,8 +521,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa retVal.Stores = storeList } //权限 - if IsRoled(ctx) { - if storeIDsMap, err := GetUserStoresResultMap(ctx.GetUserID()); err == nil { + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { var storeList2 []*StoreExt for _, v := range retVal.Stores { if storeIDsMap[v.ID] != 0 { diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 1a1e684fc..9c1a2a863 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -24,6 +24,7 @@ import ( "git.rosy.net.cn/jx-callback/globals/refutil" "git.rosy.net.cn/jx-callback/business/jxstore/event" + "git.rosy.net.cn/jx-callback/business/jxstore/permission" "git.rosy.net.cn/baseapi" @@ -489,8 +490,8 @@ func GetStoresSkus(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, isHi func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, isHighPrice bool, priceType int, keyword string, isBySku, isAct bool, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) { //权限 - if IsRoled(ctx) { - if storeIDsMap, err := GetUserStoresResultMap(ctx.GetUserID()); err == nil { + if permission.IsRoled(ctx) { + if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { var storeIDs2 []int for _, v := range storeIDs { if storeIDsMap[v] != 0 { diff --git a/business/jxstore/cms/permission.go b/business/jxstore/permission/permission.go similarity index 99% rename from business/jxstore/cms/permission.go rename to business/jxstore/permission/permission.go index 0077da3d4..87080377c 100644 --- a/business/jxstore/cms/permission.go +++ b/business/jxstore/permission/permission.go @@ -1,4 +1,4 @@ -package cms +package permission import ( "fmt" diff --git a/controllers/permission.go b/controllers/permission.go index 69534c6a4..9979fdc73 100644 --- a/controllers/permission.go +++ b/controllers/permission.go @@ -2,7 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" - "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/jxutils" "git.rosy.net.cn/jx-callback/business/model" "github.com/astaxie/beego" @@ -23,7 +23,7 @@ func (c *PowerController) AddMenu() { c.callAddMenu(func(params *tPowerAddMenuParams) (retVal interface{}, errCode string, err error) { menu := &model.Menu{} if err = utils.UnmarshalUseNumber([]byte(params.Payload), menu); err == nil { - err = cms.AddMenu(params.Ctx, menu) + err = permission.AddMenu(params.Ctx, menu) } return retVal, "", err }) @@ -38,7 +38,7 @@ func (c *PowerController) AddMenu() { // @router /GetMenu [get] func (c *PowerController) GetMenu() { c.callGetMenu(func(params *tPowerGetMenuParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetMenu(params.Ctx, params.UserID) + retVal, err = permission.GetMenu(params.Ctx, params.UserID) return retVal, "", err }) } @@ -56,7 +56,7 @@ func (c *PowerController) UpdateMenu() { c.callUpdateMenu(func(params *tPowerUpdateMenuParams) (retVal interface{}, errCode string, err error) { payload := make(map[string]interface{}) if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil { - retVal, err = cms.UpdateMenu(params.Ctx, params.MenuID, payload, params.IsDelete) + retVal, err = permission.UpdateMenu(params.Ctx, params.MenuID, payload, params.IsDelete) } return retVal, "", err }) @@ -71,7 +71,7 @@ func (c *PowerController) UpdateMenu() { // @router /AddRole [post] func (c *PowerController) AddRole() { c.callAddRole(func(params *tPowerAddRoleParams) (retVal interface{}, errCode string, err error) { - err = cms.AddRole(params.Ctx, params.Name) + err = permission.AddRole(params.Ctx, params.Name) return retVal, "", err }) } @@ -85,7 +85,7 @@ func (c *PowerController) AddRole() { // @router /GetRole [get] func (c *PowerController) GetRole() { c.callGetRole(func(params *tPowerGetRoleParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetRole(params.Ctx, params.Name) + retVal, err = permission.GetRole(params.Ctx, params.Name) return retVal, "", err }) } @@ -108,7 +108,7 @@ func (c *PowerController) UpdateRole() { cityCodes, storeIDs []int ) if err = jxutils.Strings2Objs(params.CityCodes, &cityCodes, params.StoreIDs, &storeIDs); err == nil { - retVal, err = cms.UpdateRole(params.Ctx, params.RoleID, params.Name, params.IsDelete, params.BrandID, cityCodes, storeIDs) + retVal, err = permission.UpdateRole(params.Ctx, params.RoleID, params.Name, params.IsDelete, params.BrandID, cityCodes, storeIDs) } return retVal, "", err }) @@ -123,7 +123,7 @@ func (c *PowerController) UpdateRole() { // @router /GetUserRole [get] func (c *PowerController) GetUserRole() { c.callGetUserRole(func(params *tPowerGetUserRoleParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetUserRole(params.Ctx, params.UserID) + retVal, err = permission.GetUserRole(params.Ctx, params.UserID) return retVal, "", err }) } @@ -143,7 +143,7 @@ func (c *PowerController) UpdateUserRole() { roleIDs []int ) if err = jxutils.Strings2Objs(params.UserIDs, &userIDs, params.RoleIDs, &roleIDs); err == nil { - err = cms.UpdateUserRole(params.Ctx, userIDs, roleIDs) + err = permission.UpdateUserRole(params.Ctx, userIDs, roleIDs) } return retVal, "", err }) @@ -158,7 +158,7 @@ func (c *PowerController) UpdateUserRole() { // @router /GetRoleMenu [get] func (c *PowerController) GetRoleMenu() { c.callGetRoleMenu(func(params *tPowerGetRoleMenuParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetRoleMenu(params.Ctx, params.RoleID) + retVal, err = permission.GetRoleMenu(params.Ctx, params.RoleID) return retVal, "", err }) } @@ -177,7 +177,7 @@ func (c *PowerController) UpdateRoleMenu() { roleIDs, menuIDs []int ) if err = jxutils.Strings2Objs(params.RoleIDs, &roleIDs, params.MenuIDs, &menuIDs); err == nil { - err = cms.UpdateRoleMenu(params.Ctx, roleIDs, menuIDs) + err = permission.UpdateRoleMenu(params.Ctx, roleIDs, menuIDs) } return retVal, "", err })