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-15 11:47:34 +08:00
commit ff08d4618e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/dao/bundleMetrics.go
View File

@ -962,7 +962,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
// 手动扩套餐总数统计 // 手动扩套餐总数统计
func manualIncreaseBundleBalance(startTime string, endTime string, bundleUUID string) (data model.ManualIncreaseBundleBalance, err error) { func manualIncreaseBundleBalance(startTime string, endTime string, bundleUUID string) (data model.ManualIncreaseBundleBalance, err error) {
quary := app.ModuleClients.BundleDB.Model(&model.BundleExtensionRecords{}). quary := app.ModuleClients.BundleDB.Model(&model.BundleExtensionRecords{}).
Select("SUM(account_additional) as total_account_additional, SUM(video_additional) as total_video_additional, SUM(images_additional) as total_image_additional, SUM(data_additional) as total_data_analysis_additional"). Select("SUM(account_additional) as total_account_additional, SUM(video_additional) as total_video_additional, SUM(images_additional) as total_image_additional, SUM(data_additional) as total_data_analysis_additional, SUM(competitive_additional) as total_competitive_additional").
Where("bundle_extension_records.type = 1"). Where("bundle_extension_records.type = 1").
Where("bundle_extension_records.deleted_at is null") Where("bundle_extension_records.deleted_at is null")
if startTime != "" { if startTime != "" {
@ -1114,6 +1114,7 @@ func getBalanceInfo(month string, bundleUUID string) (data BalanceInfo) { // 获
data.Video = bundle.Video + increase.Video data.Video = bundle.Video + increase.Video
data.Image = bundle.Image + increase.Image data.Image = bundle.Image + increase.Image
data.DataAnalysis = bundle.DataAnalysis + increase.DataAnalysis data.DataAnalysis = bundle.DataAnalysis + increase.DataAnalysis
data.Competitive = bundle.Competitive + increase.Competitive
return return
} }