From e170a086afe25faa9f4100c6b5281304634d70d4 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Fri, 16 Jan 2026 11:42:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Updata=EF=BC=9A=E4=BF=AE=E6=AD=A3sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleMetrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index 9bfa0fa..d11cf33 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -876,7 +876,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund Joins("left join cast_work_analysis_extra cwae on cwae.analysis_uuid = cwa.uuid AND cwae.deleted_at = 0"). Where("cwa.submit_time <= ?", req.End+" 23:59:59"). Where("cwae.cost_type in ?", []int{2, 3}). // 增值类型 - Where("cwa.deleted_at = 0 and cwe.deleted_at = 0"). + Where("cwa.deleted_at = 0 and cwae.deleted_at = 0"). Count(&totalUploadedIncreaseDataAnalysisCount) //====================竞品数======================= From 54296dd70abded77029fdb957c67b41f1dfbda52 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Mon, 19 Jan 2026 09:36:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Updata=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=89=A9=E5=B1=95=E8=AE=A1=E8=B4=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index d8d102e..5626473 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -202,7 +202,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualAccountConsumptionNumber < oldData.ManualAccountNumber { // 最后消耗手动扩展的 oldData.ManualAccountConsumptionNumber++ oldData.MonthlyManualAccountConsumptionNumber++ - usedType = 3 + usedType = 2 goto Over } return errors.New("账号数不足") @@ -210,7 +210,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualAccountConsumptionNumber > 0 { // 最后消耗手动扩展的 oldData.ManualAccountConsumptionNumber-- oldData.MonthlyManualAccountConsumptionNumber-- - usedType = 3 + usedType = 2 goto Over } if oldData.IncreaseAccountConsumptionNumber > 0 { @@ -269,14 +269,13 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualVideoConsumptionNumber < oldData.ManualVideoNumber { // 手动扩展类型充足 oldData.ManualVideoConsumptionNumber++ oldData.MonthlyManualVideoConsumptionNumber++ // 记录本月使用的手动扩展 - usedType = 3 + usedType = 2 goto Over } return errors.New("可用视频数不足") } if data.ImageNumber > 0 { - // 当月可使用的会过期的限制类型充足 // 当月可使用的会过期的限制类型充足 if oldData.MonthlyBundleLimitExpiredImageConsumptionNumber < oldData.MonthlyBundleLimitExpiredImageNumber { // 套餐内会过期的限制类型图片充足 oldData.MonthlyBundleLimitExpiredImageConsumptionNumber++ @@ -320,14 +319,13 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualImageConsumptionNumber < oldData.ManualImageNumber { // 手动扩展类型充足 oldData.ManualImageConsumptionNumber++ oldData.MonthlyManualImageConsumptionNumber++ // 记录本月使用的手动扩展 - usedType = 3 + usedType = 2 goto Over } return errors.New("可用图文数不足") } if data.DataAnalysisNumber > 0 { - // 当月可使用的会过期的限制类型充足 // 当月可使用的会过期的限制类型充足 if oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber < oldData.MonthlyBundleLimitExpiredDataAnalysisNumber { // 套餐内会过期的限制类型数据分析充足 oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber++ @@ -371,7 +369,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualDataAnalysisConsumptionNumber < oldData.ManualDataAnalysisNumber { // 手动扩展类型充足 oldData.ManualDataAnalysisConsumptionNumber++ oldData.MonthlyManualDataAnalysisConsumptionNumber++ // 记录本月使用的手动扩展 - usedType = 3 + usedType = 2 goto Over } return errors.New("可用数据分析数不足") @@ -417,7 +415,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err if oldData.ManualCompetitiveConsumptionNumber < oldData.ManualCompetitiveNumber { // 手动扩展类型充足 oldData.ManualCompetitiveConsumptionNumber++ oldData.MonthlyManualCompetitiveConsumptionNumber++ // 记录本月使用的手动扩展 - usedType = 3 + usedType = 2 goto Over } return errors.New("可用竞品数不足")