Merge branch 'feat-cjy-taskBench' into dev

internal/dao/taskBalanceSync.go

@@ -344,10 +344,10 @@ func copyBundleToTaskBalance(tb *model.TaskBalance, bb *model.BundleBalance) {
 	tb.TaskIncreaseLimitVideoConsumptionNumber = bb.IncreaseLimitVideoConsumptionNumber
 	tb.TaskBundleLimitVideoExpiredConsumptionNumber = bb.BundleLimitVideoExpiredConsumptionNumber
 	tb.TaskIncreaseLimitVideoExpiredConsumptionNumber = bb.IncreaseLimitVideoExpiredConsumptionNumber
-	tb.TaskMonthlyLimitVideoNumber = bb.MonthlyLimitVideoNumber
+	tb.TaskMonthlyLimitVideoNumber = bb.MonthlyBundleLimitVideoNumber + bb.MonthlyIncreaseLimitVideoNumber
-	tb.TaskMonthlyLimitVideoConsumptionNumber = bb.MonthlyLimitVideoConsumptionNumber
+	tb.TaskMonthlyLimitVideoConsumptionNumber = bb.MonthlyBundleLimitVideoConsumptionNumber + bb.MonthlyIncreaseLimitVideoConsumptionNumber
-	tb.TaskMonthlyLimitVideoExpireNumber = bb.MonthlyLimitVideoExpireNumber
+	tb.TaskMonthlyLimitVideoExpireNumber = bb.MonthlyBundleLimitExpiredVideoNumber + bb.MonthlyIncreaseLimitExpiredVideoNumber
-	tb.TaskMonthlyLimitVideoExpireConsumptionNumber = bb.MonthlyLimitVideoExpireConsumptionNumber
+	tb.TaskMonthlyLimitVideoExpireConsumptionNumber = bb.MonthlyBundleLimitExpiredVideoConsumptionNumber + bb.MonthlyIncreaseLimitExpiredVideoConsumptionNumber
 	tb.TaskMonthlyBundleVideoConsumptionNumber = bb.MonthlyBundleVideoConsumptionNumber
 	tb.TaskMonthlyIncreaseVideoConsumptionNumber = bb.MonthlyIncreaseVideoConsumptionNumber
 	tb.TaskMonthlyLimitVideoQuotaNumber = bb.MonthlyLimitVideoQuotaNumber
@@ -374,10 +374,10 @@ func copyBundleToTaskBalance(tb *model.TaskBalance, bb *model.BundleBalance) {
 	tb.TaskIncreaseLimitImageConsumptionNumber = bb.IncreaseLimitImageConsumptionNumber
 	tb.TaskBundleLimitImageExpiredConsumptionNumber = bb.BundleLimitImageExpiredConsumptionNumber
 	tb.TaskIncreaseLimitImageExpiredConsumptionNumber = bb.IncreaseLimitImageExpiredConsumptionNumber
-	tb.TaskMonthlyLimitImageNumber = bb.MonthlyLimitImageNumber
+	tb.TaskMonthlyLimitImageNumber = bb.MonthlyBundleLimitImageConsumptionNumber + bb.MonthlyIncreaseLimitImageNumber
-	tb.TaskMonthlyLimitImageConsumptionNumber = bb.MonthlyLimitImageConsumptionNumber
+	tb.TaskMonthlyLimitImageConsumptionNumber = bb.MonthlyBundleLimitImageConsumptionNumber + bb.MonthlyIncreaseLimitImageConsumptionNumber
-	tb.TaskMonthlyLimitImageExpireNumber = bb.MonthlyLimitImageExpireNumber
+	tb.TaskMonthlyLimitImageExpireNumber = bb.MonthlyBundleLimitExpiredImageNumber + bb.MonthlyIncreaseLimitExpiredImageNumber
-	tb.TaskMonthlyLimitImageExpireConsumptionNumber = bb.MonthlyLimitImageExpireConsumptionNumber
+	tb.TaskMonthlyLimitImageExpireConsumptionNumber = bb.MonthlyBundleLimitExpiredImageConsumptionNumber + bb.MonthlyIncreaseLimitExpiredImageConsumptionNumber
 	tb.TaskMonthlyBundleImageConsumptionNumber = bb.MonthlyBundleImageConsumptionNumber
 	tb.TaskMonthlyIncreaseImageConsumptionNumber = bb.MonthlyIncreaseImageConsumptionNumber
 	tb.TaskMonthlyLimitImageQuotaNumber = bb.MonthlyLimitImageQuotaNumber
@@ -404,10 +404,10 @@ func copyBundleToTaskBalance(tb *model.TaskBalance, bb *model.BundleBalance) {
 	tb.TaskIncreaseLimitDataAnalysisConsumptionNumber = bb.IncreaseLimitDataAnalysisConsumptionNumber
 	tb.TaskBundleLimitDataAnalysisExpiredConsumptionNumber = bb.BundleLimitDataAnalysisExpiredConsumptionNumber
 	tb.TaskIncreaseLimitDataAnalysisExpiredConsumptionNumber = bb.IncreaseLimitDataAnalysisExpiredConsumptionNumber
-	tb.TaskMonthlyLimitDataAnalysisNumber = bb.MonthlyLimitDataAnalysisNumber
+	tb.TaskMonthlyLimitDataAnalysisNumber = bb.MonthlyBundleLimitDataAnalysisNumber + bb.MonthlyIncreaseLimitDataAnalysisNumber
-	tb.TaskMonthlyLimitDataAnalysisConsumptionNumber = bb.MonthlyLimitDataAnalysisConsumptionNumber
+	tb.TaskMonthlyLimitDataAnalysisConsumptionNumber = bb.MonthlyBundleLimitDataAnalysisConsumptionNumber + bb.MonthlyIncreaseLimitDataAnalysisConsumptionNumber
-	tb.TaskMonthlyLimitDataAnalysisExpireNumber = bb.MonthlyLimitDataAnalysisExpireNumber
+	tb.TaskMonthlyLimitDataAnalysisExpireNumber = bb.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber + bb.MonthlyIncreaseLimitExpiredDataAnalysisNumber
-	tb.TaskMonthlyLimitDataAnalysisExpireConsumptionNumber = bb.MonthlyLimitDataAnalysisExpireConsumptionNumber
+	tb.TaskMonthlyLimitDataAnalysisExpireConsumptionNumber = bb.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber + bb.MonthlyIncreaseLimitExpiredDataAnalysisConsumptionNumber
 	tb.TaskMonthlyBundleDataAnalysisConsumptionNumber = bb.MonthlyBundleDataAnalysisConsumptionNumber
 	tb.TaskMonthlyIncreaseDataAnalysisConsumptionNumber = bb.MonthlyIncreaseDataAnalysisConsumptionNumber
 	tb.TaskMonthlyLimitDataAnalysisQuotaNumber = bb.MonthlyLimitDataAnalysisQuotaNumber