增加社区列表接口，任务相关接口修改

internal/logic/task/get_community_list_logic.go

@@ -0,0 +1,48 @@
+package task
+
+import (
+	"context"
+	"nova_task/internal/pkg/errs"
+
+	"nova_task/internal/svc"
+	"nova_task/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetCommunityListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+// 获取社区列表
+func NewGetCommunityListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetCommunityListLogic {
+	return &GetCommunityListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetCommunityListLogic) GetCommunityList() (*types.GetCommunityListResp, error) {
+	cs, err := l.svcCtx.CommunityModel.All(l.ctx)
+	if err != nil {
+		l.Errorw("get community list error", logx.Field("err", err))
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
+	}
+
+	var communityList []types.Community
+	for _, c := range cs {
+		communityList = append(communityList, types.Community{
+			Id:          c.Id,
+			Title:       c.Title,
+			Logo:        c.Logo,
+			Description: c.Description,
+			StartAt:     c.StartAt.Time.Unix(),
+			EndAt:       c.EndAt.Time.Unix(),
+		})
+	}
+
+	return &types.GetCommunityListResp{CommunityList: communityList}, nil
+}

internal/logic/task/get_task_list_logic.go

@@ -33,7 +33,12 @@ func (l *GetTaskListLogic) GetTaskList(uid int, req *types.GetTaskListReq) (*typ
 	tasks, err := l.svcCtx.TaskModel.FindTasksByCommunity(l.ctx, req.CommunityId)
 	if err != nil {
 		l.Errorw("get task list failed", logx.Field("err", err), logx.Field("communityId", req.CommunityId))
-		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
+	}
+
+	count, err := l.svcCtx.PromoteBindModel.UserInviteCount(l.ctx, uint(uid))
+	if err != nil {
+		l.Errorw("get user invite count failed", logx.Field("err", err), logx.Field("uid", uid))
 	}
 
 	resp := &types.GetTaskListResp{}
@@ -44,25 +49,46 @@ func (l *GetTaskListLogic) GetTaskList(uid int, req *types.GetTaskListReq) (*typ
 		}
 		var finishState int8
 		if uid > 0 {
-			tp, err := l.svcCtx.TaskProgressModel.FindOneByUidTaskIdTaskSeq(l.ctx, uid, t.CommunityId, taskSeq)
+			tp, err := l.svcCtx.TaskProgressModel.FindOneByUidTaskIdTaskSeq(l.ctx, uid, t.Id, taskSeq)
 			if err == nil {
 				finishState = tp.Stage
 			}
 		}
 
+		hasFinishCount := 0
+		totalCount := 1
+		if t.Type == model.TASKTYPE_INVITE_USER {
+			totalCount = cast.ToInt(t.Param)
+			hasFinishCount = cast.ToInt(count)
+		}
+		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
+		}
+
 		resp.Tasks = append(resp.Tasks, types.Task{
-			Id:          t.Id,
-			Title:       t.Title,
-			SubTitle:    t.SubTitle,
-			Description: t.Description,
-			Points:      t.Points,
-			ButtonText:  t.ButtonText,
-			Type:        t.Type,
-			Url:         t.Url,
-			StartAt:     t.StartAt.Time.Format(time.DateTime),
-			EndAt:       t.EndAt.Time.Format(time.DateTime),
-			Status:      t.Status,
-			FinishState: finishState,
+			Id:             t.Id,
+			Title:          t.Title,
+			SubTitle:       t.SubTitle,
+			Description:    t.Description,
+			Points:         t.Points,
+			ButtonText:     t.ButtonText,
+			Params:         t.Param,
+			Type:           t.Type,
+			Url:            t.Url,
+			StartAt:        t.StartAt.Time.Format(time.DateTime),
+			EndAt:          t.EndAt.Time.Format(time.DateTime),
+			Sort:           t.Sort,
+			HasFinishCount: hasFinishCount,
+			TotalCount:     totalCount,
+			FinishState:    finishState,
 		})
 	}
 

internal/logic/task/get_task_reward_logic.go

