From 5ad32026269f544cecfdac2ea964c83eda686a9a Mon Sep 17 00:00:00 2001
From: missish <2445921920@qq.com>
Date: Sun, 1 Jun 2025 14:20:57 +0800
Subject: [PATCH] =?UTF-8?q?"feat(user/subscribe):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=8A=98=E6=89=A3=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?JSON=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91"=20=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9C=A8=E7=BB=AD=E8=AE=A2=E6=97=B6=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E7=BB=AD=E8=AE=A2=E4=B8=80=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/public/user/queryUserSubscribeLogic.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/internal/logic/public/user/queryUserSubscribeLogic.go b/internal/logic/public/user/queryUserSubscribeLogic.go
index 1fa95c7..a8c7863 100644
--- a/internal/logic/public/user/queryUserSubscribeLogic.go
+++ b/internal/logic/public/user/queryUserSubscribeLogic.go
@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"encoding/json"
 	"time"
 
 	"github.com/perfect-panel/server/pkg/constant"
@@ -50,6 +51,15 @@ func (l *QueryUserSubscribeLogic) QueryUserSubscribe() (resp *types.QueryUserSub
 	for _, item := range data {
 		var sub types.UserSubscribe
 		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)
 		resp.List = append(resp.List, sub)
 	}