diff --git a/internal/model/bundle.go b/internal/model/bundle.go index f34a2d6..7fb8cb4 100644 --- a/internal/model/bundle.go +++ b/internal/model/bundle.go @@ -29,6 +29,7 @@ type BundleProfile struct { BgImg2 string `json:"bgImg2" gorm:"column:bg_img2;type:varchar(1024);comment:背景图-我的"` BundleToValueAddService []BundleToValueAddService `gorm:"foreignKey:BundleUuid;references:UUID" json:"bundleToValueAddService"` BundleProfileLang []BundleProfileLang `gorm:"foreignKey:UUID;references:UUID" json:"bundleProfileLang"` + BundleType int64 `json:"bundleType" gorm:"column:bundle_type;type:int;comment:套餐类型 1:基础套餐 2:先用后付套餐"` } type BundleProfileLang struct { Id int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` diff --git a/pb/bundle.proto b/pb/bundle.proto index e8d2377..d583c52 100644 --- a/pb/bundle.proto +++ b/pb/bundle.proto @@ -374,6 +374,7 @@ message BundleProfile { repeated BundleProfileLang bundleProfileLang = 19 [json_name = "bundleProfileLang"]; int32 imgOption = 20 [json_name = "imgOption"]; string fontColor = 21 [json_name = "fontColor"]; + int64 bundleType = 22 [json_name = "bundleType"]; } message BundleProfileLang { string uuid = 1 [json_name = "uuid"]; diff --git a/pb/bundle/bundle.pb.go b/pb/bundle/bundle.pb.go index 34f2973..9764fe9 100644 --- a/pb/bundle/bundle.pb.go +++ b/pb/bundle/bundle.pb.go @@ -2029,6 +2029,7 @@ type BundleProfile struct { BundleProfileLang []*BundleProfileLang `protobuf:"bytes,19,rep,name=bundleProfileLang,proto3" json:"bundleProfileLang"` ImgOption int32 `protobuf:"varint,20,opt,name=imgOption,proto3" json:"imgOption"` FontColor string `protobuf:"bytes,21,opt,name=fontColor,proto3" json:"fontColor"` + BundleType int64 `protobuf:"varint,22,opt,name=bundleType,proto3" json:"bundleType"` } func (x *BundleProfile) Reset() { @@ -2210,6 +2211,13 @@ func (x *BundleProfile) GetFontColor() string { return "" } +func (x *BundleProfile) GetBundleType() int64 { + if x != nil { + return x.BundleType + } + return 0 +} + type BundleProfileLang struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -21502,7 +21510,7 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x4e, 0x6f, 0x22, 0x9b, 0x06, 0x0a, 0x0d, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x72, 0x6f, + 0x4e, 0x6f, 0x22, 0xbb, 0x06, 0x0a, 0x0d, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, @@ -21552,6 +21560,8 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6d, 0x67, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x6f, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x66, 0x6f, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x16, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0xb0, 0x04, 0x0a, 0x11, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x4c, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,