diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 42466e1..1446be7 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -159,7 +159,6 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (data mod Where("bor.deleted_at IS NULL"). Where("bb.user_id = ?", req.UserId). // Where("bor.expiration_time > ?", time.Now()). - Where("bor.deleted_at IS NULL"). Order("bb.created_at desc"). First(&data).Error if err != nil { diff --git a/pb/bundle.proto b/pb/bundle.proto index 0f9fc88..b663294 100644 --- a/pb/bundle.proto +++ b/pb/bundle.proto @@ -711,7 +711,7 @@ message WorkCastItem{ uint32 workCategory = 5; // 1 图文 2 视频 string bundleUuid = 6; // 套餐ID uuid string bundleName = 7; // 套餐名称 - string platformIDs = 8; // 发布平台ID集合 (json 格式字符串) + string platformIds = 8; // 发布平台ID集合 (json 格式字符串) string mediaNames = 9; // 自媒体账号名称集合 string mediaAccIDs = 10; // 自媒体账号ID集合 string workTitle = 11; // 作品标题 @@ -755,8 +755,8 @@ message workItem{ string content = 4; uint32 workCategory = 5; uint32 workStatus = 6; - string platformIDs = 7; - string mediaNames = 8; + string platformIds = 7; + string mediaNames = 8; string mediaAccUserIds = 9; int64 confirmedAt = 10; int64 createdAt = 11; // 提交时间 diff --git a/pb/bundle/bundle.pb.go b/pb/bundle/bundle.pb.go index be89a4c..adc4f28 100644 --- a/pb/bundle/bundle.pb.go +++ b/pb/bundle/bundle.pb.go @@ -6219,7 +6219,7 @@ type WorkCastItem struct { WorkCategory uint32 `protobuf:"varint,5,opt,name=workCategory,proto3" json:"workCategory,omitempty"` // 1 图文 2 视频 BundleUuid string `protobuf:"bytes,6,opt,name=bundleUuid,proto3" json:"bundleUuid,omitempty"` // 套餐ID uuid BundleName string `protobuf:"bytes,7,opt,name=bundleName,proto3" json:"bundleName,omitempty"` // 套餐名称 - PlatformIDs string `protobuf:"bytes,8,opt,name=platformIDs,proto3" json:"platformIDs,omitempty"` // 发布平台ID集合 (json 格式字符串) + PlatformIds string `protobuf:"bytes,8,opt,name=platformIds,proto3" json:"platformIds,omitempty"` // 发布平台ID集合 (json 格式字符串) MediaNames string `protobuf:"bytes,9,opt,name=mediaNames,proto3" json:"mediaNames,omitempty"` // 自媒体账号名称集合 MediaAccIDs string `protobuf:"bytes,10,opt,name=mediaAccIDs,proto3" json:"mediaAccIDs,omitempty"` // 自媒体账号ID集合 WorkTitle string `protobuf:"bytes,11,opt,name=workTitle,proto3" json:"workTitle,omitempty"` // 作品标题 @@ -6310,9 +6310,9 @@ func (x *WorkCastItem) GetBundleName() string { return "" } -func (x *WorkCastItem) GetPlatformIDs() string { +func (x *WorkCastItem) GetPlatformIds() string { if x != nil { - return x.PlatformIDs + return x.PlatformIds } return "" } @@ -6668,7 +6668,7 @@ type WorkItem struct { Content string `protobuf:"bytes,4,opt,name=content,proto3" json:"content,omitempty"` WorkCategory uint32 `protobuf:"varint,5,opt,name=workCategory,proto3" json:"workCategory,omitempty"` WorkStatus uint32 `protobuf:"varint,6,opt,name=workStatus,proto3" json:"workStatus,omitempty"` - PlatformIDs string `protobuf:"bytes,7,opt,name=platformIDs,proto3" json:"platformIDs,omitempty"` + PlatformIds string `protobuf:"bytes,7,opt,name=platformIds,proto3" json:"platformIds,omitempty"` MediaNames string `protobuf:"bytes,8,opt,name=mediaNames,proto3" json:"mediaNames,omitempty"` MediaAccUserIds string `protobuf:"bytes,9,opt,name=mediaAccUserIds,proto3" json:"mediaAccUserIds,omitempty"` ConfirmedAt int64 `protobuf:"varint,10,opt,name=confirmedAt,proto3" json:"confirmedAt,omitempty"` @@ -6751,9 +6751,9 @@ func (x *WorkItem) GetWorkStatus() uint32 { return 0 } -func (x *WorkItem) GetPlatformIDs() string { +func (x *WorkItem) GetPlatformIds() string { if x != nil { - return x.PlatformIDs + return x.PlatformIds } return "" } @@ -8480,8 +8480,8 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x55, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, - 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x73, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x73, + 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x64, 0x73, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x41, 0x63, 0x63, 0x49, 0x44, 0x73, 0x18, @@ -8536,8 +8536,8 @@ var file_pb_bundle_proto_rawDesc = []byte{ 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, - 0x72, 0x6d, 0x49, 0x44, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, - 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x44, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, + 0x72, 0x6d, 0x49, 0x64, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x6c, 0x61, + 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x41, 0x63, 0x63, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28,