From 4f2e8527a8291de558c78d82ee7cf285d76b028f Mon Sep 17 00:00:00 2001 From: jager Date: Thu, 29 May 2025 15:51:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=AF=E5=88=86=E8=B4=A8=E6=8A=BC?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/api/stakepoint.api | 5 +++-- doc/swagger/nova.json | 11 +++++++++-- .../logic/stakepoint/get_stake_level_list_logic.go | 14 ++++++++++---- internal/types/types.go | 5 +++-- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/doc/api/stakepoint.api b/doc/api/stakepoint.api index 22a98cf..eaad5d0 100644 --- a/doc/api/stakepoint.api +++ b/doc/api/stakepoint.api @@ -38,11 +38,12 @@ type StakeLevel { Id int `json:"id"` Title string `json:"title"` // 档位标题 Level int `json:"level"` // 精灵等级 + ElfName string `json:"elf_name"` // 精灵名称 Points int `json:"points"` // 积分数量 Days float64 `json:"days"` // 质押天数 RenewDays float64 `json:"renew_days"` // 续期天数 - StartTime string `json:"start_time"` // 开始时间 - EndTime string `json:"end_time"` // 结束时间 + StartTime int64 `json:"start_time"` // 开始时间 + EndTime int64 `json:"end_time"` // 结束时间 CanRenew bool `json:"can_renew"` // 是否可续约 } diff --git a/doc/swagger/nova.json b/doc/swagger/nova.json index 4a82c0a..ce4fbdf 100644 --- a/doc/swagger/nova.json +++ b/doc/swagger/nova.json @@ -1596,6 +1596,10 @@ "format": "int32", "description": " 精灵等级" }, + "elf_name": { + "type": "string", + "description": " 精灵名称" + }, "points": { "type": "integer", "format": "int32", @@ -1612,11 +1616,13 @@ "description": " 续期天数" }, "start_time": { - "type": "string", + "type": "integer", + "format": "int64", "description": " 开始时间" }, "end_time": { - "type": "string", + "type": "integer", + "format": "int64", "description": " 结束时间" }, "can_renew": { @@ -1630,6 +1636,7 @@ "id", "title", "level", + "elf_name", "points", "days", "renew_days", diff --git a/internal/logic/stakepoint/get_stake_level_list_logic.go b/internal/logic/stakepoint/get_stake_level_list_logic.go index fecb064..76bebd2 100644 --- a/internal/logic/stakepoint/get_stake_level_list_logic.go +++ b/internal/logic/stakepoint/get_stake_level_list_logic.go @@ -75,12 +75,14 @@ func (l *GetStakeLevelListLogic) GetStakeLevelList(req *types.GetStakeLevelListR days float64 renewDays float64 canRenew bool + elfName string ) for _, lv := range lvs { if lv.Id == stake.LevelId { title = lv.Title level = int(lv.Level) points = int(lv.Points) + elfName = lv.ElfName days = lv.Days.InexactFloat64() renewDays = lv.RenewDays.InexactFloat64() canRenew = stake.EndTime.Sub(time.Now()) <= time.Duration(lv.RenewDays.Mul(decimal.NewFromInt(int64(time.Hour*24))).IntPart()) && stake.Status == model.PointsStakeStatusStaking @@ -94,10 +96,11 @@ func (l *GetStakeLevelListLogic) GetStakeLevelList(req *types.GetStakeLevelListR Title: title, Level: level, Points: points, + ElfName: elfName, Days: days, RenewDays: renewDays, - StartTime: stake.StartTime.Format(time.DateTime), - EndTime: stake.EndTime.Format(time.DateTime), + StartTime: stake.StartTime.Unix(), + EndTime: stake.EndTime.Unix(), CanRenew: canRenew, } } @@ -116,11 +119,13 @@ func (l *GetStakeLevelListLogic) GetStakeLevelList(req *types.GetStakeLevelListR points int days float64 renewDays float64 + elfName string ) for _, lv := range lvs { if lv.Id == stk.LevelId { title = lv.Title level = int(lv.Level) + elfName = lv.ElfName points = int(lv.Points) days = lv.Days.InexactFloat64() renewDays = lv.RenewDays.InexactFloat64() @@ -131,11 +136,12 @@ func (l *GetStakeLevelListLogic) GetStakeLevelList(req *types.GetStakeLevelListR Id: int(stk.LevelId), Title: title, Level: level, + ElfName: elfName, Points: points, Days: days, RenewDays: renewDays, - StartTime: stk.StartTime.Format(time.DateTime), - EndTime: stk.EndTime.Format(time.DateTime), + StartTime: stk.StartTime.Unix(), + EndTime: stk.EndTime.Unix(), CanRenew: false, } } diff --git a/internal/types/types.go b/internal/types/types.go index 7c72964..3574f8e 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -164,11 +164,12 @@ type StakeLevel struct { Id int `json:"id"` Title string `json:"title"` // 档位标题 Level int `json:"level"` // 精灵等级 + ElfName string `json:"elf_name"` // 精灵名称 Points int `json:"points"` // 积分数量 Days float64 `json:"days"` // 质押天数 RenewDays float64 `json:"renew_days"` // 续期天数 - StartTime string `json:"start_time"` // 开始时间 - EndTime string `json:"end_time"` // 结束时间 + StartTime int64 `json:"start_time"` // 开始时间 + EndTime int64 `json:"end_time"` // 结束时间 CanRenew bool `json:"can_renew"` // 是否可续约 }