fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-Competitors#A203' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-01-19 09:37:46 +08:00
commit bd8bd41a2c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/dao/bundleExtend.go
View File

@ -202,7 +202,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualAccountConsumptionNumber < oldData.ManualAccountNumber { // 最后消耗手动扩展的 if oldData.ManualAccountConsumptionNumber < oldData.ManualAccountNumber { // 最后消耗手动扩展的
oldData.ManualAccountConsumptionNumber++ oldData.ManualAccountConsumptionNumber++
oldData.MonthlyManualAccountConsumptionNumber++ oldData.MonthlyManualAccountConsumptionNumber++
usedType = 3 usedType = 2
goto Over goto Over
} }
return errors.New("账号数不足") return errors.New("账号数不足")
@ -210,7 +210,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualAccountConsumptionNumber > 0 { // 最后消耗手动扩展的 if oldData.ManualAccountConsumptionNumber > 0 { // 最后消耗手动扩展的
oldData.ManualAccountConsumptionNumber-- oldData.ManualAccountConsumptionNumber--
oldData.MonthlyManualAccountConsumptionNumber-- oldData.MonthlyManualAccountConsumptionNumber--
usedType = 3 usedType = 2
goto Over goto Over
} }
if oldData.IncreaseAccountConsumptionNumber > 0 { if oldData.IncreaseAccountConsumptionNumber > 0 {
@ -269,14 +269,13 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualVideoConsumptionNumber < oldData.ManualVideoNumber { // 手动扩展类型充足 if oldData.ManualVideoConsumptionNumber < oldData.ManualVideoNumber { // 手动扩展类型充足
oldData.ManualVideoConsumptionNumber++ oldData.ManualVideoConsumptionNumber++
oldData.MonthlyManualVideoConsumptionNumber++ // 记录本月使用的手动扩展 oldData.MonthlyManualVideoConsumptionNumber++ // 记录本月使用的手动扩展
usedType = 3 usedType = 2
goto Over goto Over
} }
return errors.New("可用视频数不足") return errors.New("可用视频数不足")
} }
if data.ImageNumber > 0 { if data.ImageNumber > 0 {
// 当月可使用的会过期的限制类型充足
// 当月可使用的会过期的限制类型充足 // 当月可使用的会过期的限制类型充足
if oldData.MonthlyBundleLimitExpiredImageConsumptionNumber < oldData.MonthlyBundleLimitExpiredImageNumber { // 套餐内会过期的限制类型图片充足 if oldData.MonthlyBundleLimitExpiredImageConsumptionNumber < oldData.MonthlyBundleLimitExpiredImageNumber { // 套餐内会过期的限制类型图片充足
oldData.MonthlyBundleLimitExpiredImageConsumptionNumber++ oldData.MonthlyBundleLimitExpiredImageConsumptionNumber++
@ -320,14 +319,13 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualImageConsumptionNumber < oldData.ManualImageNumber { // 手动扩展类型充足 if oldData.ManualImageConsumptionNumber < oldData.ManualImageNumber { // 手动扩展类型充足
oldData.ManualImageConsumptionNumber++ oldData.ManualImageConsumptionNumber++
oldData.MonthlyManualImageConsumptionNumber++ // 记录本月使用的手动扩展 oldData.MonthlyManualImageConsumptionNumber++ // 记录本月使用的手动扩展
usedType = 3 usedType = 2
goto Over goto Over
} }
return errors.New("可用图文数不足") return errors.New("可用图文数不足")
} }
if data.DataAnalysisNumber > 0 { if data.DataAnalysisNumber > 0 {
// 当月可使用的会过期的限制类型充足
// 当月可使用的会过期的限制类型充足 // 当月可使用的会过期的限制类型充足
if oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber < oldData.MonthlyBundleLimitExpiredDataAnalysisNumber { // 套餐内会过期的限制类型数据分析充足 if oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber < oldData.MonthlyBundleLimitExpiredDataAnalysisNumber { // 套餐内会过期的限制类型数据分析充足
oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber++ oldData.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber++
@ -371,7 +369,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualDataAnalysisConsumptionNumber < oldData.ManualDataAnalysisNumber { // 手动扩展类型充足 if oldData.ManualDataAnalysisConsumptionNumber < oldData.ManualDataAnalysisNumber { // 手动扩展类型充足
oldData.ManualDataAnalysisConsumptionNumber++ oldData.ManualDataAnalysisConsumptionNumber++
oldData.MonthlyManualDataAnalysisConsumptionNumber++ // 记录本月使用的手动扩展 oldData.MonthlyManualDataAnalysisConsumptionNumber++ // 记录本月使用的手动扩展
usedType = 3 usedType = 2
goto Over goto Over
} }
return errors.New("可用数据分析数不足") return errors.New("可用数据分析数不足")
@ -417,7 +415,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
if oldData.ManualCompetitiveConsumptionNumber < oldData.ManualCompetitiveNumber { // 手动扩展类型充足 if oldData.ManualCompetitiveConsumptionNumber < oldData.ManualCompetitiveNumber { // 手动扩展类型充足
oldData.ManualCompetitiveConsumptionNumber++ oldData.ManualCompetitiveConsumptionNumber++
oldData.MonthlyManualCompetitiveConsumptionNumber++ // 记录本月使用的手动扩展 oldData.MonthlyManualCompetitiveConsumptionNumber++ // 记录本月使用的手动扩展
usedType = 3 usedType = 2
goto Over goto Over
} }
return errors.New("可用竞品数不足") return errors.New("可用竞品数不足")

2
internal/dao/bundleMetrics.go
View File

@ -877,7 +877,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"). 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("cwa.submit_time <= ?", req.End+" 23:59:59").
Where("cwae.cost_type in ?", []int{2, 3}). // 增值类型 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) Count(&totalUploadedIncreaseDataAnalysisCount)
//====================竞品数======================= //====================竞品数=======================