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

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-23 10:16:07 +08:00
parent 947750c5c9
commit 35d3330f9d
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/jxstore/cms/user2.go
View File

@@ -276,14 +276,14 @@ func OnDingDingMsg(msg map[string]interface{}) (callbackResponse *dingdingapi.Ca
return api.DingDingAPI.Err2CallbackResponse(nil) return api.DingDingAPI.Err2CallbackResponse(nil)
} }
func GetUsers(ctx *jxcontext.Context, userType int, keyword string, userIDs []string, userID2, mobile string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { 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(), userType, keyword, "", userIDs, jxutils.BatchString2Slice(userID2), jxutils.BatchString2Slice(mobile), offset, pageSize) // userList, totalCount, err := dao.GetUsers(dao.GetDB(), keyword, "", userIDs, jxutils.BatchString2Slice(mobile), offset, pageSize)
if err == nil { // if err == nil {
pagedInfo = &model.PagedInfo{ // pagedInfo = &model.PagedInfo{
TotalCount: totalCount, // TotalCount: totalCount,
Data: userList, // Data: userList,
} // }
} // }
return pagedInfo, err return pagedInfo, err
} }

8
business/model/job.go
View File

@@ -46,6 +46,8 @@ const (
const ( const (
/*消费类型*/ /*消费类型*/
ConsumeTypePublishJob = 1 //发任务 ConsumeTypePublishJob = 1 //发任务
ConsumeTypeMember = 2 //充会员
ConsumeTypeDelivery = 3 //发快递
) )
var ( var (
@@ -61,7 +63,11 @@ var (
JobCashbackPercentage: "比例返现", JobCashbackPercentage: "比例返现",
} }
ConsumeName = map[int]string{} ConsumeName = map[int]string{
ConsumeTypePublishJob: "发任务",
ConsumeTypeMember: "充会员",
ConsumeTypeDelivery: "发快递",
}
) )
type Job struct { type Job struct {