@@ -35,9 +35,9 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
 	task, err := l.svcCtx.TaskModel.FindOne(l.ctx, req.ID)
 	if err != nil {
 		if errors.Is(err, model.ErrNotFound) {
-			return nil, errs.BadRequest(errs.ErrTaskNotFound, "task not found")
+			return nil, errs.New(errs.ErrTaskNotFound, "task not found")
 		}
-		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
 	}
 	var taskSeq int
 	if task.Type == model.TASKTYPE_DAILY_PAY {
@@ -47,15 +47,15 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
 	if err != nil {
 		if !errors.Is(err, model.ErrNotFound) {
 			l.Errorw("find task progress error", logx.Field("err", err))
-			return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+			return nil, errs.New(errs.ErrDatabaseOperate, err)
 		}
-		return nil, errs.BadRequest(errs.ErrTaskNotFinished, "task not finished")
+		return nil, errs.New(errs.ErrTaskNotFinished, "task not finished")
 	}
 	switch {
 	case tp.Stage < model.TASK_PROGRESS_WAIT_REWARD:
-		return nil, errs.BadRequest(errs.ErrTaskNotFinished, "task not finished")
+		return nil, errs.New(errs.ErrTaskNotFinished, "task not finished")
 	case tp.Stage > model.TASK_PROGRESS_WAIT_REWARD:
-		return nil, errs.BadRequest(errs.ErrTaskAlreadyReward, "task already reward")
+		return nil, errs.New(errs.ErrTaskAlreadyReward, "task already reward")
 	}
 
 	// 修改状态,增加积分和记录都在事物中执行
@@ -85,7 +85,7 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
 
 	if err != nil {
 		l.Errorw("给予用户奖励实物执行失败", logx.Field("err", err), logx.Field("task", task.Id), logx.Field("uid", uid))
-		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
 	}
 
 	return &types.GetTaskRewardResp{Points: task.Points}, nil

internal/logic/task/verify_task_result_logic.go

@@ -27,14 +27,14 @@ func NewVerifyTaskResultLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
-func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.VerifyTaskResultResp, error) {
+func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq) (*types.VerifyTaskResultResp, error) {
 	uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"]
 	task, err := l.svcCtx.TaskModel.FindOne(l.ctx, req.ID)
 	if err != nil {
 		if errors.Is(err, model.ErrNotFound) {
-			return nil, errs.BadRequest(errs.ErrTaskNotFound, "task not found")
+			return nil, errs.New(errs.ErrTaskNotFound, "task not found")
 		}
-		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
 	}
 	var taskSeq int
 	if task.Type == model.TASKTYPE_DAILY_PAY {
@@ -44,7 +44,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 	if err != nil {
 		if !errors.Is(err, model.ErrNotFound) {
 			l.Errorw("find task progress error", logx.Field("err", err))
-			return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+			return nil, errs.New(errs.ErrDatabaseOperate, err)
 		}
 		tp = &model.NhTaskProgress{
 			Uid:     uid,
@@ -54,7 +54,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 		}
 	}
 	if tp.Stage == model.TASK_PROGRESS_REWARDED {
-		return nil, errs.BadRequest(errs.ErrTaskAlreadyReward, "task already reward")
+		return nil, errs.New(errs.ErrTaskAlreadyReward, "task already reward")
 	}
 	// todo: 校验用户是否完成该任务
 	switch task.Type {
@@ -62,7 +62,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 		tw, err := l.svcCtx.TwitterModel.FindOneByUid(l.ctx, uint(uid))
 		if err != nil {
 			if !errors.Is(err, model.ErrNotFound) {
-				return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+				return nil, errs.New(errs.ErrDatabaseOperate, err)
 			}
 			return &types.VerifyTaskResultResp{Finish: false}, nil
 		}
@@ -72,6 +72,9 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 
 	case model.TASKTYPE_BIND_DISCORD:
 	case model.TASKTYPE_DAILY_PAY:
+		if req.Params == "" {
+			return &types.VerifyTaskResultResp{Finish: false}, nil
+		}
 	default:
 	}
 
@@ -84,7 +87,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 
 	if err != nil {
 		l.Errorw("update task progress error", logx.Field("err", err))
-		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
+		return nil, errs.New(errs.ErrDatabaseOperate, err)
 	}
 
 	return &types.VerifyTaskResultResp{Finish: true}, nil