Client/server
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from missish/develop

Browse Source 
"feat(user/subscribe): 添加订阅折扣信息的JSON解析逻辑"
This commit is contained in:
Leif Draven 2025-06-01 22:11:04 +09:00 committed by GitHub
commit aae4a10947
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/logic/public/user/queryUserSubscribeLogic.go
View File

@ -2,6 +2,7 @@ package user
import ( import (
"context" "context"
"encoding/json"
"time" "time"
"github.com/perfect-panel/server/pkg/constant" "github.com/perfect-panel/server/pkg/constant"
@ -50,6 +51,15 @@ func (l *QueryUserSubscribeLogic) QueryUserSubscribe() (resp *types.QueryUserSub
for _, item := range data { for _, item := range data {
var sub types.UserSubscribe var sub types.UserSubscribe
tool.DeepCopy(&sub, item) tool.DeepCopy(&sub, item)
// 解析Discount字段 避免在续订时只能续订一个月
if item.Subscribe != nil && item.Subscribe.Discount != "" {
var discounts []types.SubscribeDiscount
if err := json.Unmarshal([]byte(item.Subscribe.Discount), &discounts); err == nil {
sub.Subscribe.Discount = discounts
}
}
sub.ResetTime = calculateNextResetTime(&sub) sub.ResetTime = calculateNextResetTime(&sub)
resp.List = append(resp.List, sub) resp.List = append(resp.List, sub)
} }