From 43dfe84d368be56654b5226b3f3e46f346534356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 13 Apr 2022 09:18:02 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/orderman_ext.go | 72 ++++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b2cc97960..c903ce902 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -317,42 +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) { - // // 查询用户门店 - // 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 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"])