From 32a9bb828335f46c242947dfaf8c7c0db25ad7ff Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Fri, 26 Dec 2025 16:51:16 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E4=BF=AE=E6=AD=A3=E5=A5=97?= =?UTF-8?q?=E9=A4=90=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/bundleExtendLogic.go | 12 +++++++----- pkg/msg/msg.go | 6 ++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go index f67f030..ca915fa 100644 --- a/internal/logic/bundleExtendLogic.go +++ b/internal/logic/bundleExtendLogic.go @@ -11,6 +11,8 @@ import ( "strconv" "time" + "micro-bundle/pkg/msg" + "dubbo.apache.org/dubbo-go/v3/common/logger" "github.com/jinzhu/copier" "github.com/samber/lo" @@ -194,16 +196,16 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle. if data.Activate != 2 { return nil, errors.New("套餐未激活") } - var bundleStatus int32 - if data.ExpiredTime < time.Now().Format("2006-01-02 15:04:05") { - bundleStatus = 1 + var IsExpired int32 + if data.ExpiredAt.Before(time.Now()) { + IsExpired = msg.IsExpired //已过期 } else { - bundleStatus = 0 + IsExpired = msg.NotExpired //未过期 } result := &bundle.GetBundleBalanceByUserIdResp{ OrderUUID: data.OrderUUID, BundleName: data.BundleName, - BundleStatus: bundleStatus, + BundleStatus: IsExpired, PayTime: data.StartAt.UnixMilli(), ExpiredTime: data.ExpiredAt.UnixMilli(), PaymentAmount: data.PaymentAmount, diff --git a/pkg/msg/msg.go b/pkg/msg/msg.go index 4ac5216..1a7e38d 100644 --- a/pkg/msg/msg.go +++ b/pkg/msg/msg.go @@ -120,3 +120,9 @@ const ( AccountService = 4 //账号数 AvailableTimeService = 5 //可用时长 ) + +// 套餐状态 +const ( + IsExpired = 1 //已过期 + NotExpired = 0 //未过期 +)