From 76d7cbf575ebc51a29594efedd468da765f92bbe Mon Sep 17 00:00:00 2001 From: lianghuanjie Date: Mon, 13 Jan 2025 11:04:27 +0800 Subject: [PATCH] =?UTF-8?q?modify:=20=E6=89=8B=E5=8A=A8=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E8=BD=AF=E8=B4=A8=E6=8A=BC=E5=A5=96=E5=8A=B1=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/api/admin.api | 6 ++- doc/swagger/nova.json | 23 +++++++++ .../handler/admin/stake_settle_handler.go | 9 +++- internal/job/stake_settle/cron.go | 6 ++- internal/logic/admin/stake_settle_logic.go | 5 +- internal/logic/nft/stake_settle_logic.go | 49 ++++++++++++------- internal/types/types.go | 4 ++ 7 files changed, 79 insertions(+), 23 deletions(-) diff --git a/doc/api/admin.api b/doc/api/admin.api index 8d03ddc..e37b3b9 100644 --- a/doc/api/admin.api +++ b/doc/api/admin.api @@ -16,7 +16,7 @@ service novatask { @doc "软质压手动结算" @handler StakeSettle - get /stake_settle + get /stake_settle (StakeSettleReq) @doc "NFT持有者更新" @handler NftHolderUpdate @@ -34,3 +34,7 @@ type EmailReward { Remark string `json:"remark"` // 备注 } +type StakeSettleReq { + Date string `form:"date"` +} + diff --git a/doc/swagger/nova.json b/doc/swagger/nova.json index 628dcbf..0a96b7f 100644 --- a/doc/swagger/nova.json +++ b/doc/swagger/nova.json @@ -94,8 +94,19 @@ "schema": {} } }, + "parameters": [ + { + "name": "date", + "in": "query", + "required": true, + "type": "string" + } + ], "tags": [ "admin" + ], + "consumes": [ + "multipart/form-data" ] } }, @@ -932,6 +943,18 @@ "reward_list" ] }, + "StakeSettleReq": { + "type": "object", + "properties": { + "date": { + "type": "string" + } + }, + "title": "StakeSettleReq", + "required": [ + "date" + ] + }, "StakeTaskDetail": { "type": "object", "properties": { diff --git a/internal/handler/admin/stake_settle_handler.go b/internal/handler/admin/stake_settle_handler.go index ab51c7d..16103a4 100644 --- a/internal/handler/admin/stake_settle_handler.go +++ b/internal/handler/admin/stake_settle_handler.go @@ -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 { diff --git a/internal/job/stake_settle/cron.go b/internal/job/stake_settle/cron.go index 1e6019a..8d96d17 100644 --- a/internal/job/stake_settle/cron.go +++ b/internal/job/stake_settle/cron.go @@ -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) } diff --git a/internal/logic/admin/stake_settle_logic.go b/internal/logic/admin/stake_settle_logic.go index 4e792cd..7be676b 100644 --- a/internal/logic/admin/stake_settle_logic.go +++ b/internal/logic/admin/stake_settle_logic.go @@ -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() diff --git a/internal/logic/nft/stake_settle_logic.go b/internal/logic/nft/stake_settle_logic.go index 0be5af1..b4b8a8e 100644 --- a/internal/logic/nft/stake_settle_logic.go +++ b/internal/logic/nft/stake_settle_logic.go @@ -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)) } } } diff --git a/internal/types/types.go b/internal/types/types.go index aef2330..910b7d5 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -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"` // 结束日期