Updata：增加竞品数类型数据

api/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 

api/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.8
+// - protoc-gen-go-triple v1.0.5
-// - protoc             v3.21.1
+// - protoc             v5.26.0
 // source: pb/bundle.proto
 
 package bundle

pkg/model/bundle/bundle.go

@@ -13,7 +13,6 @@ type UserWorkAnalysisConfirmReq struct {
 }
 
 type GetBundleBalanceListResp struct {
-
 	Total int64                `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
 	Data  []*BundleBalanceItem `protobuf:"bytes,2,rep,name=data,proto3" json:"data"`
 }
@@ -33,6 +32,8 @@ type BundleBalanceItem struct {
 	ImageConsumptionNumber        int32  `protobuf:"varint,12,opt,name=imageConsumptionNumber,proto3" json:"imageConsumptionNumber"`
 	DataAnalysisNumber            int32  `protobuf:"varint,13,opt,name=dataAnalysisNumber,proto3" json:"dataAnalysisNumber"`
 	DataAnalysisConsumptionNumber int32  `protobuf:"varint,14,opt,name=dataAnalysisConsumptionNumber,proto3" json:"dataAnalysisConsumptionNumber"`
-	ExpansionPacksNumber          int32  `protobuf:"varint,15,opt,name=expansionPacksNumber,proto3" json:"expansionPacksNumber"`
+	CompetitiveNumber             int32  `protobuf:"varint,15,opt,name=competitiveNumber,proto3" json:"competitiveNumber"`
-	Bought                        int32  `protobuf:"varint,16,opt,name=bought,proto3" json:"bought"`
+	CompetitiveConsumptionNumber  int32  `protobuf:"varint,16,opt,name=competitiveConsumptionNumber,proto3" json:"competitiveConsumptionNumber"`
+	ExpansionPacksNumber          int32  `protobuf:"varint,17,opt,name=expansionPacksNumber,proto3" json:"expansionPacksNumber"`
+	Bought                        int32  `protobuf:"varint,18,opt,name=bought,proto3" json:"bought"`
 }

pkg/model/cast/media.go

@@ -8,10 +8,11 @@ type SyncAsProfileReq struct {
 
 // 定义枚举值
 const (
-	BalanceTypeAccountValue BalanceTypeEnum = 1
+	BalanceTypeAccountValue     BalanceTypeEnum = 1 //账号
-	BalanceTypeImageValue   BalanceTypeEnum = 2
+	BalanceTypeImageValue       BalanceTypeEnum = 2 //图文
-	BalanceTypeVideoValue   BalanceTypeEnum = 3
+	BalanceTypeVideoValue       BalanceTypeEnum = 3 //视频
-	BalanceTypeDataValue    BalanceTypeEnum = 4
+	BalanceTypeDataValue        BalanceTypeEnum = 4 //数据分析
+	BalanceTypeCompetitiveValue BalanceTypeEnum = 5 //竞品数
 )
 
 var PlatformNameKv = map[uint32]string{

pkg/service/bundle/bundleBalance.go

@@ -432,6 +432,7 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		"当前可用套餐视频数", "当前可用增值视频数", "当前已用套餐视频数", "当前已用增值视频数", "当前作废套餐视频数", "当前作废增值视频数", "当月新增可用套餐视频数", "当月新增可用增值视频数", "当月使用套餐视频数", "当月使用增值视频数", "当月作废套餐视频数", "当月作废增值视频数",
 		"当前可用套餐图文数", "当前可用增值图文数", "当前已用套餐图文数", "当前已用增值图文数", "当前作废套餐图文数", "当前作废增值图文数", "当月新增可用套餐图文数", "当月新增可用增值图文数", "当月使用套餐图文数", "当月使用增值图文数", "当月作废套餐图文数", "当月作废增值图文数",
 		"当前可用套餐数据分析数", "当前可用增值数据分析数", "当前已用套餐数据分析数", "当前已用增值数据分析数", "当前作废套餐数据分析数", "当前作废增值数据分析数", "当月新增可用套餐数据分析数", "当月新增可用增值数据分析数", "当月使用套餐数据分析数", "当月使用增值数据分析数", "当月作废套餐数据分析数", "当月作废增值数据分析数",
+		"当前可用套餐竞品数", "当前可用增值竞品数", "当前已用套餐竞品数", "当前已用增值竞品数", "当前作废套餐竞品数", "当前作废增值竞品数", "当月新增可用套餐竞品数", "当月新增可用增值竞品数", "当月使用套餐竞品数", "当月使用增值竞品数", "当月作废套餐竞品数", "当月作废增值竞品数",
 		"当月手动扩展账号新增数", "当月手动扩展视频新增数", "当月手动扩展图文新增数", "当月手动扩展数据分析新增数", "当月新增手动扩展时长（天）", "当月手动扩展账号使用数", "当月手动扩展视频使用数", "当月手动扩展图文使用数", "当月手动扩展数据分析使用数",
 	}
 
@@ -518,16 +519,30 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		_ = write(53, int(it.MonthlyInvalidBundleDataAnalysisNumber))
 		_ = write(54, int(it.MonthlyInvalidIncreaseDataAnalysisNumber))
 
+		// 竞品数
+		_ = write(55, int(it.MonthlyBundleCompetitiveNumber))
+		_ = write(56, int(it.MonthlyIncreaseCompetitiveNumber))
+		_ = write(57, int(it.BundleCompetitiveConsumptionNumber))
+		_ = write(58, int(it.IncreaseCompetitiveConsumptionNumber))
+		_ = write(59, int(it.InvalidBundleCompetitiveNumber))
+		_ = write(60, int(it.InvalidIncreaseCompetitiveNumber))
+		_ = write(61, int(it.MonthlyNewBundleCompetitiveNumber))
+		_ = write(62, int(it.MonthlyNewIncreaseCompetitiveNumber))
+		_ = write(63, int(it.MonthlyBundleCompetitiveConsumptionNumber))
+		_ = write(64, int(it.MonthlyIncreaseCompetitiveConsumptionNumber))
+		_ = write(65, int(it.MonthlyInvalidBundleCompetitiveNumber))
+		_ = write(66, int(it.MonthlyInvalidIncreaseCompetitiveNumber))
+
 		// 手动扩展类
-		_ = write(55, int(it.MonthlyNewManualAccountNumber))
+		_ = write(67, int(it.MonthlyNewManualAccountNumber))
-		_ = write(56, int(it.MonthlyNewManualVideoNumber))
+		_ = write(68, int(it.MonthlyNewManualVideoNumber))
-		_ = write(57, int(it.MonthlyNewManualImageNumber))
+		_ = write(69, int(it.MonthlyNewManualImageNumber))
-		_ = write(58, int(it.MonthlyNewManualDataAnalysisNumber))
+		_ = write(70, int(it.MonthlyNewManualDataAnalysisNumber))
-		_ = write(59, int(it.MonthlyNewDurationNumber))
+		_ = write(71, int(it.MonthlyNewDurationNumber))
-		_ = write(60, int(it.MonthlyManualAccountConsumptionNumber))
+		_ = write(72, int(it.MonthlyManualAccountConsumptionNumber))
-		_ = write(61, int(it.MonthlyManualVideoConsumptionNumber))
+		_ = write(73, int(it.MonthlyManualVideoConsumptionNumber))
-		_ = write(62, int(it.MonthlyManualImageConsumptionNumber))
+		_ = write(74, int(it.MonthlyManualImageConsumptionNumber))
-		_ = write(63, int(it.MonthlyManualDataAnalysisConsumptionNumber))
+		_ = write(75, int(it.MonthlyManualDataAnalysisConsumptionNumber))
 
 	}
 
@@ -572,6 +587,8 @@ func GetAccountBundleBalance(c *gin.Context) {
 			ImageConsumptionNumber:        item.BundleImageConsumptionNumber + item.IncreaseImageConsumptionNumber + item.ManualImageNumber,
 			DataAnalysisNumber:            item.BundleDataAnalysisNumber + item.IncreaseDataAnalysisNumber + item.ManualDataAnalysisNumber,
 			DataAnalysisConsumptionNumber: item.BundleDataAnalysisConsumptionNumber + item.IncreaseDataAnalysisConsumptionNumber + item.ManualDataAnalysisNumber,
+			CompetitiveNumber:             item.BundleCompetitiveNumber + item.IncreaseCompetitiveNumber + item.ManualCompetitiveNumber,
+			CompetitiveConsumptionNumber:  item.BundleCompetitiveConsumptionNumber + item.IncreaseCompetitiveConsumptionNumber + item.ManualCompetitiveConsumptionNumber,
 			Bought:                        item.Bought,
 		}
 	})

pkg/service/cast/analysis.go

@@ -538,6 +538,12 @@ func CheckBundleBalance(ctx *gin.Context) {
 			service.Error(ctx, err)
 			return
 		}
+	case modelCast.BalanceTypeCompetitiveValue:
+		if resp.CompetitiveExtendNumber-resp.CompetitiveExtendConsumptionNumber <= 0 {
+			err = errors.New(e.ErrorBalanceInsufficient)
+			service.Error(ctx, err)
+			return
+		}
 	}
 
 	service.Success(ctx, resp)

pkg/service/cast/work.go

@@ -422,6 +422,12 @@ func CheckUserBundleBalance(userID int32, balanceType modelCast.BalanceTypeEnum)
 			// err = errors.New(e.ErrorBalanceInsufficient)
 			return
 		}
+	case modelCast.BalanceTypeCompetitiveValue:
+		if resp.CompetitiveExtendNumber-resp.CompetitiveExtendConsumptionNumber <= 0 {
+			err = errors.New("该艺人竞品数可用次数为0")
+			// err = errors.New(e.ErrorBalanceInsufficient)
+			return
+		}
 	}
 	return
 }