完善任务接口逻辑以及Eran事件上报接入

internal/logic/task/get_task_list_logic.go

@@ -29,8 +29,7 @@ func NewGetTaskListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetTa
 }
 
 func (l *GetTaskListLogic) GetTaskList(req *types.GetTaskListReq) (*types.GetTaskListResp, error) {
-	uid := cast.ToInt(l.ctx.Value("uid"))
-
+	uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"]
 	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))

internal/logic/task/get_task_reward_logic.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"github.com/spf13/cast"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"nova_task/internal/model"
 	"nova_task/internal/pkg/errs"
 	"time"
@@ -29,8 +30,8 @@ func NewGetTaskRewardLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
 	}
 }
 
-func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (resp *types.GetTaskRewardResp, err error) {
-	uid := cast.ToInt(l.ctx.Value("uid"))
+func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTaskRewardResp, 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) {
@@ -57,22 +58,35 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (resp *types.G
 		return nil, errs.BadRequest(errs.ErrTaskAlreadyReward, "task already reward")
 	}
 
-	// 给予用户奖励
-	err = l.svcCtx.TaskAssetModel.AddUserPoint(l.ctx, uid, task.Points)
+	// 修改状态,增加积分和记录都在事物中执行
+	err = l.svcCtx.DBConn.TransactCtx(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 修改状态
+		tp.Stage = model.TASK_PROGRESS_REWARDED
+		err = l.svcCtx.TaskProgressModel.WithSession(session).Update(l.ctx, tp)
+		if err != nil {
+			return err
+		}
+		// 给予用户奖励
+		err = l.svcCtx.TaskAssetModel.WithSession(session).AddUserPoint(l.ctx, uid, task.Points)
+		if err != nil {
+			return err
+		}
+		// 记录用户获奖记录
+		_, err = l.svcCtx.TaskAssetRecordModel.Insert(l.ctx, &model.NhTaskAssetRecord{
+			Uid:        uid,
+			EventId:    uint64(task.Id),
+			AssetField: "points",
+			Count:      float64(task.Points),
+			Remark:     "完成任务：" + task.Title,
+			CreateTime: int(time.Now().Unix()),
+		})
+		return err
+	})
+
 	if err != nil {
-		l.Errorw("add user point error", logx.Field("err", err))
+		l.Errorw("给予用户奖励实物执行失败", logx.Field("err", err), logx.Field("task", task.Id), logx.Field("uid", uid))
 		return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
 	}
 
-	// 记录用户获奖记录
-	_, err = l.svcCtx.TaskAssetRecordModel.Insert(l.ctx, &model.NhTaskAssetRecord{
-		Uid:        uid,
-		EventId:    uint64(task.Id),
-		AssetField: "points",
-		Count:      float64(task.Points),
-		Remark:     task.Title,
-		CreateTime: int(time.Now().Unix()),
-	})
-
-	return
+	return &types.GetTaskRewardResp{Points: task.Points}, nil
 }

internal/logic/task/verify_task_result_logic.go

@@ -28,7 +28,7 @@ func NewVerifyTaskResultLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.VerifyTaskResultResp, error) {
-	uid := cast.ToInt(l.ctx.Value("uid"))
+	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) {
@@ -59,6 +59,17 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
 	// 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.InternalServer(errs.ErrDatabaseOperate, err)
+			}
+			return &types.VerifyTaskResultResp{Finish: false}, nil
+		}
+		if tw.TwitterId == "" {
+			return &types.VerifyTaskResultResp{Finish: false}, nil
+		}
+
 	case model.TASKTYPE_BIND_DISCORD:
 	case model.TASKTYPE_DAILY_PAY:
 	default: