fiee/micro-bundle
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改冲突

Browse Source
This commit is contained in:
孙肖扬 2025-06-26 17:10:29 +08:00
parent 9c9e9c0663
commit a01be125e6
5 changed files with 1414 additions and 1403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/logic/bundleLogic.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"micro-bundle/internal/dao" "micro-bundle/internal/dao"
"micro-bundle/pb/bundle"
"micro-bundle/pkg/app" "micro-bundle/pkg/app"
"micro-bundle/pkg/msg" "micro-bundle/pkg/msg"
"time" "time"
@ -14,7 +15,6 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
"micro-bundle/internal/model" "micro-bundle/internal/model"
"micro-bundle/pb/bundle"
) )
func CreateBundle(req *bundle.BundleProfile) (res *bundle.CommonResponse, err error) { func CreateBundle(req *bundle.BundleProfile) (res *bundle.CommonResponse, err error) {

7
pb/bundle.proto
View File

@ -416,6 +416,7 @@ message OrderRecordsDetailRequest {
string orderNo = 2 [json_name = "orderNo"]; string orderNo = 2 [json_name = "orderNo"];
string customerID = 3 [json_name = "customerID"]; string customerID = 3 [json_name = "customerID"];
string bundleUUID = 4 [json_name = "bundleUUID"]; string bundleUUID = 4 [json_name = "bundleUUID"];
uint64 status = 5 [json_name = "status"];
} }
message OrderRecordsDetailResponse { message OrderRecordsDetailResponse {
@ -711,7 +712,7 @@ message WorkCastItem{
uint32 workCategory = 5; // 1 图文 2 视频 uint32 workCategory = 5; // 1 图文 2 视频
string bundleUuid = 6; // 套餐ID uuid string bundleUuid = 6; // 套餐ID uuid
string bundleName = 7; // 套餐名称 string bundleName = 7; // 套餐名称
string platformIDs = 8; // 发布平台ID集合 (json 格式字符串) string platformIds = 8; // 发布平台ID集合 (json 格式字符串)
string mediaNames = 9; // 自媒体账号名称集合 string mediaNames = 9; // 自媒体账号名称集合
string mediaAccIDs = 10; // 自媒体账号ID集合 string mediaAccIDs = 10; // 自媒体账号ID集合
string workTitle = 11; // 作品标题 string workTitle = 11; // 作品标题
@ -755,8 +756,8 @@ message workItem{
string content = 4; string content = 4;
uint32 workCategory = 5; uint32 workCategory = 5;
uint32 workStatus = 6; uint32 workStatus = 6;
string platformIDs = 7; string platformIds = 7;
string mediaNames = 8; string mediaNames = 8;
string mediaAccUserIds = 9; string mediaAccUserIds = 9;
int64 confirmedAt = 10; int64 confirmedAt = 10;
int64 createdAt = 11; // 提交时间 int64 createdAt = 11; // 提交时间

2804
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pb/bundle/bundle.validator.pb.go
View File

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

2
pb/bundle/bundle_triple.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT. // Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions: // versions:
// - protoc-gen-go-triple v1.0.8 // - protoc-gen-go-triple v1.0.8
// - protoc v3.20.3 // - protoc v4.24.0--rc1
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle