diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index c903ce902..e6b4eda8c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -313,31 +313,25 @@ 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() //权限 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 + var storeIDs []int + if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err != nil { + return nil, err + } 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) - } + for _, v := range storeIDs { + if storeIDsMap[v] != 0 { + storeIDs2 = append(storeIDs2, v) } } - if len(storeIDs2) == 0 { - storeIDs2 = append(storeIDs2, -1) + if len(storeIDs2) == 0 { // todo + storeIDs2 = append(storeIDs2, storeIDs...) } } else { if len(storeIDsMap) > 0 { @@ -345,7 +339,7 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro storeIDs2 = append(storeIDs2, k) } } else { - storeIDs2 = append(storeIDs2, -1) + storeIDs2 = append(storeIDs2, storeIDs...) } } if data, err := json.Marshal(storeIDs2); err == nil {