aa
This commit is contained in:
@@ -1511,6 +1511,25 @@ func TmpGetJxBadCommentsNo(ctx *jxcontext.Context, storeID int) (count int, err
|
|||||||
|
|
||||||
func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeIDs []int, offset, pageSize, commentType int, fromTime, toTime time.Time) (retVal map[string]interface{}, err error) {
|
func TmpGetJxBadCommentsByStoreId(ctx *jxcontext.Context, keyword string, storeIDs []int, offset, pageSize, commentType int, fromTime, toTime time.Time) (retVal map[string]interface{}, err error) {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
|
//权限
|
||||||
|
if permission.IsRoled(ctx) {
|
||||||
|
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
|
||||||
|
var storeIDs2 []int
|
||||||
|
if len(storeIDs) > 0 {
|
||||||
|
for _, v := range storeIDs {
|
||||||
|
if storeIDsMap[v] != 0 {
|
||||||
|
storeIDs2 = append(storeIDs2, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for k, _ := range storeIDsMap {
|
||||||
|
storeIDs2 = append(storeIDs2, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
storeIDs = nil
|
||||||
|
storeIDs = storeIDs2
|
||||||
|
}
|
||||||
|
}
|
||||||
sql := `
|
sql := `
|
||||||
SELECT SQL_CALC_FOUND_ROWS
|
SELECT SQL_CALC_FOUND_ROWS
|
||||||
t1.*, t2.name store_name, t3.name city_name,
|
t1.*, t2.name store_name, t3.name city_name,
|
||||||
@@ -2783,6 +2802,25 @@ func StoreStatus2Chinese(status int) (str string) {
|
|||||||
func GetStorePriceScore(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromScore, toScore, sort int, snapDate string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
|
func GetStorePriceScore(ctx *jxcontext.Context, storeIDs, vendorIDs []int, fromScore, toScore, sort int, snapDate string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
|
||||||
var snapDateParam time.Time
|
var snapDateParam time.Time
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
|
//权限
|
||||||
|
if permission.IsRoled(ctx) {
|
||||||
|
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
|
||||||
|
var storeIDs2 []int
|
||||||
|
if len(storeIDs) > 0 {
|
||||||
|
for _, v := range storeIDs {
|
||||||
|
if storeIDsMap[v] != 0 {
|
||||||
|
storeIDs2 = append(storeIDs2, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for k, _ := range storeIDsMap {
|
||||||
|
storeIDs2 = append(storeIDs2, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
storeIDs = nil
|
||||||
|
storeIDs = storeIDs2
|
||||||
|
}
|
||||||
|
}
|
||||||
if snapDate != "" {
|
if snapDate != "" {
|
||||||
snapDateParam = utils.Str2Time(snapDate)
|
snapDateParam = utils.Str2Time(snapDate)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4741,6 +4741,25 @@ func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss
|
|||||||
if auditTimeEnd != "" {
|
if auditTimeEnd != "" {
|
||||||
auditTimeEndp = utils.Str2Time(auditTimeEnd)
|
auditTimeEndp = utils.Str2Time(auditTimeEnd)
|
||||||
}
|
}
|
||||||
|
//权限
|
||||||
|
if permission.IsRoled(ctx) {
|
||||||
|
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
|
||||||
|
var storeIDs2 []int
|
||||||
|
if len(storeIDs) > 0 {
|
||||||
|
for _, v := range storeIDs {
|
||||||
|
if storeIDsMap[v] != 0 {
|
||||||
|
storeIDs2 = append(storeIDs2, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for k, _ := range storeIDsMap {
|
||||||
|
storeIDs2 = append(storeIDs2, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
storeIDs = nil
|
||||||
|
storeIDs = storeIDs2
|
||||||
|
}
|
||||||
|
}
|
||||||
pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, types, name, remark, keyword, marketManPhone, cityName, applyTimeStartp, applyTimeEndp, auditTimeStartp, auditTimeEndp, pageSize, offset)
|
pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, types, name, remark, keyword, marketManPhone, cityName, applyTimeStartp, applyTimeEndp, auditTimeStartp, auditTimeEndp, pageSize, offset)
|
||||||
return pagedInfo, err
|
return pagedInfo, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"git.rosy.net.cn/baseapi"
|
"git.rosy.net.cn/baseapi"
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
|
"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/jxutils"
|
"git.rosy.net.cn/jx-callback/business/jxutils"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
|
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
|
||||||
@@ -812,8 +813,27 @@ func GetWeeklyStoreScore(storeID, weekIndexParam int) (outWeeklyStoreScoreDataLi
|
|||||||
return outWeeklyStoreScoreDataList, err
|
return outWeeklyStoreScoreDataList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetStoreTotalScoreList(storeIDList []int, cityCode int, keyWord string, beginTime, endTime time.Time, isDesc bool, checkScoreLow, checkScoreHigh, offset, pageSize int) (storeTotalScoreEx model.StoreTotalScoreEx, err error) {
|
func GetStoreTotalScoreList(ctx *jxcontext.Context, storeIDList []int, cityCode int, keyWord string, beginTime, endTime time.Time, isDesc bool, checkScoreLow, checkScoreHigh, offset, pageSize int) (storeTotalScoreEx model.StoreTotalScoreEx, err error) {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
|
//权限
|
||||||
|
if permission.IsRoled(ctx) {
|
||||||
|
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
|
||||||
|
var storeIDs2 []int
|
||||||
|
if len(storeIDList) > 0 {
|
||||||
|
for _, v := range storeIDList {
|
||||||
|
if storeIDsMap[v] != 0 {
|
||||||
|
storeIDs2 = append(storeIDs2, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for k, _ := range storeIDsMap {
|
||||||
|
storeIDs2 = append(storeIDs2, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
storeIDList = nil
|
||||||
|
storeIDList = storeIDs2
|
||||||
|
}
|
||||||
|
}
|
||||||
storeTotalScoreMapData := make(map[int]*model.StoreTotalScore)
|
storeTotalScoreMapData := make(map[int]*model.StoreTotalScore)
|
||||||
storeTotalScoreList, err := dao.GetStoreTotalScoreList(db, storeIDList, cityCode, keyWord, beginTime, endTime)
|
storeTotalScoreList, err := dao.GetStoreTotalScoreList(db, storeIDList, cityCode, keyWord, beginTime, endTime)
|
||||||
var filterStoreTotalScoreList []*model.StoreTotalScore
|
var filterStoreTotalScoreList []*model.StoreTotalScore
|
||||||
|
|||||||
@@ -490,7 +490,7 @@ func (c *StoreController) GetStoreTotalScoreList() {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
var storeIDList []int
|
var storeIDList []int
|
||||||
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil {
|
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil {
|
||||||
retVal, err = misc.GetStoreTotalScoreList(storeIDList, params.CityCode, params.Keyword, timeList[0], timeList[1], params.IsDesc, params.CheckScoreLow, params.CheckScoreHigh, params.Offset, params.PageSize)
|
retVal, err = misc.GetStoreTotalScoreList(params.Ctx, storeIDList, params.CityCode, params.Keyword, timeList[0], timeList[1], params.IsDesc, params.CheckScoreLow, params.CheckScoreHigh, params.Offset, params.PageSize)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return retVal, "", err
|
return retVal, "", err
|
||||||
|
|||||||
Reference in New Issue
Block a user