Updata:解决冲突

internal/dao/bundleExtend.go

@@ -320,7 +320,7 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
 			if oldData.ManualImageConsumptionNumber < oldData.ManualImageNumber { // 手动扩展类型充足
 				oldData.ManualImageConsumptionNumber++
 				oldData.MonthlyManualImageConsumptionNumber++ // 记录本月使用的手动扩展
-				usedType = 2
+				usedType = 3
 				goto Over
 			}
 			return errors.New("可用图文数不足")
@@ -371,11 +371,57 @@ func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err
 			if oldData.ManualDataAnalysisConsumptionNumber < oldData.ManualDataAnalysisNumber { // 手动扩展类型充足
 				oldData.ManualDataAnalysisConsumptionNumber++
 				oldData.MonthlyManualDataAnalysisConsumptionNumber++ // 记录本月使用的手动扩展
-				usedType = 2
+				usedType = 3
 				goto Over
 			}
 			return errors.New("可用数据分析数不足")
 		}
+		if data.CompetitiveNumber > 0 {
+			// 当月可使用的会过期的限制类型充足
+			if oldData.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber < oldData.MonthlyBundleLimitExpiredCompetitiveNumber { // 套餐内会过期的限制类型竞品数充足
+				oldData.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber++
+				oldData.BundleLimitCompetitiveExpiredConsumptionNumber++
+				usedType = 1
+				goto Over
+			}
+			if oldData.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber < oldData.MonthlyIncreaseLimitExpiredCompetitiveNumber { // 增值服务会过期的限制类型竞品数充足
+				oldData.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber++
+				oldData.IncreaseLimitCompetitiveExpiredConsumptionNumber++
+				usedType = 2
+				goto Over
+			}
+			if oldData.MonthlyBundleLimitCompetitiveConsumptionNumber < oldData.MonthlyBundleLimitCompetitiveNumber { // 套餐内限制类型竞品数充足
+				oldData.MonthlyBundleLimitCompetitiveConsumptionNumber++
+				oldData.BundleLimitCompetitiveConsumptionNumber++
+				usedType = 1
+				goto Over
+			}
+			if oldData.MonthlyIncreaseLimitCompetitiveConsumptionNumber < oldData.MonthlyIncreaseLimitCompetitiveNumber { // 增值服务限制类型竞品数充足
+				oldData.MonthlyIncreaseLimitCompetitiveConsumptionNumber++
+				oldData.IncreaseLimitCompetitiveConsumptionNumber++
+				usedType = 2
+				goto Over
+			}
+			if oldData.BundleLimitCompetitiveNumber < oldData.BundleCompetitiveNumber { //套餐内非限制类型的竞品数充足
+				oldData.BundleLimitCompetitiveNumber++
+				oldData.MonthlyBundleCompetitiveConsumptionNumber++
+				usedType = 1
+				goto Over
+			}
+			if oldData.IncreaseCompetitiveConsumptionNumber < oldData.IncreaseCompetitiveNumber { //增值服务非限制类型的竞品数充足
+				oldData.IncreaseCompetitiveConsumptionNumber++
+				oldData.MonthlyIncreaseCompetitiveConsumptionNumber++
+				usedType = 2
+				goto Over
+			}
+			if oldData.ManualCompetitiveConsumptionNumber < oldData.ManualCompetitiveNumber { // 手动扩展类型充足
+				oldData.ManualCompetitiveConsumptionNumber++
+				oldData.MonthlyManualCompetitiveConsumptionNumber++ // 记录本月使用的手动扩展
+				usedType = 3
+				goto Over
+			}
+			return errors.New("可用竞品数不足")
+		}
 	Over:
 		return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&oldData).Error
 	})
@@ -400,6 +446,8 @@ func ExtendBundleBalanceByUserId(data model.BundleBalanceExtendPo) error {
 		oldData.MonthlyNewManualDataAnalysisNumber += data.DataAnalysisNumber
 		oldData.ManualVideoNumber += data.VideoNumber
 		oldData.MonthlyNewManualVideoNumber += data.VideoNumber
+		oldData.ManualCompetitiveNumber += data.CompetitiveNumber
+		oldData.MonthlyNewManualCompetitiveNumber += data.CompetitiveNumber
 		oldData.MonthlyNewDurationNumber += data.DurationNumber // 记录本月新增手动扩展时长
 		oldData.ExpiredAt = oldData.ExpiredAt.Add(time.Hour * 24 * time.Duration(data.DurationNumber))
 		return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&oldData).Error
