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

modify: 手动结算软质押奖励支持指定日期

Browse Source
This commit is contained in:
lianghuanjie
2025-01-13 11:04:27 +08:00
parent 70848daafc
commit 76d7cbf575
7 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/handler/admin/stake_settle_handler.go
View File

@@ -6,13 +6,20 @@ import (
"github.com/zeromicro/go-zero/rest/httpx"
"nova_task/internal/logic/admin"
"nova_task/internal/svc"
"nova_task/internal/types"
)
// 软质压手动结算
func StakeSettleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.StakeSettleReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return
}
l := admin.NewStakeSettleLogic(r.Context(), svcCtx)
err := l.StakeSettle()
err := l.StakeSettle(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {

6
internal/job/stake_settle/cron.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/zeromicro/go-zero/core/logx"
"nova_task/internal/logic/nft"
"nova_task/internal/svc"
"time"
)
type Cron struct {
@@ -25,7 +26,8 @@ func (c *Cron) Spec() string {
}
func (c *Cron) Run() {
logx.Debugw("run settle cron task")
date := time.Now().AddDate(0, 0, -1).Format(time.DateOnly)
logx.Debugw("run settle cron task", logx.Field("settle-date", date))
lg := nft.NewStakeSettleLogic(c.ctx, c.svcCtx)
lg.StakeSettle()
lg.StakeSettle(date)
}

5
internal/logic/admin/stake_settle_logic.go
View File

@@ -7,6 +7,7 @@ import (
"nova_task/internal/logic/nft"
"nova_task/internal/pkg/errs"
"nova_task/internal/svc"
"nova_task/internal/types"
)
type StakeSettleLogic struct {
@@ -24,10 +25,10 @@ func NewStakeSettleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Stake
}
}
func (l *StakeSettleLogic) StakeSettle() error {
func (l *StakeSettleLogic) StakeSettle(req *types.StakeSettleReq) error {
threading.GoSafe(func() {
lg := nft.NewStakeSettleLogic(context.Background(), l.svcCtx)
lg.StakeSettle()
lg.StakeSettle(req.Date)
})
return errs.Success()

49
internal/logic/nft/stake_settle_logic.go
View File

@@ -2,51 +2,60 @@ package nft
import (
"context"
"errors"
"github.com/shopspring/decimal"
"github.com/spf13/cast"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/sqlx"
"nova_task/internal/consts"
"nova_task/internal/model"
"nova_task/internal/pkg/utils"
"nova_task/internal/svc"
"time"
)
type StakeSettleLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewStakeSettleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *StakeSettleLogic {
return &StakeSettleLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *StakeSettleLogic) StakeSettle() {
start, end, err := l.svcCtx.ConfigModel.GetNftStakeTaskOpenDate(l.ctx)
func (l *StakeSettleLogic) StakeSettle(date string) {
l.Infow("start stake settle", logx.Field("date", date))
tt, err := time.ParseInLocation(time.DateOnly, date, time.Local)
if err != nil {
logx.Errorw("get nft stake task open date failed", logx.Field("err", err))
l.Errorw("parse date failed", logx.Field("err", err), logx.Field("date", date))
return
}
start = start.AddDate(0, 0, 1)
end = end.AddDate(0, 0, 1)
now := time.Now()
if now.Before(start) || now.After(end) {
logx.Infow("now is not in the date range", logx.Field("now", now), logx.Field("start", start), logx.Field("end", end))
start, end, err := l.svcCtx.ConfigModel.GetNftStakeTaskOpenDate(l.ctx)
if err != nil {
l.Errorw("get nft stake task open date failed", logx.Field("err", err))
return
}
//start = start.AddDate(0, 0, 1)
//end = end.AddDate(0, 0, 1)
if tt.Before(start) || tt.After(end) {
l.Infow("now is not in the date range", logx.Field("now", tt), logx.Field("start", start), logx.Field("end", end))
return
}
taskConf, err := l.svcCtx.ConfigModel.GetNftStakeTaskConf(l.ctx)
if err != nil {
logx.Errorw("get nft stake task conf failed", logx.Field("err", err))
l.Errorw("get nft stake task conf failed", logx.Field("err", err))
return
}
stakes, err := l.svcCtx.StakeNftModel.AllStakeNft(l.ctx)
if err != nil {
logx.Errorw("get all stake nft failed", logx.Field("err", err))
l.Errorw("get all stake nft failed", logx.Field("err", err))
return
}
@@ -57,18 +66,18 @@ func (l *StakeSettleLogic) StakeSettle() {
}
nftHolder, err := l.svcCtx.NftHolderModel.FindOneByTokenId(l.ctx, s.TokenId)
if err != nil {
logx.Errorw("find nft holder failed", logx.Field("err", err), logx.Field("tokenId", s.TokenId))
l.Errorw("find nft holder failed", logx.Field("err", err), logx.Field("tokenId", s.TokenId))
continue
}
uid, err := l.svcCtx.WalletModel.FindUidByAddress(l.ctx, nftHolder.Address)
if err != nil {
logx.Errorw("find uid by address failed", logx.Field("err", err), logx.Field("address", nftHolder.Address))
l.Errorw("find uid by address failed", logx.Field("err", err), logx.Field("address", nftHolder.Address))
continue
}
if uid != s.Uid {
logx.Errorw("uid not match", logx.Field("uid", s.Uid), logx.Field("nftHolderUid", uid))
l.Errorw("uid not match", logx.Field("uid", s.Uid), logx.Field("nftHolderUid", uid))
continue
}
@@ -82,7 +91,7 @@ func (l *StakeSettleLogic) StakeSettle() {
// 二测质押未提取的用户
oldStakeNfts, err := l.svcCtx.OldStakeNftModel.AllStakeNft(l.ctx)
if err != nil {
logx.Errorw("get all old stake nft failed", logx.Field("err", err))
l.Errorw("get all old stake nft failed", logx.Field("err", err))
} else {
for _, s := range oldStakeNfts {
if utils.IsBigTarot(cast.ToString(s.TokenId)) {
@@ -93,11 +102,11 @@ func (l *StakeSettleLogic) StakeSettle() {
}
}
awardSeq := cast.ToInt(time.Now().AddDate(0, 0, -1).Format("20060102"))
awardSeq := cast.ToInt(tt.Format("20060102"))
for uid, tokens := range uid2tokens {
coefficient, err := l.svcCtx.StakeRewardModel.GetRandomCoefficientByUid(l.ctx, uid, awardSeq, taskConf.MinCoefficient, taskConf.MaxCoefficient)
if err != nil {
logx.Errorw("get random coefficient failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq))
l.Errorw("get random coefficient failed", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq))
continue
}
tokensDecimal := decimal.NewFromFloat(tokens)
@@ -120,7 +129,13 @@ func (l *StakeSettleLogic) StakeSettle() {
})
if err != nil {
logx.Errorw("质押结算发放奖励失败", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
if errors.Is(err, model.ErrNoRowUpdate) {
l.Infow("质押结算已发放奖励，无需重复发放", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
} else {
l.Errorw("质押结算发放奖励失败", logx.Field("err", err), logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
}
} else {
l.Infow("质押结算发放奖励成功", logx.Field("uid", uid), logx.Field("awardSeq", awardSeq), logx.Field("coefficient", coefficient), logx.Field("tokens", tokens), logx.Field("reward", reward))
}
}
}

4
internal/types/types.go
View File

@@ -89,6 +89,10 @@ type StakeRewardList struct {
RewardList []StakeReward `json:"reward_list"`
}
type StakeSettleReq struct {
Date string `form:"date"`
}
type StakeTaskDetail struct {
StartDate string `json:"start_date"` // 开始日期
EndDate string `json:"end_date"` // 结束日期