From af258d22070ca23d1ccf6004d40f60fa40a177aa Mon Sep 17 00:00:00 2001 From: lianghuanjie Date: Mon, 6 Jan 2025 10:39:30 +0800 Subject: [PATCH] fix: value type --- .../handler/admin/add_emial_reward_handler.go | 29 ------------------- internal/logic/task/get_task_reward_logic.go | 7 +++-- internal/model/nh_task_nft_stake_model.go | 2 +- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 internal/handler/admin/add_emial_reward_handler.go diff --git a/internal/handler/admin/add_emial_reward_handler.go b/internal/handler/admin/add_emial_reward_handler.go deleted file mode 100644 index 440d650..0000000 --- a/internal/handler/admin/add_emial_reward_handler.go +++ /dev/null @@ -1,29 +0,0 @@ -package admin - -import ( - "net/http" - - "github.com/zeromicro/go-zero/rest/httpx" - "nova_task/internal/logic/admin" - "nova_task/internal/svc" - "nova_task/internal/types" -) - -// 每日钱包签到任务 -func AddEmialRewardHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - var req types.EmailReward - if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) - return - } - - l := admin.NewAddEmialRewardLogic(r.Context(), svcCtx) - err := l.AddEmialReward(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.Ok(w) - } - } -} diff --git a/internal/logic/task/get_task_reward_logic.go b/internal/logic/task/get_task_reward_logic.go index 0a43226..34e46e0 100644 --- a/internal/logic/task/get_task_reward_logic.go +++ b/internal/logic/task/get_task_reward_logic.go @@ -3,10 +3,12 @@ package task import ( "context" "errors" + "github.com/shopspring/decimal" "github.com/spf13/cast" "github.com/zeromicro/go-zero/core/stores/sqlx" "nova_task/internal/model" "nova_task/internal/pkg/errs" + "nova_task/internal/pkg/utils" "time" "nova_task/internal/svc" @@ -31,7 +33,8 @@ func NewGetTaskRewardLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get } func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTaskRewardResp, error) { - uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"] + //uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"] + uid := utils.GetUid(l.ctx) task, err := l.svcCtx.TaskModel.FindOne(l.ctx, req.ID) if err != nil { if errors.Is(err, model.ErrNotFound) { @@ -67,7 +70,7 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas return err } // 给予用户奖励 - err = l.svcCtx.TaskAssetModel.WithSession(session).AddPoint(l.ctx, uid, task.Points) + err = l.svcCtx.TaskAssetModel.WithSession(session).AddPoint(l.ctx, uint(uid), decimal.NewFromInt(int64(task.Points))) if err != nil { return err } diff --git a/internal/model/nh_task_nft_stake_model.go b/internal/model/nh_task_nft_stake_model.go index 15a63ca..8ded933 100755 --- a/internal/model/nh_task_nft_stake_model.go +++ b/internal/model/nh_task_nft_stake_model.go @@ -87,7 +87,7 @@ func (m *customNhTaskNftStakeModel) StakeNft(ctx context.Context, uid uint, role Operate: 1, }) if err != nil { - logx.Errorw("insert stake log failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("tokenId", token), logx.Field("role", roleId)) + logx.Errorw("insert stake log failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("tokenId", tokenId), logx.Field("role", roleId)) } return nil }