From 27795425382515a87c3b54b458d9f8a89d9a3be4 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 16:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=A8=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 73 +++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 4f93a6ca9..1447014ef 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"
@@ -312,42 +313,46 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
 	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) {
-	var (
-		db = dao.GetDB()
-		//isJxIncomeArea = params["jxIncomeBegin"] != nil || params["jxIncomeEnd"] != nil
-		//begin, end     int64
-	)
+	var db = dao.GetDB()
 	//权限
-	if permission.IsRoled(ctx) {
-		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 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"])