liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-04-13 10:02:36 +08:00
parent 43dfe84d36
commit 1ad33dee35
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
business/jxcallback/orderman/orderman_ext.go
View File

@@ -313,31 +313,25 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
return nil, err 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) { 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() var db = dao.GetDB()
//权限 //权限
if permission.IsRoled(ctx) { 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 { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
var storeIDs2 []int var storeIDs2 []int
if params["storeIDs"] != nil {
var storeIDs []int var storeIDs []int
if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err != nil {
return nil, err
}
if params["storeIDs"] != nil {
for _, v := range storeIDs { for _, v := range storeIDs {
if storeIDsMap[v] != 0 { if storeIDsMap[v] != 0 {
storeIDs2 = append(storeIDs2, v) storeIDs2 = append(storeIDs2, v)
} }
} }
} if len(storeIDs2) == 0 { // todo
if len(storeIDs2) == 0 { storeIDs2 = append(storeIDs2, storeIDs...)
storeIDs2 = append(storeIDs2, -1)
} }
} else { } else {
if len(storeIDsMap) > 0 { if len(storeIDsMap) > 0 {
@@ -345,7 +339,7 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
storeIDs2 = append(storeIDs2, k) storeIDs2 = append(storeIDs2, k)
} }
} else { } else {
storeIDs2 = append(storeIDs2, -1) storeIDs2 = append(storeIDs2, storeIDs...)
} }
} }
if data, err := json.Marshal(storeIDs2); err == nil { if data, err := json.Marshal(storeIDs2); err == nil {