jager/novatask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大使任务逻辑

Browse Source
This commit is contained in:
lianghuanjie
2025-01-07 14:45:13 +08:00
parent 3ad3482f43
commit cb31da268f
12 changed files with 239 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api/task.api
View File

@@ -58,14 +58,14 @@ type Task {
Points int `json:"points"` // 任务积分
ButtonText string `json:"button_text"` // 按钮文字
Params string `json:"params"` // 参数
Type int8 `json:"type"` // 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user
Type int8 `json:"type"` // 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user,11=ambassador_task
Url string `json:"url"` // 跳转链接
Sort int `json:"sort"` // 排序
StartAt string `json:"start_at"` // 开始时间
EndAt string `json:"end_at"` // 结束时间
HasFinishCount int `json:"has_finish_count"` // 当前完成进度
TotalCount int `json:"total_count"` // 总进度
FinishState int8 `json:"finish_state"` // 0:未完成 1:待校验 2:已完成未领取 3:已领取
FinishState int8 `json:"finish_state"` // 0:未完成 1:待校验 2:已完成未领取 3:已领取 4:不可参与
}
type GetTaskListResp {

4
doc/swagger/nova.json
View File

@@ -735,7 +735,7 @@
"type": {
"type": "integer",
"format": "int8",
"description": " 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user"
"description": " 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user,11=ambassador_task"
},
"url": {
"type": "string",
@@ -767,7 +767,7 @@
"finish_state": {
"type": "integer",
"format": "int8",
"description": " 0:未完成 1:待校验 2:已完成未领取 3:已领取"
"description": " 0:未完成 1:待校验 2:已完成未领取 3:已领取 4:不可参与"
}
},
"title": "Task",

3
docker-compose.yml
View File

@@ -4,8 +4,7 @@ services:
container_name: nova-task
privileged: true
restart: always
ports:
- "8888:8888"
network_mode: host
volumes:
- ./logs:/app/logs
- ./etc:/app/etc

2
internal/logic/carv/bind_wallet_logic.go
View File

@@ -25,7 +25,7 @@ func NewBindWalletLogic(ctx context.Context, svcCtx *svc.ServiceContext) *BindWa
}
func (l *BindWalletLogic) BindWallet(req *types.EmailKey) (resp *types.CarvResult, err error) {
// todo: add your logic here and delete this line
l.svcCtx.UserModel.FindOneByEmail(l.ctx, req.Email)
return
}

43
internal/logic/task/get_task_list_logic.go
View File

