From 708e069d4f7bec4d13780ca8f3d37c72ffcc9ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 Apr 2022 17:16:19 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/getUserStore.go | 50 ---------------
 business/jxcallback/orderman/orderman_ext.go | 67 +++++++++++---------
 2 files changed, 37 insertions(+), 80 deletions(-)
 delete mode 100644 business/jxcallback/orderman/getUserStore.go

diff --git a/business/jxcallback/orderman/getUserStore.go b/business/jxcallback/orderman/getUserStore.go
deleted file mode 100644
index 1fc046dc6..000000000
--- a/business/jxcallback/orderman/getUserStore.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package orderman
-
-import (
-	"fmt"
-	"git.rosy.net.cn/jx-callback/business/auth2"
-	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
-	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/globals/api2"
-)
-
-// 获取用户门店权限
-func GetUserStoreByRole(ctx *jxcontext.Context) (storesInfo map[int]int, errCode string, err error) {
-	if !auth2.IsV2Token(ctx.GetToken()) {
-		return nil, model.ErrCodeTokenIsInvalid, model.ErrTokenIsInvalid
-	}
-
-	mobile, userID := ctx.GetMobileAndUserID()
-	if mobile == "" {
-		return nil, "", fmt.Errorf("不能得到用户手机号")
-	}
-	var storeList []*dao.StoreWithCityName
-
-	roleList, err := api2.RoleMan.GetUserRoleList(userID)
-	if err != nil {
-		return nil, model.ErrCodeTokenIsInvalid, model.ErrTokenIsInvalid
-	}
-
-	var (
-		storeIDs          []int
-		shortRoleNameList []string
-	)
-	for _, v := range roleList {
-		if v.StoreID == 0 {
-			shortRoleNameList = append(shortRoleNameList, v.Name)
-		} else {
-			storeIDs = append(storeIDs, v.StoreID)
-		}
-	}
-
-	storeList, err = dao.GetStoreListByMobileOrStoreIDs(dao.GetDB(), mobile, shortRoleNameList, storeIDs)
-	if err == nil && len(storeList) > 0 {
-		mapDataList := make(map[int]int, len(storeList))
-		for k, _ := range storeList {
-			mapDataList[k] = k
-		}
-		storesInfo = mapDataList
-	}
-	return storesInfo, "", err
-}
diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index cadc74d12..b2cc97960 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	//"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 
 	beego "github.com/astaxie/beego/server/web"
@@ -316,36 +317,42 @@ 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) {
 	var db = dao.GetDB()
 	//权限
-	if permission.IsRoled(ctx) {
-		// 查询用户门店
-		if storeIDsMap, _,err := GetUserStoreByRole(ctx); err == nil {
-			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 {
-						if storeIDsMap[v] != 0 {
-							storeIDs2 = append(storeIDs2, v)
-						}
-					}
-				}
-				if len(storeIDs2) == 0 {
-					storeIDs2 = append(storeIDs2, -1)
-				}
-			} else {
-				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 {
-				params["storeIDs"] = string(data)
-			}
-		}
-	}
+	//if permission.IsRoled(ctx) {
+	//	// 查询用户门店
+	//	configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
+	//	storeIdInterface, _, err := cms.GetMyStoreListNew(ctx, configs[0].Value)
+	//	if err != nil {
+	//		return nil, err
+	//	}
+	//	fmt.Println(storeIdInterface)
+	//	if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
+	//		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 {
+	//					if storeIDsMap[v] != 0 {
+	//						storeIDs2 = append(storeIDs2, v)
+	//					}
+	//				}
+	//			}
+	//			if len(storeIDs2) == 0 {
+	//				storeIDs2 = append(storeIDs2, -1)
+	//			}
+	//		} else {
+	//			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 {
+	//			params["storeIDs"] = string(data)
+	//		}
+	//	}
+	//}
 	//if isJxIncomeArea {
 	//	begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
 	//	end = utils.MustInterface2Int64(params["jxIncomeEnd"])