From 7367bf1639b90dd1cdc54606cf009405ee075d58 Mon Sep 17 00:00:00 2001
From: lzh <1625167628@qq.com>
Date: Mon, 16 Jun 2025 09:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=87=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BD=BF=E7=94=A8=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/dao/bundleExtend.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go
index d904441..3d63e02 100644
--- a/internal/dao/bundleExtend.go
+++ b/internal/dao/bundleExtend.go
@@ -24,11 +24,14 @@ func AddBundleExtendRecord(data model.BundleExtensionRecords) error {
 			if err := tx.Model(&model.BundleOrderRecords{}).Where(&model.BundleOrderRecords{CustomerID: strconv.Itoa(data.UserId)}).First(&record).Error; err != nil {
 				return err
 			}
-
-			expireTime, err := time.Parse(time.DateOnly, record.ExpirationTime)
-			if err != nil {
-				return err
+			var expireTime time.Time
+			if record.ExpirationTime != "" {
+				et, _ := time.Parse(time.DateOnly, record.ExpirationTime)
+				expireTime = et
+			} else {
+				expireTime = time.Now()
 			}
+
 			switch data.TimeUnit {
 			case 1:
 				expireTime = datetime.AddDay(expireTime, int64(data.AvailableDurationAdditional))
@@ -40,8 +43,7 @@ func AddBundleExtendRecord(data model.BundleExtensionRecords) error {
 				return errors.New("时间单位有误")
 			}
 			record.ExpirationTime = expireTime.Format(time.DateOnly)
-			err = tx.Model(&model.BundleOrderRecords{}).Where(&model.BundleOrderRecords{UUID: record.UUID}).Updates(&record).Error
-			return err
+			return tx.Model(&model.BundleOrderRecords{}).Where(&model.BundleOrderRecords{UUID: record.UUID}).Updates(&record).Error
 		}
 		return nil
 	})