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-12 17:16:19 +08:00
parent 36315d484a
commit 708e069d4f
2 changed files with 37 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
business/jxcallback/orderman/getUserStore.go
View File

@@ -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
}

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

@@ -8,6 +8,7 @@ import (
"strings" "strings"
"time" "time"
//"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxstore/permission" "git.rosy.net.cn/jx-callback/business/jxstore/permission"
beego "github.com/astaxie/beego/server/web" 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) { 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) {
// 查询用户门店 // // 查询用户门店
if storeIDsMap, _,err := GetUserStoreByRole(ctx); err == nil { // configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
var storeIDs2 []int // storeIdInterface, _, err := cms.GetMyStoreListNew(ctx, configs[0].Value)
if params["storeIDs"] != nil { // if err != nil {
var storeIDs []int // return nil, err
if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { // }
for _, v := range storeIDs { // fmt.Println(storeIdInterface)
if storeIDsMap[v] != 0 { // if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
storeIDs2 = append(storeIDs2, v) // var storeIDs2 []int
} // if params["storeIDs"] != nil {
} // var storeIDs []int
} // if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
if len(storeIDs2) == 0 { // for _, v := range storeIDs {
storeIDs2 = append(storeIDs2, -1) // if storeIDsMap[v] != 0 {
} // storeIDs2 = append(storeIDs2, v)
} else { // }
if len(storeIDsMap) > 0 { // }
for k, _ := range storeIDsMap { // }
storeIDs2 = append(storeIDs2, k) // if len(storeIDs2) == 0 {
} // storeIDs2 = append(storeIDs2, -1)
} else { // }
storeIDs2 = append(storeIDs2, -1) // } else {
} // if len(storeIDsMap) > 0 {
} // for k, _ := range storeIDsMap {
if data, err := json.Marshal(storeIDs2); err == nil { // storeIDs2 = append(storeIDs2, k)
params["storeIDs"] = string(data) // }
} // } else {
} // storeIDs2 = append(storeIDs2, -1)
} // }
// }
// if data, err := json.Marshal(storeIDs2); err == nil {
// params["storeIDs"] = string(data)
// }
// }
//}
//if isJxIncomeArea { //if isJxIncomeArea {
// begin = utils.MustInterface2Int64(params["jxIncomeBegin"]) // begin = utils.MustInterface2Int64(params["jxIncomeBegin"])
// end = utils.MustInterface2Int64(params["jxIncomeEnd"]) // end = utils.MustInterface2Int64(params["jxIncomeEnd"])