From 5ad941704259322b420e19d5f58e21d3fbe3e366 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Mon, 5 Jan 2026 11:23:55 +0800 Subject: [PATCH] =?UTF-8?q?Updata:=E5=AF=BC=E5=87=BA=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=AB=9E=E5=93=81=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/bundleExtendLogic.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go index 6b2f937..41dab50 100644 --- a/internal/logic/bundleExtendLogic.go +++ b/internal/logic/bundleExtendLogic.go @@ -147,6 +147,21 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl MonthlyIncreaseDataAnalysisNumber: int32(m.IncreaseDataAnalysisNumber) - int32(m.IncreaseDataAnalysisConsumptionNumber) + int32(m.MonthlyIncreaseLimitDataAnalysisNumber) + int32(m.MonthlyIncreaseLimitExpiredDataAnalysisNumber), MonthlyInvalidBundleDataAnalysisNumber: int32(m.MonthlyInvalidBundleDataAnalysisNumber), MonthlyInvalidIncreaseDataAnalysisNumber: int32(m.MonthlyInvalidIncreaseDataAnalysisNumber), + //竞品数 + BundleCompetitiveNumber: int32(m.BundleCompetitiveNumber) + int32(m.BundleLimitCompetitiveNumber) + int32(m.BundleLimitCompetitiveExpiredNumber), + IncreaseCompetitiveNumber: int32(m.IncreaseCompetitiveNumber) + int32(m.IncreaseLimitCompetitiveNumber) + int32(m.IncreaseLimitCompetitiveExpiredNumber), + BundleCompetitiveConsumptionNumber: int32(m.BundleCompetitiveConsumptionNumber) + int32(m.BundleLimitCompetitiveConsumptionNumber) + int32(m.BundleLimitCompetitiveExpiredConsumptionNumber), + IncreaseCompetitiveConsumptionNumber: int32(m.IncreaseCompetitiveConsumptionNumber) + int32(m.IncreaseLimitCompetitiveConsumptionNumber) + int32(m.IncreaseLimitCompetitiveExpiredConsumptionNumber), + InvalidBundleCompetitiveNumber: int32(m.InvalidBundleCompetitiveNumber), + InvalidIncreaseCompetitiveNumber: int32(m.InvalidIncreaseCompetitiveNumber), + MonthlyNewBundleCompetitiveNumber: int32(cal(m.BundleBalance, m.BundleLimitCompetitiveNumber, m.MonthlyLimitCompetitiveQuotaNumber, date) + cal(m.BundleBalance, m.BundleLimitCompetitiveExpiredNumber, m.MonthlyLimitCompetitiveQuotaNumber, date)), + MonthlyNewIncreaseCompetitiveNumber: int32(cal(m.BundleBalance, m.IncreaseLimitCompetitiveNumber, m.MonthlyLimitCompetitiveQuotaNumber, date) + cal(m.BundleBalance, m.IncreaseLimitCompetitiveExpiredNumber, m.MonthlyLimitCompetitiveQuotaNumber, date)), + MonthBundleCompetitiveConsumptionNumber: int32(m.MonthlyBundleCompetitiveConsumptionNumber) + int32(m.MonthlyBundleLimitCompetitiveConsumptionNumber) + int32(m.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber), + MonthIncreaseCompetitiveConsumptionNumber: int32(m.MonthlyIncreaseCompetitiveConsumptionNumber) + int32(m.MonthlyIncreaseLimitCompetitiveConsumptionNumber) + int32(m.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber), + MonthlyBundleCompetitiveNumber: int32(m.BundleCompetitiveNumber) - int32(m.BundleCompetitiveConsumptionNumber) + int32(m.MonthlyBundleLimitCompetitiveNumber) + int32(m.MonthlyBundleLimitExpiredCompetitiveNumber) - int32(m.MonthlyBundleLimitCompetitiveConsumptionNumber), + MonthlyIncreaseCompetitiveNumber: int32(m.IncreaseCompetitiveNumber) - int32(m.IncreaseCompetitiveConsumptionNumber) + int32(m.MonthlyIncreaseLimitCompetitiveNumber) + int32(m.MonthlyIncreaseLimitExpiredCompetitiveNumber), + MonthlyInvalidBundleCompetitiveNumber: int32(m.MonthlyInvalidBundleCompetitiveNumber), + MonthlyInvalidIncreaseCompetitiveNumber: int32(m.MonthlyInvalidIncreaseCompetitiveNumber), // 手动扩展类 MonthlyNewManualAccountNumber: int32(m.MonthlyNewAccountNumber), MonthlyNewManualVideoNumber: int32(m.MonthlyNewManualVideoNumber), @@ -174,6 +189,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl result.MonthlyNewIncreaseImageNumber += int32(m.IncreaseImageNumber) result.MonthlyNewBundleDataAnalysisNumber += int32(m.BundleDataAnalysisNumber) result.MonthlyNewIncreaseDataAnalysisNumber += int32(m.IncreaseDataAnalysisNumber) + result.MonthlyNewBundleCompetitiveNumber += int32(m.BundleCompetitiveNumber) + result.MonthlyNewIncreaseCompetitiveNumber += int32(m.IncreaseCompetitiveNumber) } if result.Activate != 2 { // 除了等于0的情况 result.Activate = 1