@@ -659,6 +707,10 @@ inner join (
 		v.MonthlyInvalidBundleDataAnalysisNumber = v.MonthlyBundleLimitExpiredDataAnalysisNumber - v.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber // 当月过期的数据分析数
 		// 历史失效的套餐权益数据分析总数
 		v.InvalidBundleDataAnalysisNumber += v.MonthlyInvalidBundleDataAnalysisNumber
+		// 当月过期的竞品数
+		v.MonthlyInvalidBundleCompetitiveNumber = v.MonthlyBundleLimitExpiredCompetitiveNumber - v.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber
+		// 历史失效的套餐权益竞品数总数
+		v.InvalidBundleCompetitiveNumber += v.MonthlyInvalidBundleCompetitiveNumber
 
 		// 当月失效的增值权益视频总数
 		v.MonthlyInvalidIncreaseVideoNumber = v.MonthlyIncreaseLimitExpiredVideoNumber - v.MonthlyIncreaseLimitExpiredVideoConsumptionNumber
@@ -672,6 +724,10 @@ inner join (
 		v.MonthlyInvalidIncreaseDataAnalysisNumber = v.MonthlyIncreaseLimitExpiredDataAnalysisNumber - v.MonthlyIncreaseLimitExpiredDataAnalysisConsumptionNumber
 		// 历史失效的增值权益数据分析总数
 		v.InvalidIncreaseDataAnalysisNumber += v.MonthlyInvalidIncreaseDataAnalysisNumber
+		// 当月失效的增值权益竞品数总数
+		v.MonthlyInvalidIncreaseCompetitiveNumber = v.MonthlyIncreaseLimitExpiredCompetitiveNumber - v.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber
+		// 历史失效的增值权益竞品数总数
+		v.InvalidIncreaseCompetitiveNumber += v.MonthlyInvalidIncreaseCompetitiveNumber
 
 		// 当月套餐限制类会过期型视频可使用额度
 		v.MonthlyBundleLimitExpiredVideoNumber = cal(v.BundleLimitVideoExpiredNumber, v.MonthlyLimitVideoQuotaNumber)
@@ -681,6 +737,7 @@ inner join (
 		v.MonthlyBundleLimitVideoNumber = v.MonthlyBundleLimitVideoNumber - v.MonthlyBundleLimitVideoConsumptionNumber + cal(v.BundleLimitVideoNumber, v.MonthlyLimitVideoQuotaNumber)
 		// 当月增值限制类型视频可使用额度
 		v.MonthlyIncreaseLimitVideoNumber = v.MonthlyIncreaseLimitVideoNumber - v.MonthlyIncreaseLimitVideoConsumptionNumber + cal(v.IncreaseLimitVideoNumber, v.MonthlyLimitVideoQuotaNumber)
+
 		// 当月套餐限制类会过期型图片可使用额度
 		v.MonthlyBundleLimitExpiredImageNumber = cal(v.BundleLimitImageExpiredNumber, v.MonthlyLimitImageQuotaNumber)
 		// 当月增值限制类会过期型图片可使用额度
@@ -689,16 +746,27 @@ inner join (
 		v.MonthlyBundleLimitImageNumber = v.MonthlyBundleLimitImageNumber - v.MonthlyBundleLimitImageConsumptionNumber + cal(v.BundleLimitImageNumber, v.MonthlyLimitImageQuotaNumber)
 		// 当月增值限制类型图片可使用额度
 		v.MonthlyIncreaseLimitImageNumber = v.MonthlyIncreaseLimitImageNumber - v.MonthlyIncreaseLimitImageConsumptionNumber + cal(v.IncreaseLimitImageNumber, v.MonthlyLimitImageQuotaNumber)
+
 		// 当月套餐限制类会过期型数据分析可使用额度
 		v.MonthlyBundleLimitExpiredDataAnalysisNumber = cal(v.BundleLimitDataAnalysisExpiredNumber, v.MonthlyLimitDataAnalysisQuotaNumber)
 		// 当月增值限制类会过期型数据分析可使用额度
 		v.MonthlyIncreaseLimitExpiredDataAnalysisNumber = cal(v.IncreaseLimitDataAnalysisExpiredNumber, v.MonthlyLimitDataAnalysisQuotaNumber)
 		// 当月套餐限制类型数据分析可使用额度
-		v.MonthlyBundleLimitDataAnalysisNumber = v.MonthlyBundleLimitDataAnalysisNumber - v.MonthlyBundleLimitDataAnalysisConsumptionNumber + cal(v.BundleLimitImageNumber, v.MonthlyLimitImageQuotaNumber)
+		v.MonthlyBundleLimitDataAnalysisNumber = v.MonthlyBundleLimitDataAnalysisNumber - v.MonthlyBundleLimitDataAnalysisConsumptionNumber + cal(v.BundleLimitDataAnalysisNumber, v.MonthlyLimitDataAnalysisQuotaNumber)
 		// 当月增值限制类型数据分析可使用额度
-		v.MonthlyIncreaseLimitDataAnalysisNumber = v.MonthlyIncreaseLimitDataAnalysisNumber - v.MonthlyIncreaseLimitDataAnalysisConsumptionNumber + cal(v.IncreaseLimitImageNumber, v.MonthlyLimitImageQuotaNumber)
+		v.MonthlyIncreaseLimitDataAnalysisNumber = v.MonthlyIncreaseLimitDataAnalysisNumber - v.MonthlyIncreaseLimitDataAnalysisConsumptionNumber + cal(v.IncreaseLimitDataAnalysisNumber, v.MonthlyLimitDataAnalysisQuotaNumber)
+
+		// 当月套餐限制类会过期型竞品数可使用额度
+		v.MonthlyBundleLimitExpiredCompetitiveNumber = cal(v.BundleLimitCompetitiveExpiredNumber, v.MonthlyLimitCompetitiveQuotaNumber)
+		// 当月增值限制类会过期型竞品数可使用额度
+		v.MonthlyIncreaseLimitExpiredCompetitiveNumber = cal(v.IncreaseLimitCompetitiveExpiredNumber, v.MonthlyLimitCompetitiveQuotaNumber)
+		// 当月套餐限制类型竞品数可使用额度
+		v.MonthlyBundleLimitCompetitiveNumber = v.MonthlyBundleLimitCompetitiveNumber - v.MonthlyBundleLimitCompetitiveConsumptionNumber + cal(v.BundleLimitCompetitiveNumber, v.MonthlyLimitCompetitiveQuotaNumber)
+		// 当月增值限制类型竞品数可使用额度
+		v.MonthlyIncreaseLimitCompetitiveNumber = v.MonthlyIncreaseLimitCompetitiveNumber - v.MonthlyIncreaseLimitCompetitiveConsumptionNumber + cal(v.IncreaseLimitCompetitiveNumber, v.MonthlyLimitCompetitiveQuotaNumber)
 
 		// 重置单月消耗数量
+		//视频
 		v.MonthlyBundleVideoConsumptionNumber = 0
 		v.MonthlyIncreaseVideoConsumptionNumber = 0
 		v.MonthlyBundleLimitVideoConsumptionNumber = 0
@@ -707,6 +775,7 @@ inner join (
 		v.MonthlyIncreaseLimitExpiredVideoConsumptionNumber = 0
 		v.MonthlyNewManualVideoNumber = 0
 		v.MonthlyManualVideoConsumptionNumber = 0
+		//图文
 		v.MonthlyBundleImageConsumptionNumber = 0
 		v.MonthlyIncreaseImageConsumptionNumber = 0
 		v.MonthlyBundleLimitImageConsumptionNumber = 0
@@ -715,6 +784,7 @@ inner join (
 		v.MonthlyIncreaseLimitExpiredImageConsumptionNumber = 0
 		v.MonthlyNewManualImageNumber = 0
 		v.MonthlyManualImageConsumptionNumber = 0
+		//数据分析
 		v.MonthlyBundleDataAnalysisConsumptionNumber = 0
 		v.MonthlyIncreaseDataAnalysisConsumptionNumber = 0
 		v.MonthlyBundleLimitDataAnalysisConsumptionNumber = 0
@@ -723,6 +793,15 @@ inner join (
 		v.MonthlyIncreaseLimitExpiredDataAnalysisConsumptionNumber = 0
 		v.MonthlyNewManualDataAnalysisNumber = 0
 		v.MonthlyManualDataAnalysisConsumptionNumber = 0
+		//竞品数
+		v.MonthlyBundleCompetitiveConsumptionNumber = 0
+		v.MonthlyIncreaseCompetitiveConsumptionNumber = 0
+		v.MonthlyBundleLimitCompetitiveConsumptionNumber = 0
+		v.MonthlyIncreaseLimitCompetitiveConsumptionNumber = 0
+		v.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber = 0
+		v.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber = 0
+		v.MonthlyNewManualCompetitiveNumber = 0
+		v.MonthlyManualCompetitiveConsumptionNumber = 0
 
 		v.Month = month
 		v.ID = 0

internal/logic/bundleExtendLogic.go

@@ -42,6 +42,7 @@ func BundleExtend(req *bundle.BundleExtendRequest) (*bundle.BundleExtendResponse
 			ImageNumber:        int(req.ImagesAdditional),
 			DataAnalysisNumber: int(req.DataAdditional),
 			AccountNumber:      int(req.AccountAdditional),
+			CompetitiveNumber:  int(req.CompetitiveAdditional),
 			DurationNumber:     durationNumber,
 		}); err != nil {
 			return nil, errors.New("用户没有余量信息")
@@ -230,6 +231,11 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
 		DataAnalysisExtendConsumptionNumber: int32(data.MonthlyBundleLimitDataAnalysisConsumptionNumber) + int32(data.MonthlyIncreaseLimitDataAnalysisConsumptionNumber) + int32(data.MonthlyBundleLimitExpiredDataAnalysisConsumptionNumber) + int32(data.MonthlyIncreaseLimitExpiredDataAnalysisConsumptionNumber) + int32(data.ManualDataAnalysisConsumptionNumber) + int32(data.IncreaseDataAnalysisConsumptionNumber) + int32(data.BundleDataAnalysisConsumptionNumber),
 		DataAnalysisAdditional:              int32(data.ManualDataAnalysisNumber),
 		DataAnalysisConsumptionNumber:       int32(data.BundleDataAnalysisConsumptionNumber) + int32(data.BundleLimitDataAnalysisConsumptionNumber) + int32(data.BundleLimitDataAnalysisExpiredConsumptionNumber) + int32(data.IncreaseDataAnalysisConsumptionNumber) + int32(data.IncreaseLimitDataAnalysisConsumptionNumber) + int32(data.IncreaseLimitDataAnalysisExpiredConsumptionNumber) + int32(data.ManualDataAnalysisConsumptionNumber),
+		CompetitiveNumber:                   int32(data.BundleCompetitiveNumber) + int32(data.BundleLimitCompetitiveNumber) + int32(data.BundleLimitCompetitiveExpiredNumber) + int32(data.IncreaseCompetitiveNumber) + int32(data.IncreaseLimitCompetitiveNumber) + int32(data.IncreaseLimitCompetitiveExpiredNumber) + int32(data.ManualCompetitiveNumber),
+		CompetitiveExtendNumber:             int32(data.MonthlyBundleLimitCompetitiveNumber) + int32(data.MonthlyIncreaseLimitCompetitiveNumber) + int32(data.MonthlyBundleLimitExpiredCompetitiveNumber) + int32(data.MonthlyIncreaseLimitExpiredCompetitiveNumber) + int32(data.ManualCompetitiveNumber) + int32(data.IncreaseCompetitiveNumber) + int32(data.BundleCompetitiveNumber),
+		CompetitiveExtendConsumptionNumber:  int32(data.MonthlyBundleLimitCompetitiveConsumptionNumber) + int32(data.MonthlyIncreaseLimitCompetitiveConsumptionNumber) + int32(data.MonthlyBundleLimitExpiredCompetitiveConsumptionNumber) + int32(data.MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber) + int32(data.ManualCompetitiveConsumptionNumber) + int32(data.IncreaseCompetitiveConsumptionNumber) + int32(data.BundleCompetitiveConsumptionNumber),
+		CompetitiveAdditional:               int32(data.ManualCompetitiveNumber),
+		CompetitiveConsumptionNumber:        int32(data.BundleCompetitiveConsumptionNumber) + int32(data.BundleLimitCompetitiveConsumptionNumber) + int32(data.BundleLimitCompetitiveExpiredConsumptionNumber) + int32(data.IncreaseCompetitiveConsumptionNumber) + int32(data.IncreaseLimitCompetitiveConsumptionNumber) + int32(data.IncreaseLimitCompetitiveExpiredConsumptionNumber) + int32(data.ManualCompetitiveConsumptionNumber),
 	}
 	return result, nil
 }
@@ -241,6 +247,7 @@ func AddBundleBalance(req *bundle.AddBundleBalanceReq) (*bundle.AddBundleBalance
 		ImageNumber:        int(req.ImageConsumptionNumber),
 		VideoNumber:        int(req.VideoConsumptionNumber),
 		DataAnalysisNumber: int(req.DataAnalysisConsumptionNumber),
+		CompetitiveNumber:  int(req.CompetitiveConsumptionNumber),
 	}
 	uesdType, err := dao.AddBundleBalanceByUserId(data)
 	return &bundle.AddBundleBalanceResp{
@@ -359,7 +366,6 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
 						data.IncreaseLimitDataAnalysisNumber += int(v.Num)
 					}
 				} else {
-
 					data.IncreaseDataAnalysisNumber += int(v.Num)
 				}
 			}
@@ -378,6 +384,30 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
 			case "年":
 				data.ExpiredAt = data.ExpiredAt.Add(time.Hour * 24 * 365 * time.Duration(v.Num))
 			}
+		case 6: // 竞品数
+			if v.EquityType == 1 { // 套餐权益
+				if v.QuotaType == 2 { // 限制额度
+					data.MonthlyLimitCompetitiveQuotaNumber = int(v.QuotaValue)
+					if v.IsExpired { // 会过期的限制类型
+						data.BundleLimitCompetitiveExpiredNumber += int(v.Num)
+					} else {
+						data.BundleLimitCompetitiveNumber += int(v.Num)
+					}
+				} else {
+					data.BundleCompetitiveNumber += int(v.Num)
+				}
+			} else {
+				if v.QuotaType == 2 { // 限制额度
+					data.MonthlyLimitCompetitiveQuotaNumber = int(v.QuotaValue)
+					if v.IsExpired { // 会过期的限制类型
+						data.IncreaseLimitCompetitiveExpiredNumber += int(v.Num)
+					} else {
+						data.IncreaseLimitCompetitiveNumber += int(v.Num)
+					}
+				} else {
+					data.IncreaseCompetitiveNumber += int(v.Num)
+				}
+			}
 		}
 	}
 	now := time.Now()
