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-20 15:47:25 +08:00
commit 19aa5b8955
5 changed files with 1848 additions and 1836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/dao/orderRecordsDao.go
View File

@ -540,6 +540,7 @@ func OrderListByOrderNo(req *bundle.OrderInfoByOrderNoRequest) (*bundle.OrderInf
Type: int32(addOrder[0].Source), Type: int32(addOrder[0].Source),
UserId: uint64(userID), UserId: uint64(userID),
OrderUUID: addOrder[0].OrderUUID, OrderUUID: addOrder[0].OrderUUID,
UserName: addOrder[0].CustomerName,
} }
for _, item := range addOrder { for _, item := range addOrder {
switch item.ServiceType { switch item.ServiceType {

1
pb/bundle.proto
View File

@ -127,6 +127,7 @@ message OrderInfoByOrderNoResp{
int32 dataNumber = 7; int32 dataNumber = 7;
int32 duration = 8; int32 duration = 8;
string unit = 9; string unit = 9;
string userName = 10;
} }
message OrderCreateRecord{ message OrderCreateRecord{

3656
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"
_ "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb" _ "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 "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