@@ -41,12 +41,16 @@ func (l *GetTaskListLogic) GetTaskList(uid int, req *types.GetTaskListReq) (*typ
l.Errorw("get user invite count failed", logx.Field("err", err), logx.Field("uid", uid))
}
var isAmbassador, hasBindTwitter int
resp := &types.GetTaskListResp{}
for _, t := range tasks {
// 任务序列号
taskSeq := 0
if t.Type == model.TASKTYPE_DAILY_PAY {
taskSeq = cast.ToInt(time.Now().Format("20060102"))
}
// 读取任务完成状态
var finishState int8
if uid > 0 {
tp, err := l.svcCtx.TaskProgressModel.FindOneByUidTaskIdTaskSeq(l.ctx, uid, t.Id, taskSeq)
@@ -55,20 +59,53 @@ func (l *GetTaskListLogic) GetTaskList(uid int, req *types.GetTaskListReq) (*typ
}
}
// 计算任务完成数量以及总数
hasFinishCount := 0
totalCount := 1
if t.Type == model.TASKTYPE_INVITE_USER {
if finishState >= model.TASK_PROGRESS_WAIT_REWARD {
// 如果任务状态为待领取奖励， 完成数量等于总数量
hasFinishCount = totalCount
} else {
// 分任务类型处理
switch t.Type {
case model.TASKTYPE_INVITE_USER:
totalCount = cast.ToInt(t.Param)
hasFinishCount = cast.ToInt(count)
case model.TASKTYPE_AMBASSADOR_TASK:
if isAmbassador == 0 {
if l.svcCtx.IsAmbassador(l.ctx, uint(uid), 0) {
isAmbassador = 1
} else {
isAmbassador = 2
}
}
if isAmbassador == 1 {
hasFinishCount = 1
} else {
hasFinishCount = 0
hasFinishCount = model.TASK_PROGRESS_NOT_ALLOWED
}
case model.TASKTYPE_BIND_TWITTER:
if hasBindTwitter == 0 {
if l.svcCtx.HasBindTwitter(l.ctx, uint(uid)) {
hasBindTwitter = 1
} else {
hasBindTwitter = 2
}
}
if hasBindTwitter == 1 {
hasFinishCount = 1
}
}
if finishState >= model.TASK_PROGRESS_WAIT_REWARD {
hasFinishCount = totalCount
}
// 超过数量的显示任务要求的数量即可
if hasFinishCount > totalCount {
hasFinishCount = totalCount
}
// 数量达标，且状态为未完成，则显示待校验状态
if hasFinishCount >= totalCount && finishState == model.TASK_PROGRESS_NOT_FINISHED {
finishState = model.TASK_PROGRESS_WAIT_VERIFY
}

13
internal/logic/task/verify_task_result_logic.go
View File

@@ -62,14 +62,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq)
// todo: 校验用户是否完成该任务
switch task.Type {
case model.TASKTYPE_BIND_TWITTER:
tw, err := l.svcCtx.TwitterModel.FindOneByUid(l.ctx, uint(uid))
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
return &types.VerifyTaskResultResp{Finish: false}, nil
}
if tw.TwitterId == "" {
if !l.svcCtx.HasBindTwitter(l.ctx, uint(uid)) {
return &types.VerifyTaskResultResp{Finish: false}, nil
}
case model.TASKTYPE_INVITE_USER:
@@ -91,6 +84,10 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq)
return &types.VerifyTaskResultResp{Finish: false}, nil
}
}
case model.TASKTYPE_AMBASSADOR_TASK:
if !l.svcCtx.IsAmbassador(l.ctx, uint(uid), 0) {
return &types.VerifyTaskResultResp{Finish: false}, nil
}
default:
}

29
internal/model/nh_task_ambassador_model.go Executable file
View File

@@ -0,0 +1,29 @@
package model
import "github.com/zeromicro/go-zero/core/stores/sqlx"
var _ NhTaskAmbassadorModel = (*customNhTaskAmbassadorModel)(nil)
type (
// NhTaskAmbassadorModel is an interface to be customized, add more methods here,
// and implement the added methods in customNhTaskAmbassadorModel.
NhTaskAmbassadorModel interface {
nhTaskAmbassadorModel
withSession(session sqlx.Session) NhTaskAmbassadorModel
}
customNhTaskAmbassadorModel struct {
*defaultNhTaskAmbassadorModel
}
)
// NewNhTaskAmbassadorModel returns a model for the database table.
func NewNhTaskAmbassadorModel(conn sqlx.SqlConn) NhTaskAmbassadorModel {
return &customNhTaskAmbassadorModel{
defaultNhTaskAmbassadorModel: newNhTaskAmbassadorModel(conn),
}
}
func (m *customNhTaskAmbassadorModel) withSession(session sqlx.Session) NhTaskAmbassadorModel {
return NewNhTaskAmbassadorModel(sqlx.NewSqlConnFromSession(session))
}

105
internal/model/nh_task_ambassador_model_gen.go Executable file
View File