@@ -396,6 +426,11 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
 	data.MonthlyBundleLimitDataAnalysisNumber = cal(data, data.BundleLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now)
 	data.MonthlyIncreaseLimitDataAnalysisNumber = cal(data, data.IncreaseLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now)
 
+	data.MonthlyBundleLimitExpiredCompetitiveNumber = cal(data, data.BundleLimitCompetitiveExpiredNumber, data.MonthlyLimitCompetitiveQuotaNumber, now)
+	data.MonthlyIncreaseLimitExpiredCompetitiveNumber = cal(data, data.IncreaseLimitCompetitiveExpiredNumber, data.MonthlyLimitCompetitiveQuotaNumber, now)
+	data.MonthlyBundleLimitCompetitiveNumber = cal(data, data.BundleLimitCompetitiveNumber, data.MonthlyLimitCompetitiveQuotaNumber, now)
+	data.MonthlyIncreaseLimitCompetitiveNumber = cal(data, data.IncreaseLimitCompetitiveNumber, data.MonthlyLimitCompetitiveQuotaNumber, now)
+
 	err = dao.CreateBundleBalance(data)
 	if err != nil {
 		logger.Error(err)
@@ -532,6 +567,8 @@ func BundleBalanceExport(req *bundle.BundleBalanceExportReq) (*bundle.BundleBala
 		item.MonthlyIncreaseImageConsumptionNumber = v.MonthIncreaseImageConsumptionNumber
 		item.MonthlyBundleDataAnalysisConsumptionNumber = v.MonthBundleDataAnalysisConsumptionNumber
 		item.MonthlyIncreaseDataAnalysisConsumptionNumber = v.MonthIncreaseDataAnalysisConsumptionNumber
+		item.MonthlyBundleCompetitiveConsumptionNumber = v.MonthBundleCompetitiveConsumptionNumber
+		item.MonthlyIncreaseCompetitiveConsumptionNumber = v.MonthIncreaseCompetitiveConsumptionNumber
 		item.Currency = "USD"
 		f, _ := strconv.ParseFloat(prefixItem.Fee, 64)
 		item.Fee = fmt.Sprintf("%.2f", f)
@@ -629,6 +666,20 @@ func buildDefaultBalanceLayout() string {
 		{"当月可用增值数据数", "monthlyIncreaseDataAnalysisNumber", 2},
 		{"当月作废套餐数据数", "monthlyInvalidBundleDataAnalysisNumber", 2},
 		{"当月作废增值数据数", "monthlyInvalidIncreaseDataAnalysisNumber", 2},
+		{"套餐竞品总数", "bundleCompetitiveNumber", 2},
+		{"增值竞品总数", "increaseCompetitiveNumber", 2},
+		{"当前已用套餐竞品数", "bundleCompetitiveConsumptionNumber", 2},
+		{"当前已用增值竞品数", "increaseCompetitiveConsumptionNumber", 2},
+		{"当前作废套餐竞品数", "invalidBundleCompetitiveNumber", 2},
+		{"当前作废增值竞品数", "invalidIncreaseCompetitiveNumber", 2},
+		{"当月新增套餐竞品数", "monthlyNewBundleCompetitiveNumber", 2},
+		{"当月新增增值竞品数", "monthlyNewIncreaseCompetitiveNumber", 2},
+		{"当月使用套餐竞品数", "monthBundleCompetitiveConsumptionNumber", 2},
+		{"当月使用增值竞品数", "monthIncreaseCompetitiveConsumptionNumber", 2},
+		{"当月可用套餐竞品数", "monthlyBundleCompetitiveNumber", 2},
+		{"当月可用增值竞品数", "monthlyIncreaseCompetitiveNumber", 2},
+		{"当月作废套餐竞品数", "monthlyInvalidBundleCompetitiveNumber", 2},
+		{"当月作废增值竞品数", "monthlyInvalidIncreaseCompetitiveNumber", 2},
 		{"当月新增手动扩展账号数", "monthlyNewManualAccountNumber", 2},
 		{"当月新增手动扩展视频数", "monthlyNewManualVideoNumber", 2},
 		{"当月新增手动扩展图文数", "monthlyNewManualImageNumber", 2},

internal/model/bundle.go

@@ -97,6 +97,7 @@ type BundleExtensionRecords struct {
 	OperatorName                string `gorm:"column:operator_name;type:varchar(256)" json:"operatorName"`
 	OperatorPhoneNumber         string `gorm:"column:operator_phone_number;type:varchar(256)" json:"operatorPhoneNumber"`
 	TimeUnit                    uint   `gorm:"column:time_unit;type:int(11) unsigned;comment:时间单位" json:"timeUnit"`
+	CompetitiveAdditional       uint   `gorm:"column:competitive_additional;type:int(11) unsigned;comment:竞品数额外增加" json:"competitive_additional"`
 }
 
 // TableName 表名称
@@ -111,6 +112,7 @@ type BundleExtendRecordItemPo struct {
 	ImagesAdditional            int
 	DataAdditional              int
 	VideoAdditional             int
+	CompetitiveAdditional       int
 	AvailableDurationAdditional uint `gorm:"column:available_duration_additional;type:int(11) unsigned;comment:可用时长增加" json:"available_duration_additional"`
 	Type                        int
 	Remark                      string
@@ -290,6 +292,39 @@ type BundleBalance struct {
 
 	MonthlyNewDurationNumber int `gorm:"column:monthly_new_duration_number;comment:当月新增手动扩展时长（天）"`
 	ExpansionPacksNumber     int `gorm:"column:expansion_packs_number;not null;comment:扩展包数量"`
+
+	// ===== 竞品数 =====
+	BundleCompetitiveNumber                                 int `gorm:"column:bundle_competitive_number;not null;comment:非限制类型套餐权益竞品数总数"`
+	IncreaseCompetitiveNumber                               int `gorm:"column:increase_competitive_number;not null;comment:非限制类型增值权益竞品数总数"`
+	BundleLimitCompetitiveNumber                            int `gorm:"column:bundle_limit_competitive_number;not null;comment:套餐权益限制类型竞品数非过期总数"`
+	IncreaseLimitCompetitiveNumber                          int `gorm:"column:increase_limit_competitive_number;not null;comment:增值权益限制类型竞品数非过期总数"`
+	BundleLimitCompetitiveExpiredNumber                     int `gorm:"column:bundle_limit_competitive_expired_number;not null;comment:套餐权益限制类型竞品数会过期总数"`
+	IncreaseLimitCompetitiveExpiredNumber                   int `gorm:"column:increase_limit_competitive_expired_number;not null;comment:增值权益限制类型竞品数会过期总数"`
+	MonthlyInvalidBundleCompetitiveNumber                   int `gorm:"column:monthly_invalid_bundle_competitive_number;not null;comment:当月失效的套餐权益竞品数总数"`
+	InvalidBundleCompetitiveNumber                          int `gorm:"column:invalid_bundle_competitive_number;not null;comment:历史失效的套餐权益竞品数总数"`
+	MonthlyInvalidIncreaseCompetitiveNumber                 int `gorm:"column:monthly_invalid_increase_competitive_number;not null;comment:当月失效的增值权益竞品数总数"`
+	InvalidIncreaseCompetitiveNumber                        int `gorm:"column:invalid_increase_competitive_number;not null;comment:历史失效的增值权益竞品数总数"`
+	BundleCompetitiveConsumptionNumber                      int `gorm:"column:bundle_competitive_consumption_number;not null;comment:非限制类型套餐权益竞品数使用数"`
+	IncreaseCompetitiveConsumptionNumber                    int `gorm:"column:increase_competitive_consumption_number;not null;comment:非限制类型增值权益竞品数使用数"`
+	BundleLimitCompetitiveConsumptionNumber                 int `gorm:"column:bundle_limit_competitive_consumption_number;not null;comment:套餐权益限制类型竞品数非过期使用数"`
+	IncreaseLimitCompetitiveConsumptionNumber               int `gorm:"column:increase_limit_competitive_consumption_number;not null;comment:增值权益限制类型竞品数非过期使用数"`
+	BundleLimitCompetitiveExpiredConsumptionNumber          int `gorm:"column:bundle_limit_competitive_expired_consumption_number;not null;comment:套餐权益限制类型竞品数会过期使用数"`
+	IncreaseLimitCompetitiveExpiredConsumptionNumber        int `gorm:"column:increase_limit_competitive_expired_consumption_number;not null;comment:增值权益限制类型竞品数会过期使用数"`
+	MonthlyBundleCompetitiveConsumptionNumber               int `gorm:"column:monthly_bundle_competitive_consumption_number;not null;comment:当月套餐类型竞品数已使用额度"`
+	MonthlyIncreaseCompetitiveConsumptionNumber             int `gorm:"column:monthly_increase_competitive_consumption_number;not null;comment:当月增值类型竞品数已使用额度"`
+	MonthlyBundleLimitCompetitiveNumber                     int `gorm:"column:monthly_bundle_limit_competitive_number;not null;comment:当月套餐限制类型竞品数可使用额度"`
+	MonthlyIncreaseLimitCompetitiveNumber                   int `gorm:"column:monthly_increase_limit_competitive_number;not null;comment:当月增值限制类型竞品数可使用额度"`
+	MonthlyBundleLimitCompetitiveConsumptionNumber          int `gorm:"column:monthly_bundle_limit_competitive_consumption_number;not null;comment:当月套餐限制类型竞品数已使用额度"`
+	MonthlyIncreaseLimitCompetitiveConsumptionNumber        int `gorm:"column:monthly_increase_limit_competitive_consumption_number;not null;comment:当月增值限制类型竞品数已使用额度"`
+	MonthlyBundleLimitExpiredCompetitiveNumber              int `gorm:"column:monthly_bundle_limit_expired_competitive_number;not null;comment:当月套餐限制类会过期型竞品数可使用额度"`
+	MonthlyIncreaseLimitExpiredCompetitiveNumber            int `gorm:"column:monthly_increase_limit_expired_competitive_number;not null;comment:当月增值限制类会过期型竞品数可使用额度"`
+	MonthlyBundleLimitExpiredCompetitiveConsumptionNumber   int `gorm:"column:monthly_bundle_limit_expired_competitive_consumption_number;not null;comment:当月套餐限制类型会过期竞品数已使用额度"`
+	MonthlyIncreaseLimitExpiredCompetitiveConsumptionNumber int `gorm:"column:monthly_increase_limit_expired_competitive_consumption_number;not null;comment:当月增值限制类会过期型竞品数已使用额度"`
+	MonthlyLimitCompetitiveQuotaNumber                      int `gorm:"column:monthly_limit_competitive_quota_number;not null;comment:当月限制类型竞品数额度"`
+	ManualCompetitiveNumber                                 int `gorm:"column:manual_competitive_number;comment:手动扩展竞品数总数"`
+	ManualCompetitiveConsumptionNumber                      int `gorm:"column:manual_competitive_consumption_number;comment:手动扩展竞品数使用数"`
+	MonthlyNewManualCompetitiveNumber                       int `gorm:"column:monthly_new_manual_competitive_number;comment:当月手动扩展竞品数新增数"`
+	MonthlyManualCompetitiveConsumptionNumber               int `gorm:"column:monthly_manual_competitive_consumption_number;comment:当月手动扩展竞品数使用数"`
 }
 
 // TableName 表名称
@@ -314,12 +349,14 @@ type BundleBalanceUsePo struct {
 	VideoNumber        int
 	ImageNumber        int
 	DataAnalysisNumber int
+	CompetitiveNumber  int
 }
 type BundleBalanceExtendPo struct {
 	UserId             int
 	AccountNumber      int
 	VideoNumber        int
 	ImageNumber        int
+	CompetitiveNumber  int
 	DataAnalysisNumber int
 	DurationNumber     int
 }

pb/bundle.proto

@@ -14,15 +14,11 @@ service Bundle {
   rpc HandShelf(HandShelfRequest) returns(CommonResponse) {} //更新套餐上下架状态
   rpc SaveBundle(BundleProfile)returns (SaveResponse) {}
 
-
   rpc BundleListV2(BundleListRequest) returns(BundleListResponse) {}
   rpc BundleDetailV2(BundleDetailRequest) returns(BundleDetailResponseV2) {}
   rpc BundleListH5V2(BundleListRequest) returns(BundleListResponse) {}
   rpc BundleLangDetailV2(BundleDetailRequest) returns(BundleProfileLang) {}
 
-
-
-
   rpc BundleList(BundleListRequest) returns (BundleListResponse) {}
   rpc BundleDetail(BundleDetailRequest) returns (BundleDetailResponse) {}
 
@@ -601,7 +597,7 @@ message ValueAddService {
 message ValueAddServiceLang {
   string uuid = 1 [json_name = "uuid"];
   string serviceName = 2 [json_name = "serviceName"]; //服务名称
-  int32 serviceType = 3 [json_name = "serviceType"]; //服务类型 1:数据分析 2:图文 3:数据报表 4:账号数 5:可用时长
+  int32 serviceType = 3 [json_name = "serviceType"]; //服务类型 1:数据分析 2:图文 3:数据报表 4:账号数 5:可用时长 6:竞品数
   int32 priceMode = 4 [json_name = "priceMode"]; //套餐价格类型 1:单价 2:总价
   string originalPrice = 5 [json_name = "originalPrice"];//原单价
   string unit = 6 [json_name = "unit"];//单位 1:个 2:条 3:天 4:月 5:年 6:自然月 7:自然季度 8:半年 9:自然年
@@ -668,17 +664,18 @@ message BatchGetValueAddServiceLangResponse{
 message BundleExtendRequest{
   int64 userId = 1;
   uint32 accountAdditional = 2; 
-  uint32 videoAdditional = 3; 
+  uint32 videoAdditional = 3;//视频
-  uint32 imagesAdditional = 4; 
+  uint32 imagesAdditional = 4; //图文
-  uint32 dataAdditional = 5;
+  uint32 dataAdditional = 5;//数据分析
-  uint32 availableDurationAdditional = 6; 
+  uint32 competitiveAdditional = 6;//竞品数
-  uint32 timeUnit = 7; // 1 日 2 月 3年
+  uint32 availableDurationAdditional = 7; 
-  string remark = 8; 
+  uint32 timeUnit = 8; // 1 日 2 月 3年
-  string associatedorderNumber = 9; 
+  string remark = 9; 
-  uint64 operatorId = 10; 
+  string associatedorderNumber = 10; 
-  string operatorName = 11; 
+  uint64 operatorId = 11; 
-  string operatorPhoneNumber = 12; 
+  string operatorName = 12; 
-  int32 type = 13;
+  string operatorPhoneNumber = 13; 
+  int32 type = 14;
 }
 
 message BundleExtendResponse{
@@ -811,24 +808,44 @@ message BundleBalanceItem {
   int32 monthlyInvalidBundleDataAnalysisNumber = 57; // 当月作废套餐数据数
   int32 monthlyInvalidIncreaseDataAnalysisNumber = 58; // 当月作废增值数据数
 
+  // 竞品数
+  int32 bundleCompetitiveNumber = 59; // 当前可用套餐竞品数
+  int32 increaseCompetitiveNumber = 60; // 当前可用增值竞品数
+  int32 bundleCompetitiveConsumptionNumber = 61; // 当前已用套餐竞品数
+  int32 increaseCompetitiveConsumptionNumber = 62; // 当前已用增值竞品数
+  int32 invalidBundleCompetitiveNumber = 63; // 当前作废套餐竞品数
+  int32 invalidIncreaseCompetitiveNumber = 64; // 当前作废增值竞品数
+  int32 monthlyNewBundleCompetitiveNumber = 65; // 当月新增套餐竞品数
+  int32 monthlyNewIncreaseCompetitiveNumber = 66; // 当月新增增值竞品数
+  int32 monthlyBundleCompetitiveNumber = 67; // 当月可用套餐竞品数
+  int32 monthlyIncreaseCompetitiveNumber = 68; // 当月可用增值竞品数
+  int32 monthBundleCompetitiveConsumptionNumber = 69; // 当月使用套餐竞品数
+  int32 monthIncreaseCompetitiveConsumptionNumber = 70; // 当月使用增值竞品数
+  int32 monthlyInvalidBundleCompetitiveNumber = 71; // 当月作废套餐竞品数
+  int32 monthlyInvalidIncreaseCompetitiveNumber = 72; // 当月作废增值竞品数
+
   // 手动扩展数据
-  int32 monthlyNewManualAccountNumber = 59; // 当月新增手动扩展账号数
+  int32 monthlyNewManualAccountNumber = 73; // 当月新增手动扩展账号数
-  int32 monthlyNewManualVideoNumber = 60; // 当月新增手动扩展视频数
+  int32 monthlyNewManualVideoNumber = 74; // 当月新增手动扩展视频数
-  int32 monthlyNewManualImageNumber = 61; // 当月新增手动扩展图文数
+  int32 monthlyNewManualImageNumber = 75; // 当月新增手动扩展图文数
-  int32 monthlyNewManualDataAnalysisNumber = 62; // 当月新增手动扩展数据数
+  int32 monthlyNewManualDataAnalysisNumber = 76; // 当月新增手动扩展数据数
-  int32 monthlyNewDurationNumber = 63; // 当月新增手动扩展时长(日)
+  int32 monthlyNewManualCompetitiveNumber = 77; // 当月新增手动扩展竞品数
-  int32 monthlyManualAccountConsumptionNumber = 64; // 当月已用手动扩展账号数
+  int32 monthlyNewDurationNumber = 78; // 当月新增手动扩展时长(日)
-  int32 monthlyManualVideoConsumptionNumber = 65; // 当月已用手动扩展视频数
+  int32 monthlyManualAccountConsumptionNumber = 79; // 当月已用手动扩展账号数
-  int32 monthlyManualImageConsumptionNumber = 66; // 当月已用手动扩展图文数
+  int32 monthlyManualVideoConsumptionNumber = 80; // 当月已用手动扩展视频数
-  int32 monthlyManualDataAnalysisConsumptionNumber = 67; // 当月已用手动扩展数据数
+  int32 monthlyManualImageConsumptionNumber = 81; // 当月已用手动扩展图文数
-  int32 manualAccountConsumptionNumber = 68; // 已用手动扩展账号数
+  int32 monthlyManualDataAnalysisConsumptionNumber = 82; // 当月已用手动扩展数据数
-  int32 manualVideoConsumptionNumber = 69; // 已用手动扩展视频数
+  int32 monthlyManualCompetitiveConsumptionNumber = 83; // 当月已用手动扩展竞品数
-  int32 manualImageConsumptionNumber = 70; // 已用手动扩展图文数
+  int32 manualAccountConsumptionNumber = 84; // 已用手动扩展账号数
-  int32 manualDataAnalysisConsumptionNumber = 71; // 已用手动扩展数据数
+  int32 manualVideoConsumptionNumber = 85; // 已用手动扩展视频数
-  int32 manualAccountNumber = 72; // 可用手动扩展账号数
+  int32 manualImageConsumptionNumber = 86; // 已用手动扩展图文数
-  int32 manualVideoNumber = 73; // 可用手动扩展视频数
+  int32 manualDataAnalysisConsumptionNumber = 87; // 已用手动扩展数据数
-  int32 manualImageNumber = 74; // 可用手动扩展图文数
+  int32 manualCompetitiveConsumptionNumber = 88; // 已用手动扩展竞品数
-  int32 manualDataAnalysisNumber = 75; // 可用手动扩展数据数
+  int32 manualAccountNumber = 89; // 可用手动扩展账号数
+  int32 manualVideoNumber = 90; // 可用手动扩展视频数
+  int32 manualImageNumber = 91; // 可用手动扩展图文数
+  int32 manualDataAnalysisNumber = 92; // 可用手动扩展数据数
+  int32 manualCompetitiveNumber = 93; // 可用手动扩展竞品数
 }
 
 
@@ -902,16 +919,34 @@ message BundleBalanceExportItem {
   int32 monthlyInvalidBundleDataAnalysisNumber = 57; // 当月作废套餐数据分析数
   int32 monthlyInvalidIncreaseDataAnalysisNumber = 58; // 当月作废增值数据分析数
 
+  // 竞品数
+  int32 bundleCompetitiveNumber = 59; // 当前可用套餐竞品数
+  int32 increaseCompetitiveNumber = 60; // 当前可用增值竞品数
+  int32 bundleCompetitiveConsumptionNumber = 61; // 当前已用套餐竞品数
+  int32 increaseCompetitiveConsumptionNumber = 62; // 当前已用增值竞品数
+  int32 invalidBundleCompetitiveNumber = 63; // 当前作废套餐竞品数
+  int32 invalidIncreaseCompetitiveNumber = 64; // 当前作废增值竞品数
+  int32 monthlyNewBundleCompetitiveNumber = 65; // 当月新增套餐竞品数
+  int32 monthlyNewIncreaseCompetitiveNumber = 66; // 当月新增增值竞品数
+  int32 monthlyBundleCompetitiveNumber = 67; // 当月可用套餐竞品数
+  int32 monthlyIncreaseCompetitiveNumber = 68; // 当月可用增值竞品数
+  int32 monthlyBundleCompetitiveConsumptionNumber = 69; // 当月使用套餐竞品数
+  int32 monthlyIncreaseCompetitiveConsumptionNumber = 70; // 当月使用增值竞品数
+  int32 monthlyInvalidBundleCompetitiveNumber = 71; // 当月作废套餐竞品数
+  int32 monthlyInvalidIncreaseCompetitiveNumber = 72; // 当月作废增值竞品数
+
   // 手动扩展类
-  int32 monthlyNewManualAccountNumber = 59; // 当月手动扩展账号新增数
+  int32 monthlyNewManualAccountNumber = 73; // 当月手动扩展账号新增数
-  int32 monthlyNewManualVideoNumber = 60; // 当月手动扩展视频新增数
+  int32 monthlyNewManualVideoNumber = 74; // 当月手动扩展视频新增数
-  int32 monthlyNewManualImageNumber = 61; // 当月手动扩展图文新增数
+  int32 monthlyNewManualImageNumber = 75; // 当月手动扩展图文新增数
-  int32 monthlyNewManualDataAnalysisNumber = 62; // 当月手动扩展数据分析新增数
+  int32 monthlyNewManualDataAnalysisNumber = 76; // 当月手动扩展数据分析新增数
-  int32 monthlyNewDurationNumber = 63; // 当月新增手动扩展时长（天）
+  int32 monthlyNewManualCompetitiveNumber = 77; // 当月新增手动扩展竞品数
-  int32 monthlyManualAccountConsumptionNumber = 64; // 当月手动扩展账号使用数
+  int32 monthlyNewDurationNumber = 78; // 当月新增手动扩展时长（天）
-  int32 monthlyManualVideoConsumptionNumber = 65; // 当月手动扩展视频使用数
+  int32 monthlyManualAccountConsumptionNumber = 79; // 当月手动扩展账号使用数
-  int32 monthlyManualImageConsumptionNumber = 66; // 当月手动扩展图文使用数
+  int32 monthlyManualVideoConsumptionNumber = 80; // 当月手动扩展视频使用数
-  int32 monthlyManualDataAnalysisConsumptionNumber = 67; // 当月手动扩展数据分析使用数
+  int32 monthlyManualImageConsumptionNumber = 81; // 当月手动扩展图文使用数
+  int32 monthlyManualDataAnalysisConsumptionNumber = 82; // 当月手动扩展数据分析使用数
+  int32 monthlyManualCompetitiveConsumptionNumber = 83; // 当月手动扩展竞品使用数
 }
 
 
@@ -964,7 +999,9 @@ message AddBundleBalanceReq{
   int32 imageConsumptionNumber = 9; 
   int32 dataAnalysisNumber = 10;
   int32 dataAnalysisConsumptionNumber = 11;
-  int32 expansionPacksNumber = 12;  
+  int32 competitiveNumber = 12;
+  int32 competitiveConsumptionNumber = 13;
+  int32 expansionPacksNumber = 14;  
 }
 
 message AddBundleBalanceResp{
@@ -1093,7 +1130,12 @@ message GetBundleBalanceByUserIdResp{
   int32 dataAnalysisExtendConsumptionNumber = 25;
   int32 dataAnalysisAdditional = 26;
   int32 dataAnalysisConsumptionNumber = 27;
-  int32 expansionPacksNumber = 28;  
+  int32 competitiveNumber = 28;
+  int32 competitiveExtendNumber = 29;
+  int32 competitiveExtendConsumptionNumber = 30;
+  int32 competitiveAdditional = 31;
+  int32 competitiveConsumptionNumber = 32;
+  int32 expansionPacksNumber = 33;  
 }
 
 message OnlyAddValueListByOrderNoRequest{

pb/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.5
-// - protoc             v6.32.0
+// - protoc             v5.26.0
 // source: pb/bundle.proto
 
 package bundle