From ed629f515fc214b69ca14a6c02fd02ed38b01a10 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Tue, 21 Oct 2025 09:38:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=A2=AB=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index d8a5dba..d4e2864 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -94,6 +94,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun Where("rn.name IS NOT NULL"). Where("u.deleted_at = 0"). Where("bb.month = ?", req.Month). + Where("bor.deleted_at IS NULL"). Order("bor.expiration_time desc") if req.UserName != "" { if utils.IsPhoneNumber(req.UserName) { From 23e3d3371fded53856449b88b4f554bfb0423281 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Tue, 21 Oct 2025 09:59:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=A9=E5=B1=95=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index d4e2864..8880e60 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -367,9 +367,14 @@ func ExtendBundleBalanceByUserId(data model.BundleBalanceExtendPo) error { if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", data.UserId).Order("created_at desc").First(&oldData).Error; err != nil { return errors.New("用户还没有套餐信息") } + oldData.ManualAccountNumber += data.AccountNumber + oldData.MonthlyNewAccountNumber += data.AccountNumber oldData.ManualImageNumber += data.ImageNumber + oldData.MonthlyNewManualImageNumber += data.ImageNumber oldData.ManualDataAnalysisNumber += data.DataAnalysisNumber + oldData.MonthlyNewManualDataAnalysisNumber += data.DataAnalysisNumber oldData.ManualVideoNumber += data.VideoNumber + oldData.MonthlyNewManualVideoNumber += data.VideoNumber oldData.MonthlyNewDurationNumber += data.DurationNumber // 记录本月新增手动扩展时长 oldData.ExpiredAt.Add(time.Hour * 24 * time.Duration(data.DurationNumber)) return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&oldData).Error