aa

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{

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 {

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 {

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 {

business/jxstore/permission/permission.go

@@ -1,4 +1,4 @@
-package cms
+package permission
 
 import (
 	"fmt"