@@ -0,0 +1,105 @@
// Code generated by goctl. DO NOT EDIT.
// versions:
// goctl version: 1.7.3
package model
import (
"context"
"database/sql"
"fmt"
"strings"
"time"
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/sqlx"
"github.com/zeromicro/go-zero/core/stringx"
)
var (
nhTaskAmbassadorFieldNames = builder.RawFieldNames(&NhTaskAmbassador{})
nhTaskAmbassadorRows = strings.Join(nhTaskAmbassadorFieldNames, ",")
nhTaskAmbassadorRowsExpectAutoSet = strings.Join(stringx.Remove(nhTaskAmbassadorFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",")
nhTaskAmbassadorRowsWithPlaceHolder = strings.Join(stringx.Remove(nhTaskAmbassadorFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?"
)
type (
nhTaskAmbassadorModel interface {
Insert(ctx context.Context, data *NhTaskAmbassador) (sql.Result, error)
FindOne(ctx context.Context, id uint) (*NhTaskAmbassador, error)
FindOneByEmailStage(ctx context.Context, email string, stage int8) (*NhTaskAmbassador, error)
Update(ctx context.Context, data *NhTaskAmbassador) error
Delete(ctx context.Context, id uint) error
}
defaultNhTaskAmbassadorModel struct {
conn sqlx.SqlConn
table string
}
NhTaskAmbassador struct {
Id uint `db:"id"`
Uid uint `db:"uid"` // 用户ID
Email string `db:"email"` // 大使邮箱
Stage int8 `db:"stage"` // 0=一期，1=二期
CreatedAt time.Time `db:"created_at"` // 创建时间
UpdatedAt time.Time `db:"updated_at"` // 修改时间
}
)
func newNhTaskAmbassadorModel(conn sqlx.SqlConn) *defaultNhTaskAmbassadorModel {
return &defaultNhTaskAmbassadorModel{
conn: conn,
table: "`nh_task_ambassador`",
}
}
func (m *defaultNhTaskAmbassadorModel) Delete(ctx context.Context, id uint) error {
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
_, err := m.conn.ExecCtx(ctx, query, id)
return err
}
func (m *defaultNhTaskAmbassadorModel) FindOne(ctx context.Context, id uint) (*NhTaskAmbassador, error) {
query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", nhTaskAmbassadorRows, m.table)
var resp NhTaskAmbassador
err := m.conn.QueryRowCtx(ctx, &resp, query, id)
switch err {
case nil:
return &resp, nil
case sqlx.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *defaultNhTaskAmbassadorModel) FindOneByEmailStage(ctx context.Context, email string, stage int8) (*NhTaskAmbassador, error) {
var resp NhTaskAmbassador
query := fmt.Sprintf("select %s from %s where `email` = ? and `stage` = ? limit 1", nhTaskAmbassadorRows, m.table)
err := m.conn.QueryRowCtx(ctx, &resp, query, email, stage)
switch err {
case nil:
return &resp, nil
case sqlx.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *defaultNhTaskAmbassadorModel) Insert(ctx context.Context, data *NhTaskAmbassador) (sql.Result, error) {
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?)", m.table, nhTaskAmbassadorRowsExpectAutoSet)
ret, err := m.conn.ExecCtx(ctx, query, data.Uid, data.Email, data.Stage)
return ret, err
}
func (m *defaultNhTaskAmbassadorModel) Update(ctx context.Context, newData *NhTaskAmbassador) error {
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, nhTaskAmbassadorRowsWithPlaceHolder)
_, err := m.conn.ExecCtx(ctx, query, newData.Uid, newData.Email, newData.Stage, newData.Id)
return err
}
func (m *defaultNhTaskAmbassadorModel) tableName() string {
return m.table
}

24
internal/model/nh_task_model.go
View File

@@ -10,18 +10,18 @@ import (
var _ NhTaskModel = (*customNhTaskModel)(nil)
const (
// 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay
TASKTYPE_FOLLOW_TWITTER = 0
TASKTYPE_BIND_TWITTER = 1
TASKTYPE_CAST_TWITTER = 2
TASKTYPE_PUBLISH_TWITTER = 3
TASKTYPE_REPOST_TWITTER = 4
TASKTYPE_WATCH_YOUTUBE = 5
TASKTYPE_FOLLOW_YOUTUBE = 6
TASKTYPE_BIND_DISCORD = 7
TASKTYPE_JOIN_TELEGRAM = 8
TASKTYPE_DAILY_PAY = 9
TASKTYPE_INVITE_USER = 10
TASKTYPE_FOLLOW_TWITTER = 0 // 关注推特任务
TASKTYPE_BIND_TWITTER = 1 // 绑定推特任务
TASKTYPE_CAST_TWITTER = 2 // 发推任务
TASKTYPE_PUBLISH_TWITTER = 3 // 发布任务
TASKTYPE_REPOST_TWITTER = 4 // 转推任务
TASKTYPE_WATCH_YOUTUBE = 5 // 观看YouTube任务
TASKTYPE_FOLLOW_YOUTUBE = 6 // 关注YouTube任务
TASKTYPE_BIND_DISCORD = 7 // 绑定Discord任务
TASKTYPE_JOIN_TELEGRAM = 8 // 加入TG群组任务
TASKTYPE_DAILY_PAY = 9 // 每日支出任务
TASKTYPE_INVITE_USER = 10 // 邀请任务
TASKTYPE_AMBASSADOR_TASK = 11 // 大使任务
)
type (

11
internal/model/nh_task_progress_model.go
View File

@@ -5,11 +5,12 @@ import "github.com/zeromicro/go-zero/core/stores/sqlx"
var _ NhTaskProgressModel = (*customNhTaskProgressModel)(nil)
const (
// 任务的阶段, 0:未完成 1:待校验 2:已完成未领取 3:已领取
TASK_PROGRESS_NOT_FINISHED = 0
TASK_PROGRESS_WAIT_VERIFY = 1
TASK_PROGRESS_WAIT_REWARD = 2
TASK_PROGRESS_REWARDED = 3
TASK_PROGRESS_NOT_ALLOWED = -1 // 任务不可参与
TASK_PROGRESS_NOT_FINISHED = 0 // 未完成
TASK_PROGRESS_WAIT_VERIFY = 1 // 待校验
TASK_PROGRESS_WAIT_REWARD = 2 // 待领取
TASK_PROGRESS_REWARDED = 3 // 已领取
)
type (

33
internal/svc/service_context.go
View File

@@ -1,6 +1,8 @@
package svc
import (
"context"
"errors"
ea "github.com/earn-alliance/earnalliance-go"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/redis"
@@ -34,6 +36,7 @@ type ServiceContext struct {
GamePitModel model.NhGamePitModel
StakePropertyModel model.NhNftStakePropertyModel
EmailRewardModel model.NhEmailRewardModel
AmbassadorModel model.NhTaskAmbassadorModel
ApiKeyCheck rest.Middleware
AdminSecretCheck rest.Middleware
@@ -68,6 +71,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
GamePitModel: model.NewNhGamePitModel(dbConn),
StakePropertyModel: model.NewNhNftStakePropertyModel(dbConn),
EmailRewardModel: model.NewNhEmailRewardModel(dbConn),
AmbassadorModel: model.NewNhTaskAmbassadorModel(dbConn),
ApiKeyCheck: middleware.NewApiKeyCheckMiddleware(configModel).Handle,
AdminSecretCheck: middleware.NewAdminSecretCheckMiddleware(configModel).Handle,
@@ -85,3 +89,32 @@ func (s *ServiceContext) Close() {
}
s.Earn.Close()
}
func (s *ServiceContext) IsAmbassador(ctx context.Context, uid uint, stage int8) bool {
u, err := s.UserModel.FindOne(ctx, uid)
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
logx.Errorw("find user error", logx.Field("err", err), logx.Field("uid", uid), logx.Field("stage", stage))
}
return false
}
_, err = s.AmbassadorModel.FindOneByEmailStage(ctx, u.Email, stage)
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
logx.Errorw("find ambassador error", logx.Field("err", err), logx.Field("uid", uid), logx.Field("stage", stage))
}
return false
}
return true
}
func (s *ServiceContext) HasBindTwitter(ctx context.Context, uid uint) bool {
tw, err := s.TwitterModel.FindOneByUid(ctx, uid)
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
logx.Errorw("find twitter error", logx.Field("err", err), logx.Field("uid", uid))
}
return false
}
return tw.TwitterId != ""
}

4
internal/types/types.go
View File

@@ -81,14 +81,14 @@ type Task struct {
Points int `json:"points"` // 任务积分
ButtonText string `json:"button_text"` // 按钮文字
Params string `json:"params"` // 参数
Type int8 `json:"type"` // 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user
Type int8 `json:"type"` // 任务类型: 0=follow_twitter,1=bind_twitter,2=cast_twitter,3=publish_twitter,4=repost_twitter,5=watch_youtube,6=follow_youtube,7=bind_discord,8=join_telegram,9=daily_pay,10=invite_user,11=ambassador_task
Url string `json:"url"` // 跳转链接
Sort int `json:"sort"` // 排序
StartAt string `json:"start_at"` // 开始时间
EndAt string `json:"end_at"` // 结束时间
HasFinishCount int `json:"has_finish_count"` // 当前完成进度
TotalCount int `json:"total_count"` // 总进度
FinishState int8 `json:"finish_state"` // 0:未完成 1:待校验 2:已完成未领取 3:已领取
FinishState int8 `json:"finish_state"` // 0:未完成 1:待校验 2:已完成未领取 3:已领取 4:不可参与
}
type TaskIdPath struct {