This commit is contained in:
苏尹岚
2020-12-25 15:18:53 +08:00
parent 55383ff5fc
commit d26bd44af7
3 changed files with 112 additions and 13 deletions

View File

@@ -276,15 +276,8 @@ func OnDingDingMsg(msg map[string]interface{}) (callbackResponse *dingdingapi.Ca
return api.DingDingAPI.Err2CallbackResponse(nil)
}
func GetUsers(ctx *jxcontext.Context, keyword string, userIDs []string, mobile string, fromTime, toTime string, timeType int, cityCodes, consumeTypes []int, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
// userList, totalCount, err := dao.GetUsers(dao.GetDB(), keyword, "", userIDs, jxutils.BatchString2Slice(mobile), offset, pageSize)
// if err == nil {
// pagedInfo = &model.PagedInfo{
// TotalCount: totalCount,
// Data: userList,
// }
// }
return pagedInfo, err
func GetUsers(ctx *jxcontext.Context, keyword string, userID string, pop int, mobile string, fromTime, toTime string, timeType int, cityCodes, consumeTypes []int, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
return dao.GetUsers2(dao.GetDB(), keyword, userID, pop, mobile, utils.Str2Time(fromTime), utils.Str2Time(toTime), timeType, cityCodes, consumeTypes, offset, pageSize)
}
func GetUser(ctx *jxcontext.Context, userID string) (user *model.GetUserResult, err error) {