aa

business/jxstore/cms/user2.go

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

business/model/job.go

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