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

Updata：解决冲突

Browse Source
This commit is contained in:
jiaji.H 2026-02-26 15:35:28 +08:00
commit f5cb5050cf
6 changed files with 141 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/dao/bundleMetrics.go
View File

@ -334,13 +334,13 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
newVideoUsed = videoCountInfo.VideoUsed + videoCountInfo.UnUsedVideo
} else {
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cast_work.artist_uuid COLLATE utf8mb4_general_ci AND cast_work.submit_time >= bb.start_at AND cast_work.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cast_work.submit_time, '%Y-%m')").
Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid").
Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid = cast_work.uuid").
Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid").
Where("cast_work.work_category = 2").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and cwe.deleted_at = 0").
Where("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newVideoUsed).Error
if err != nil {
@ -473,13 +473,13 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
newImageUsed = imageCountInfo.ImageUsed + imageCountInfo.UnUsedImage
} else {
query = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cast_work.artist_uuid COLLATE utf8mb4_general_ci AND cast_work.submit_time >= bb.start_at AND cast_work.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cast_work.submit_time, '%Y-%m')").
Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid").
Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid = cast_work.uuid").
Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid").
Where("cast_work.work_category = 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and cwe.deleted_at = 0").
Where("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newImageUsed).Error
if err != nil {
@ -551,11 +551,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
newDataAnalysisUsed = dataAnalysisCountInfo.DataAnalysisUsed + dataAnalysisCountInfo.UnUsedDataAnalysis
} else {
query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa").
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cwa.artist_id COLLATE utf8mb4_general_ci AND cwa.submit_time >= bb.start_at AND cwa.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cwa.submit_time, '%Y-%m')").
Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid").
Joins("LEFT JOIN cast_work_analysis_extra cwae ON cwae.analysis_uuid = cwa.uuid").
Joins("left join bundle_order_records bor ON bor.uuid = cwae.bundle_order_uuid").
Where("cwa.submit_time >= ?", req.Start+" 00:00:00").
Where("cwa.submit_time <= ?", req.End+" 23:59:59").
Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and cwae.deleted_at = 0").
Where("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newDataAnalysisUsed).Error
if err != nil {
@ -621,11 +621,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
newConpetitiveUsed = conpetitiveCountInfo.ConpetitiveUsed + conpetitiveCountInfo.UnUsedConpetitive
} else {
query = app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr").
Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = ccr.artist_id COLLATE utf8mb4_general_ci AND ccr.submit_time >= bb.start_at AND ccr.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(ccr.submit_time, '%Y-%m')").
Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid").
Joins("LEFT JOIN cast_competitive_report_extra ccrpe ON ccrpe.report_uuid = ccr.uuid").
Joins("left join bundle_order_records bor ON bor.uuid = ccrpe.bundle_order_uuid").
Where("ccr.submit_time >= ?", req.Start+" 00:00:00").
Where("ccr.submit_time <= ?", req.End+" 23:59:59").
Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL").
Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and ccrpe.deleted_at = 0").
Where("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newConpetitiveUsed).Error
if err != nil {

4
internal/dao/invoiceDao.go
View File

@ -234,10 +234,10 @@ func GetInvoiceInfoByOrderNo(req *bundle.GetInvoiceInfoByOrderNoReq) (data []*mo
bor.pay_time AS pay_time,
invoice.paper_invocie_status AS paper_invocie_status
`).
Joins("left join bundle_order_records bor on invoice.order_no = bor.order_no and bor.deleted_at is null").
Joins("left join bundle_order_records bor on invoice.order_no COLLATE utf8mb4_general_ci = bor.order_no COLLATE utf8mb4_general_ci and bor.deleted_at is null").
Where("invoice.user_id = ?", req.UserId)
if req.OrderNo != "" {
query = query.Where("invoice.order_no = ?", req.OrderNo)
query = query.Where("invoice.order_no COLLATE utf8mb4_general_ci = ?", req.OrderNo)
}
query = query.Order("bor.pay_time DESC")
err = query.Find(&data).Error

7
pb/bundle.proto
View File

@ -2345,6 +2345,10 @@ message ExportWorkCastInfoResp{
repeated WorkCastInfo data = 1;
}
message OrderInfoByOrderUuidRequest{
string orderUuid = 1;
}
message GetInvoiceInfoByOrderNoReq{
string userId = 1;
string orderNo = 2;
@ -2372,9 +2376,6 @@ message GetLastInvoiceNoResp{
string lastNo = 1;
}
message OrderInfoByOrderUuidRequest{
string orderUuid = 1;
}
message UpdataInvoiceInfoReq{
string orderNo = 1;

236
pb/bundle/bundle.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.21.1
// protoc-gen-go v1.31.0
// protoc v5.26.0
// source: pb/bundle.proto
package bundle
@ -19828,6 +19828,53 @@ func (x *ExportWorkCastInfoResp) GetData() []*WorkCastInfo {
return nil
}
type OrderInfoByOrderUuidRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
OrderUuid string `protobuf:"bytes,1,opt,name=orderUuid,proto3" json:"orderUuid"`
}
func (x *OrderInfoByOrderUuidRequest) Reset() {
*x = OrderInfoByOrderUuidRequest{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[209]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *OrderInfoByOrderUuidRequest) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*OrderInfoByOrderUuidRequest) ProtoMessage() {}
func (x *OrderInfoByOrderUuidRequest) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[209]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use OrderInfoByOrderUuidRequest.ProtoReflect.Descriptor instead.
func (*OrderInfoByOrderUuidRequest) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{209}
}
func (x *OrderInfoByOrderUuidRequest) GetOrderUuid() string {
if x != nil {
return x.OrderUuid
}
return ""
}
type GetInvoiceInfoByOrderNoReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -19840,7 +19887,7 @@ type GetInvoiceInfoByOrderNoReq struct {
func (x *GetInvoiceInfoByOrderNoReq) Reset() {
*x = GetInvoiceInfoByOrderNoReq{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[209]
mi := &file_pb_bundle_proto_msgTypes[210]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -19853,7 +19900,7 @@ func (x *GetInvoiceInfoByOrderNoReq) String() string {
func (*GetInvoiceInfoByOrderNoReq) ProtoMessage() {}
func (x *GetInvoiceInfoByOrderNoReq) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[209]
mi := &file_pb_bundle_proto_msgTypes[210]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -19866,7 +19913,7 @@ func (x *GetInvoiceInfoByOrderNoReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GetInvoiceInfoByOrderNoReq.ProtoReflect.Descriptor instead.
func (*GetInvoiceInfoByOrderNoReq) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{209}
return file_pb_bundle_proto_rawDescGZIP(), []int{210}
}
func (x *GetInvoiceInfoByOrderNoReq) GetUserId() string {
@ -19901,7 +19948,7 @@ type InvoiceInfoByOrderNo struct {
func (x *InvoiceInfoByOrderNo) Reset() {
*x = InvoiceInfoByOrderNo{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[210]
mi := &file_pb_bundle_proto_msgTypes[211]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -19914,7 +19961,7 @@ func (x *InvoiceInfoByOrderNo) String() string {
func (*InvoiceInfoByOrderNo) ProtoMessage() {}
func (x *InvoiceInfoByOrderNo) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[210]
mi := &file_pb_bundle_proto_msgTypes[211]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -19927,7 +19974,7 @@ func (x *InvoiceInfoByOrderNo) ProtoReflect() protoreflect.Message {
// Deprecated: Use InvoiceInfoByOrderNo.ProtoReflect.Descriptor instead.
func (*InvoiceInfoByOrderNo) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{210}
return file_pb_bundle_proto_rawDescGZIP(), []int{211}
}
func (x *InvoiceInfoByOrderNo) GetOrderNo() string {
@ -19997,7 +20044,7 @@ type GetInvoiceInfoByOrderNoResp struct {
func (x *GetInvoiceInfoByOrderNoResp) Reset() {
*x = GetInvoiceInfoByOrderNoResp{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[211]
mi := &file_pb_bundle_proto_msgTypes[212]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -20010,7 +20057,7 @@ func (x *GetInvoiceInfoByOrderNoResp) String() string {
func (*GetInvoiceInfoByOrderNoResp) ProtoMessage() {}
func (x *GetInvoiceInfoByOrderNoResp) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[211]
mi := &file_pb_bundle_proto_msgTypes[212]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -20023,7 +20070,7 @@ func (x *GetInvoiceInfoByOrderNoResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GetInvoiceInfoByOrderNoResp.ProtoReflect.Descriptor instead.
func (*GetInvoiceInfoByOrderNoResp) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{211}
return file_pb_bundle_proto_rawDescGZIP(), []int{212}
}
func (x *GetInvoiceInfoByOrderNoResp) GetData() []*InvoiceInfoByOrderNo {
@ -20042,7 +20089,7 @@ type GetLastInvoiceNoReq struct {
func (x *GetLastInvoiceNoReq) Reset() {
*x = GetLastInvoiceNoReq{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[212]
mi := &file_pb_bundle_proto_msgTypes[213]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -20055,7 +20102,7 @@ func (x *GetLastInvoiceNoReq) String() string {
func (*GetLastInvoiceNoReq) ProtoMessage() {}
func (x *GetLastInvoiceNoReq) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[212]
mi := &file_pb_bundle_proto_msgTypes[213]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -20068,7 +20115,7 @@ func (x *GetLastInvoiceNoReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use GetLastInvoiceNoReq.ProtoReflect.Descriptor instead.
func (*GetLastInvoiceNoReq) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{212}
return file_pb_bundle_proto_rawDescGZIP(), []int{213}
}
type GetLastInvoiceNoResp struct {
@ -20082,7 +20129,7 @@ type GetLastInvoiceNoResp struct {
func (x *GetLastInvoiceNoResp) Reset() {
*x = GetLastInvoiceNoResp{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[213]
mi := &file_pb_bundle_proto_msgTypes[214]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -20095,7 +20142,7 @@ func (x *GetLastInvoiceNoResp) String() string {
func (*GetLastInvoiceNoResp) ProtoMessage() {}
func (x *GetLastInvoiceNoResp) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[213]
mi := &file_pb_bundle_proto_msgTypes[214]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -20108,7 +20155,7 @@ func (x *GetLastInvoiceNoResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use GetLastInvoiceNoResp.ProtoReflect.Descriptor instead.
func (*GetLastInvoiceNoResp) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{213}
return file_pb_bundle_proto_rawDescGZIP(), []int{214}
}
func (x *GetLastInvoiceNoResp) GetLastNo() string {
@ -20118,53 +20165,6 @@ func (x *GetLastInvoiceNoResp) GetLastNo() string {
return ""
}
type OrderInfoByOrderUuidRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
OrderUuid string `protobuf:"bytes,1,opt,name=orderUuid,proto3" json:"orderUuid"`
}
func (x *OrderInfoByOrderUuidRequest) Reset() {
*x = OrderInfoByOrderUuidRequest{}
if protoimpl.UnsafeEnabled {
mi := &file_pb_bundle_proto_msgTypes[214]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *OrderInfoByOrderUuidRequest) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*OrderInfoByOrderUuidRequest) ProtoMessage() {}
func (x *OrderInfoByOrderUuidRequest) ProtoReflect() protoreflect.Message {
mi := &file_pb_bundle_proto_msgTypes[214]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use OrderInfoByOrderUuidRequest.ProtoReflect.Descriptor instead.
func (*OrderInfoByOrderUuidRequest) Descriptor() ([]byte, []int) {
return file_pb_bundle_proto_rawDescGZIP(), []int{214}
}
func (x *OrderInfoByOrderUuidRequest) GetOrderUuid() string {
if x != nil {
return x.OrderUuid
}
return ""
}
type UpdataInvoiceInfoReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -24359,43 +24359,43 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x6f, 0x72, 0x74, 0x57, 0x6f, 0x72, 0x6b, 0x43, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x14, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x43,
0x61, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x4e, 0x0a,
0x1a, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42,
0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75,
0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x9a, 0x02,
0x0a, 0x14, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f,
0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e,
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f,
0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x1e,
0x0a, 0x0a, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01,
0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x1e,
0x0a, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e,
0x0a, 0x0a, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x03, 0x52, 0x0a, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20,
0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20,
0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
0x09, 0x52, 0x07, 0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x70, 0x61,
0x70, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x6f, 0x63, 0x69, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, 0x70, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x76,
0x6f, 0x63, 0x69, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x4f, 0x0a, 0x1b, 0x47, 0x65,
0x61, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3b, 0x0a,
0x1b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72, 0x64, 0x65,
0x72, 0x55, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09,
0x6f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x47, 0x65,
0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72,
0x64, 0x65, 0x72, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x04, 0x64, 0x61, 0x74,
0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65,
0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72,
0x64, 0x65, 0x72, 0x4e, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47,
0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x52,
0x65, 0x71, 0x22, 0x2e, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x76,
0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61,
0x73, 0x74, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74,
0x4e, 0x6f, 0x22, 0x3b, 0x0a, 0x1b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x42,
0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x75, 0x69, 0x64, 0x22,
0x64, 0x65, 0x72, 0x4e, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x9a, 0x02, 0x0a, 0x14, 0x49,
0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72, 0x64, 0x65,
0x72, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x1c, 0x0a,
0x09, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
0x52, 0x09, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x69,
0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
0x0a, 0x69, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x62,
0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x61,
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
0x0a, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74,
0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a,
0x07, 0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x70, 0x61, 0x70, 0x65, 0x72,
0x49, 0x6e, 0x76, 0x6f, 0x63, 0x69, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20,
0x01, 0x28, 0x03, 0x52, 0x12, 0x70, 0x61, 0x70, 0x65, 0x72, 0x49, 0x6e, 0x76, 0x6f, 0x63, 0x69,
0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x4f, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x49, 0x6e,
0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
0x4e, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x49, 0x6e,
0x76, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
0x4e, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x4c,
0x61, 0x73, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x52, 0x65, 0x71, 0x22,
0x2e, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63,
0x65, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x4e,
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x73, 0x74, 0x4e, 0x6f, 0x22,
0x42, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x61, 0x49, 0x6e, 0x76, 0x6f, 0x69, 0x63, 0x65,
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72,
0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e,
@ -25236,12 +25236,12 @@ var file_pb_bundle_proto_goTypes = []interface{}{
(*WorkCastInfo)(nil), // 206: bundle.WorkCastInfo
(*ExportWorkCastInfoReq)(nil), // 207: bundle.ExportWorkCastInfoReq
(*ExportWorkCastInfoResp)(nil), // 208: bundle.ExportWorkCastInfoResp
(*GetInvoiceInfoByOrderNoReq)(nil), // 209: bundle.GetInvoiceInfoByOrderNoReq
(*InvoiceInfoByOrderNo)(nil), // 210: bundle.InvoiceInfoByOrderNo
(*GetInvoiceInfoByOrderNoResp)(nil), // 211: bundle.GetInvoiceInfoByOrderNoResp
(*GetLastInvoiceNoReq)(nil), // 212: bundle.GetLastInvoiceNoReq
(*GetLastInvoiceNoResp)(nil), // 213: bundle.GetLastInvoiceNoResp
(*OrderInfoByOrderUuidRequest)(nil), // 214: bundle.OrderInfoByOrderUuidRequest
(*OrderInfoByOrderUuidRequest)(nil), // 209: bundle.OrderInfoByOrderUuidRequest
(*GetInvoiceInfoByOrderNoReq)(nil), // 210: bundle.GetInvoiceInfoByOrderNoReq
(*InvoiceInfoByOrderNo)(nil), // 211: bundle.InvoiceInfoByOrderNo
(*GetInvoiceInfoByOrderNoResp)(nil), // 212: bundle.GetInvoiceInfoByOrderNoResp
(*GetLastInvoiceNoReq)(nil), // 213: bundle.GetLastInvoiceNoReq
(*GetLastInvoiceNoResp)(nil), // 214: bundle.GetLastInvoiceNoResp
(*UpdataInvoiceInfoReq)(nil), // 215: bundle.UpdataInvoiceInfoReq
(*UpdataInvoiceInfoResp)(nil), // 216: bundle.UpdataInvoiceInfoResp
}
@ -25309,7 +25309,7 @@ var file_pb_bundle_proto_depIdxs = []int32{
188, // 60: bundle.DevelopmentCycle.attachments:type_name -> bundle.AttachmentItem
197, // 61: bundle.GetInvoiceListResp.data:type_name -> bundle.InvoiceInfo
206, // 62: bundle.ExportWorkCastInfoResp.data:type_name -> bundle.WorkCastInfo
210, // 63: bundle.GetInvoiceInfoByOrderNoResp.data:type_name -> bundle.InvoiceInfoByOrderNo
211, // 63: bundle.GetInvoiceInfoByOrderNoResp.data:type_name -> bundle.InvoiceInfoByOrderNo
19, // 64: bundle.Bundle.CreateBundle:input_type -> bundle.BundleProfile
19, // 65: bundle.Bundle.UpdateBundle:input_type -> bundle.BundleProfile
25, // 66: bundle.Bundle.DeleteBundle:input_type -> bundle.DelBundleRequest
@ -25403,8 +25403,8 @@ var file_pb_bundle_proto_depIdxs = []int32{
200, // 154: bundle.Bundle.UpdateInvoiceExpressInfo:input_type -> bundle.UpdateInvoiceExpressInfoReq
202, // 155: bundle.Bundle.GetInvoiceExpressInfo:input_type -> bundle.GetInvoiceExpressInfoReq
204, // 156: bundle.Bundle.GetOrderInfoByOrderNo:input_type -> bundle.GetOrderInfoByOrderNoReq
209, // 157: bundle.Bundle.GetInvoiceInfoByOrderNo:input_type -> bundle.GetInvoiceInfoByOrderNoReq
212, // 158: bundle.Bundle.GetLastInvoiceNo:input_type -> bundle.GetLastInvoiceNoReq
210, // 157: bundle.Bundle.GetInvoiceInfoByOrderNo:input_type -> bundle.GetInvoiceInfoByOrderNoReq
213, // 158: bundle.Bundle.GetLastInvoiceNo:input_type -> bundle.GetLastInvoiceNoReq
215, // 159: bundle.Bundle.UpdataInvoiceInfo:input_type -> bundle.UpdataInvoiceInfoReq
207, // 160: bundle.Bundle.ExportWorkCastInfo:input_type -> bundle.ExportWorkCastInfoReq
170, // 161: bundle.Bundle.GetCustomerList:input_type -> bundle.CustomerListRequest
@ -25417,7 +25417,7 @@ var file_pb_bundle_proto_depIdxs = []int32{
184, // 168: bundle.Bundle.GetDevelopmentCyclesByContractUUID:input_type -> bundle.GetDevelopmentCyclesByContractUUIDRequest
186, // 169: bundle.Bundle.GetPaymentCyclesByContractUUID:input_type -> bundle.GetPaymentCyclesByContractUUIDRequest
32, // 170: bundle.Bundle.UpdateOrderRecordByOrderUuid:input_type -> bundle.OrderRecord
214, // 171: bundle.Bundle.OrderListByOrderUuid:input_type -> bundle.OrderInfoByOrderUuidRequest
209, // 171: bundle.Bundle.OrderListByOrderUuid:input_type -> bundle.OrderInfoByOrderUuidRequest
18, // 172: bundle.Bundle.CreateBundle:output_type -> bundle.CommonResponse
18, // 173: bundle.Bundle.UpdateBundle:output_type -> bundle.CommonResponse
18, // 174: bundle.Bundle.DeleteBundle:output_type -> bundle.CommonResponse
@ -25511,8 +25511,8 @@ var file_pb_bundle_proto_depIdxs = []int32{
201, // 262: bundle.Bundle.UpdateInvoiceExpressInfo:output_type -> bundle.UpdateInvoiceExpressInfoResp
203, // 263: bundle.Bundle.GetInvoiceExpressInfo:output_type -> bundle.GetInvoiceExpressInfoResp
205, // 264: bundle.Bundle.GetOrderInfoByOrderNo:output_type -> bundle.GetOrderInfoByOrderNoResp
211, // 265: bundle.Bundle.GetInvoiceInfoByOrderNo:output_type -> bundle.GetInvoiceInfoByOrderNoResp
213, // 266: bundle.Bundle.GetLastInvoiceNo:output_type -> bundle.GetLastInvoiceNoResp
212, // 265: bundle.Bundle.GetInvoiceInfoByOrderNo:output_type -> bundle.GetInvoiceInfoByOrderNoResp
214, // 266: bundle.Bundle.GetLastInvoiceNo:output_type -> bundle.GetLastInvoiceNoResp
216, // 267: bundle.Bundle.UpdataInvoiceInfo:output_type -> bundle.UpdataInvoiceInfoResp
208, // 268: bundle.Bundle.ExportWorkCastInfo:output_type -> bundle.ExportWorkCastInfoResp
171, // 269: bundle.Bundle.GetCustomerList:output_type -> bundle.CustomerListResponse
@ -28048,7 +28048,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[209].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetInvoiceInfoByOrderNoReq); i {
switch v := v.(*OrderInfoByOrderUuidRequest); i {
case 0:
return &v.state
case 1:
@ -28060,7 +28060,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[210].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*InvoiceInfoByOrderNo); i {
switch v := v.(*GetInvoiceInfoByOrderNoReq); i {
case 0:
return &v.state
case 1:
@ -28072,7 +28072,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[211].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetInvoiceInfoByOrderNoResp); i {
switch v := v.(*InvoiceInfoByOrderNo); i {
case 0:
return &v.state
case 1:
@ -28084,7 +28084,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[212].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetLastInvoiceNoReq); i {
switch v := v.(*GetInvoiceInfoByOrderNoResp); i {
case 0:
return &v.state
case 1:
@ -28096,7 +28096,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[213].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetLastInvoiceNoResp); i {
switch v := v.(*GetLastInvoiceNoReq); i {
case 0:
return &v.state
case 1:
@ -28108,7 +28108,7 @@ func file_pb_bundle_proto_init() {
}
}
file_pb_bundle_proto_msgTypes[214].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*OrderInfoByOrderUuidRequest); i {
switch v := v.(*GetLastInvoiceNoResp); i {
case 0:
return &v.state
case 1:

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

@ -1071,6 +1071,9 @@ func (this *ExportWorkCastInfoResp) Validate() error {
}
return nil
}
func (this *OrderInfoByOrderUuidRequest) Validate() error {
return nil
}
func (this *GetInvoiceInfoByOrderNoReq) Validate() error {
return nil
}
@ -1093,9 +1096,6 @@ func (this *GetLastInvoiceNoReq) Validate() error {
func (this *GetLastInvoiceNoResp) Validate() error {
return nil
}
func (this *OrderInfoByOrderUuidRequest) Validate() error {
return nil
}
func (this *UpdataInvoiceInfoReq) Validate() error {
return nil
}

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

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions:
// - protoc-gen-go-triple v1.0.8
// - protoc v3.21.1
// - protoc-gen-go-triple v1.0.5
// - protoc v5.26.0
// source: pb/bundle.proto
package bundle