From 95e25fce9e67bda68a190f8a6b30f6a0f266b570 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sat, 18 Mar 2023 11:42:10 +0800 Subject: [PATCH 01/25] fix: remove order field deduct_amount --- core/domain/order/normal_order.go | 1 - core/domain/order/order.go | 1 - upgrade/sql/2023-03.sql | 6 +++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index a7df2b436..d9d8cd8d0 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -535,7 +535,6 @@ func (o *normalOrderImpl) createPaymentForOrder() error { PayerId: v.BuyerId, ItemAmount: itemAmount, DiscountAmount: discountAmount, - DeductAmount: 0, AdjustAmount: 0, FinalAmount: finalAmount, TotalAmount: finalAmount, diff --git a/core/domain/order/order.go b/core/domain/order/order.go index e9c658e1f..6b6409f2e 100755 --- a/core/domain/order/order.go +++ b/core/domain/order/order.go @@ -254,7 +254,6 @@ func (o *baseOrderImpl) createPaymentOrder() *payment.Order { PayerId: buyerId, TotalAmount: 0, DiscountAmount: 0, - DeductAmount: 0, AdjustAmount: 0, FinalAmount: 0, PayFlag: payment.PAllFlag, diff --git a/upgrade/sql/2023-03.sql b/upgrade/sql/2023-03.sql index 11a5584cd..3f33dc2b7 100644 --- a/upgrade/sql/2023-03.sql +++ b/upgrade/sql/2023-03.sql @@ -219,4 +219,8 @@ COMMENT ON TABLE public.ad_hyperlink IS '文本广告'; COMMENT ON COLUMN public.ad_hyperlink.id IS '编号'; COMMENT ON COLUMN public.ad_hyperlink.ad_id IS '广告编号'; COMMENT ON COLUMN public.ad_hyperlink.title IS '标题'; -COMMENT ON COLUMN public.ad_hyperlink.link_url IS '链接地址'; \ No newline at end of file +COMMENT ON COLUMN public.ad_hyperlink.link_url IS '链接地址'; + +/** 删除订单抵扣金额 */ +ALTER TABLE IF EXISTS public.order_list + DROP deduct_amount; \ No newline at end of file From 7b3825a200693d538acc2e03721c571c3fb54d1e Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sat, 18 Mar 2023 12:27:21 +0800 Subject: [PATCH 02/25] fix: remove order field deduct_amount --- core/service/idl/order_service.proto | 9 - core/service/proto/advertisement_dto.pb.go | 2 +- .../service/proto/advertisement_service.pb.go | 2 +- .../proto/advertisement_service_grpc.pb.go | 77 ++-- core/service/proto/aftersales_service.pb.go | 2 +- .../proto/aftersales_service_grpc.pb.go | 72 ++- core/service/proto/app_service.pb.go | 2 +- core/service/proto/app_service_grpc.pb.go | 42 +- core/service/proto/bank_dto.pb.go | 2 +- core/service/proto/cart_dto.pb.go | 2 +- core/service/proto/cart_service.pb.go | 2 +- core/service/proto/cart_service_grpc.pb.go | 32 +- core/service/proto/code_service.pb.go | 2 +- core/service/proto/code_service_grpc.pb.go | 37 +- core/service/proto/content_service.pb.go | 2 +- core/service/proto/content_service_grpc.pb.go | 67 ++- core/service/proto/coupon_dto.pb.go | 2 +- core/service/proto/events_dto.pb.go | 2 +- core/service/proto/execution_service.pb.go | 2 +- .../proto/execution_service_grpc.pb.go | 42 +- core/service/proto/express_service.pb.go | 2 +- core/service/proto/express_service_grpc.pb.go | 52 +-- core/service/proto/finance_service.pb.go | 2 +- core/service/proto/finance_service_grpc.pb.go | 37 +- core/service/proto/foundation_dto.pb.go | 2 +- core/service/proto/foundation_service.pb.go | 2 +- .../proto/foundation_service_grpc.pb.go | 122 ++--- core/service/proto/global.pb.go | 2 +- core/service/proto/item_dto.pb.go | 2 +- core/service/proto/item_service.pb.go | 2 +- core/service/proto/item_service_grpc.pb.go | 117 ++--- core/service/proto/member_dto.pb.go | 2 +- core/service/proto/member_service.pb.go | 2 +- core/service/proto/member_service_grpc.pb.go | 417 +++++++----------- core/service/proto/merchant_dto.pb.go | 2 +- core/service/proto/merchant_service.pb.go | 2 +- .../service/proto/merchant_service_grpc.pb.go | 217 ++++----- core/service/proto/message_dto.pb.go | 2 +- core/service/proto/message_service.pb.go | 2 +- core/service/proto/message_service_grpc.pb.go | 52 +-- core/service/proto/order_dto.pb.go | 2 +- core/service/proto/order_service.pb.go | 2 +- core/service/proto/order_service_grpc.pb.go | 103 ++--- core/service/proto/payment_dto.pb.go | 2 +- core/service/proto/payment_service.pb.go | 2 +- core/service/proto/payment_service_grpc.pb.go | 87 ++-- core/service/proto/portal_service.pb.go | 2 +- core/service/proto/portal_service_grpc.pb.go | 62 +-- core/service/proto/product_service.pb.go | 2 +- core/service/proto/product_service_grpc.pb.go | 102 ++--- core/service/proto/query_dto.pb.go | 2 +- core/service/proto/query_service.pb.go | 2 +- core/service/proto/query_service_grpc.pb.go | 77 ++-- core/service/proto/quick_pay_service.pb.go | 2 +- .../proto/quick_pay_service_grpc.pb.go | 42 +- core/service/proto/rbac_service.pb.go | 2 +- core/service/proto/rbac_service_grpc.pb.go | 147 +++--- core/service/proto/registry_service.pb.go | 2 +- .../service/proto/registry_service_grpc.pb.go | 57 +-- core/service/proto/shipment_dto.pb.go | 2 +- core/service/proto/shipment_service.pb.go | 2 +- .../service/proto/shipment_service_grpc.pb.go | 27 +- core/service/proto/shop_service.pb.go | 2 +- core/service/proto/shop_service_grpc.pb.go | 57 +-- core/service/proto/status_service.pb.go | 2 +- core/service/proto/status_service_grpc.pb.go | 12 +- core/service/proto/test.pb.go | 2 +- core/service/proto/test_grpc.pb.go | 12 +- core/service/proto/wallet_dto.pb.go | 2 +- core/service/proto/wallet_service.pb.go | 2 +- core/service/proto/wallet_service_grpc.pb.go | 82 ++-- 71 files changed, 903 insertions(+), 1442 deletions(-) diff --git a/core/service/idl/order_service.proto b/core/service/idl/order_service.proto index ab685c293..f760214ee 100755 --- a/core/service/idl/order_service.proto +++ b/core/service/idl/order_service.proto @@ -22,15 +22,6 @@ service OrderService { // 获取子订单,orderId rpc GetOrder (OrderNoV2) returns (SSingleOrder) { } - - // 获取订单和商品项信息 - // rpc GetOrderAndItems (GetOrderItemsRequest) returns (SSingleOrder) { - // } - // 根据订单号获取子订单,orderNo - // rpc GetSubOrderByNo (String) returns (SSingleOrder) {} - // 获取订单商品项,subOrderId - // rpc GetSubOrderItems (Int64) returns (ComplexItemsResponse) { - // }~ // 交易单现金支付,orderId rpc TradeOrderCashPay (Int64) returns (Result) { } diff --git a/core/service/proto/advertisement_dto.pb.go b/core/service/proto/advertisement_dto.pb.go index cace3e0f2..edf6b6bff 100644 --- a/core/service/proto/advertisement_dto.pb.go +++ b/core/service/proto/advertisement_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/advertisement_dto.proto package proto diff --git a/core/service/proto/advertisement_service.pb.go b/core/service/proto/advertisement_service.pb.go index 67a24e633..6d5b131d9 100644 --- a/core/service/proto/advertisement_service.pb.go +++ b/core/service/proto/advertisement_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: advertisement_service.proto package proto diff --git a/core/service/proto/advertisement_service_grpc.pb.go b/core/service/proto/advertisement_service_grpc.pb.go index 9fa93937a..83eb0dc2c 100644 --- a/core/service/proto/advertisement_service_grpc.pb.go +++ b/core/service/proto/advertisement_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: advertisement_service.proto package proto @@ -18,23 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - AdvertisementService_GetGroups_FullMethodName = "/AdvertisementService/GetGroups" - AdvertisementService_GetPosition_FullMethodName = "/AdvertisementService/GetPosition" - AdvertisementService_SaveAdPosition_FullMethodName = "/AdvertisementService/SaveAdPosition" - AdvertisementService_DeleteAdPosition_FullMethodName = "/AdvertisementService/DeleteAdPosition" - AdvertisementService_PutDefaultAd_FullMethodName = "/AdvertisementService/PutDefaultAd" - AdvertisementService_QueryAd_FullMethodName = "/AdvertisementService/QueryAd" - AdvertisementService_QueryAdvertisementData_FullMethodName = "/AdvertisementService/QueryAdvertisementData" - AdvertisementService_SetUserAd_FullMethodName = "/AdvertisementService/SetUserAd" - AdvertisementService_GetAdvertisement_FullMethodName = "/AdvertisementService/GetAdvertisement" - AdvertisementService_SaveAd_FullMethodName = "/AdvertisementService/SaveAd" - AdvertisementService_DeleteAd_FullMethodName = "/AdvertisementService/DeleteAd" - AdvertisementService_SaveSwiperAdImage_FullMethodName = "/AdvertisementService/SaveSwiperAdImage" - AdvertisementService_GetSwiperAdImage_FullMethodName = "/AdvertisementService/GetSwiperAdImage" - AdvertisementService_DeleteSwiperAdImage_FullMethodName = "/AdvertisementService/DeleteSwiperAdImage" -) - // AdvertisementServiceClient is the client API for AdvertisementService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -75,7 +58,7 @@ func NewAdvertisementServiceClient(cc grpc.ClientConnInterface) AdvertisementSer func (c *advertisementServiceClient) GetGroups(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*AdGroupResponse, error) { out := new(AdGroupResponse) - err := c.cc.Invoke(ctx, AdvertisementService_GetGroups_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/GetGroups", in, out, opts...) if err != nil { return nil, err } @@ -84,7 +67,7 @@ func (c *advertisementServiceClient) GetGroups(ctx context.Context, in *Empty, o func (c *advertisementServiceClient) GetPosition(ctx context.Context, in *AdPositionId, opts ...grpc.CallOption) (*SAdPosition, error) { out := new(SAdPosition) - err := c.cc.Invoke(ctx, AdvertisementService_GetPosition_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/GetPosition", in, out, opts...) if err != nil { return nil, err } @@ -93,7 +76,7 @@ func (c *advertisementServiceClient) GetPosition(ctx context.Context, in *AdPosi func (c *advertisementServiceClient) SaveAdPosition(ctx context.Context, in *SAdPosition, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_SaveAdPosition_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/SaveAdPosition", in, out, opts...) if err != nil { return nil, err } @@ -102,7 +85,7 @@ func (c *advertisementServiceClient) SaveAdPosition(ctx context.Context, in *SAd func (c *advertisementServiceClient) DeleteAdPosition(ctx context.Context, in *AdPositionId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_DeleteAdPosition_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteAdPosition", in, out, opts...) if err != nil { return nil, err } @@ -111,7 +94,7 @@ func (c *advertisementServiceClient) DeleteAdPosition(ctx context.Context, in *A func (c *advertisementServiceClient) PutDefaultAd(ctx context.Context, in *SetDefaultAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_PutDefaultAd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/PutDefaultAd", in, out, opts...) if err != nil { return nil, err } @@ -120,7 +103,7 @@ func (c *advertisementServiceClient) PutDefaultAd(ctx context.Context, in *SetDe func (c *advertisementServiceClient) QueryAd(ctx context.Context, in *QueryAdRequest, opts ...grpc.CallOption) (*QueryAdResponse, error) { out := new(QueryAdResponse) - err := c.cc.Invoke(ctx, AdvertisementService_QueryAd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/QueryAd", in, out, opts...) if err != nil { return nil, err } @@ -129,7 +112,7 @@ func (c *advertisementServiceClient) QueryAd(ctx context.Context, in *QueryAdReq func (c *advertisementServiceClient) QueryAdvertisementData(ctx context.Context, in *QueryAdvertisementDataRequest, opts ...grpc.CallOption) (*QueryAdvertisementDataResponse, error) { out := new(QueryAdvertisementDataResponse) - err := c.cc.Invoke(ctx, AdvertisementService_QueryAdvertisementData_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/QueryAdvertisementData", in, out, opts...) if err != nil { return nil, err } @@ -138,7 +121,7 @@ func (c *advertisementServiceClient) QueryAdvertisementData(ctx context.Context, func (c *advertisementServiceClient) SetUserAd(ctx context.Context, in *SetUserAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_SetUserAd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/SetUserAd", in, out, opts...) if err != nil { return nil, err } @@ -147,7 +130,7 @@ func (c *advertisementServiceClient) SetUserAd(ctx context.Context, in *SetUserA func (c *advertisementServiceClient) GetAdvertisement(ctx context.Context, in *AdIdRequest, opts ...grpc.CallOption) (*SAdDto, error) { out := new(SAdDto) - err := c.cc.Invoke(ctx, AdvertisementService_GetAdvertisement_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/GetAdvertisement", in, out, opts...) if err != nil { return nil, err } @@ -156,7 +139,7 @@ func (c *advertisementServiceClient) GetAdvertisement(ctx context.Context, in *A func (c *advertisementServiceClient) SaveAd(ctx context.Context, in *SaveAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_SaveAd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/SaveAd", in, out, opts...) if err != nil { return nil, err } @@ -165,7 +148,7 @@ func (c *advertisementServiceClient) SaveAd(ctx context.Context, in *SaveAdReque func (c *advertisementServiceClient) DeleteAd(ctx context.Context, in *AdIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_DeleteAd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteAd", in, out, opts...) if err != nil { return nil, err } @@ -174,7 +157,7 @@ func (c *advertisementServiceClient) DeleteAd(ctx context.Context, in *AdIdReque func (c *advertisementServiceClient) SaveSwiperAdImage(ctx context.Context, in *SaveSwiperImageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_SaveSwiperAdImage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/SaveSwiperAdImage", in, out, opts...) if err != nil { return nil, err } @@ -183,7 +166,7 @@ func (c *advertisementServiceClient) SaveSwiperAdImage(ctx context.Context, in * func (c *advertisementServiceClient) GetSwiperAdImage(ctx context.Context, in *ImageIdRequest, opts ...grpc.CallOption) (*SImageAdData, error) { out := new(SImageAdData) - err := c.cc.Invoke(ctx, AdvertisementService_GetSwiperAdImage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/GetSwiperAdImage", in, out, opts...) if err != nil { return nil, err } @@ -192,7 +175,7 @@ func (c *advertisementServiceClient) GetSwiperAdImage(ctx context.Context, in *I func (c *advertisementServiceClient) DeleteSwiperAdImage(ctx context.Context, in *ImageIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AdvertisementService_DeleteSwiperAdImage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteSwiperAdImage", in, out, opts...) if err != nil { return nil, err } @@ -299,7 +282,7 @@ func _AdvertisementService_GetGroups_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_GetGroups_FullMethodName, + FullMethod: "/AdvertisementService/GetGroups", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetGroups(ctx, req.(*Empty)) @@ -317,7 +300,7 @@ func _AdvertisementService_GetPosition_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_GetPosition_FullMethodName, + FullMethod: "/AdvertisementService/GetPosition", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetPosition(ctx, req.(*AdPositionId)) @@ -335,7 +318,7 @@ func _AdvertisementService_SaveAdPosition_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_SaveAdPosition_FullMethodName, + FullMethod: "/AdvertisementService/SaveAdPosition", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveAdPosition(ctx, req.(*SAdPosition)) @@ -353,7 +336,7 @@ func _AdvertisementService_DeleteAdPosition_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_DeleteAdPosition_FullMethodName, + FullMethod: "/AdvertisementService/DeleteAdPosition", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteAdPosition(ctx, req.(*AdPositionId)) @@ -371,7 +354,7 @@ func _AdvertisementService_PutDefaultAd_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_PutDefaultAd_FullMethodName, + FullMethod: "/AdvertisementService/PutDefaultAd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).PutDefaultAd(ctx, req.(*SetDefaultAdRequest)) @@ -389,7 +372,7 @@ func _AdvertisementService_QueryAd_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_QueryAd_FullMethodName, + FullMethod: "/AdvertisementService/QueryAd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).QueryAd(ctx, req.(*QueryAdRequest)) @@ -407,7 +390,7 @@ func _AdvertisementService_QueryAdvertisementData_Handler(srv interface{}, ctx c } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_QueryAdvertisementData_FullMethodName, + FullMethod: "/AdvertisementService/QueryAdvertisementData", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).QueryAdvertisementData(ctx, req.(*QueryAdvertisementDataRequest)) @@ -425,7 +408,7 @@ func _AdvertisementService_SetUserAd_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_SetUserAd_FullMethodName, + FullMethod: "/AdvertisementService/SetUserAd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SetUserAd(ctx, req.(*SetUserAdRequest)) @@ -443,7 +426,7 @@ func _AdvertisementService_GetAdvertisement_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_GetAdvertisement_FullMethodName, + FullMethod: "/AdvertisementService/GetAdvertisement", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetAdvertisement(ctx, req.(*AdIdRequest)) @@ -461,7 +444,7 @@ func _AdvertisementService_SaveAd_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_SaveAd_FullMethodName, + FullMethod: "/AdvertisementService/SaveAd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveAd(ctx, req.(*SaveAdRequest)) @@ -479,7 +462,7 @@ func _AdvertisementService_DeleteAd_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_DeleteAd_FullMethodName, + FullMethod: "/AdvertisementService/DeleteAd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteAd(ctx, req.(*AdIdRequest)) @@ -497,7 +480,7 @@ func _AdvertisementService_SaveSwiperAdImage_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_SaveSwiperAdImage_FullMethodName, + FullMethod: "/AdvertisementService/SaveSwiperAdImage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveSwiperAdImage(ctx, req.(*SaveSwiperImageRequest)) @@ -515,7 +498,7 @@ func _AdvertisementService_GetSwiperAdImage_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_GetSwiperAdImage_FullMethodName, + FullMethod: "/AdvertisementService/GetSwiperAdImage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetSwiperAdImage(ctx, req.(*ImageIdRequest)) @@ -533,7 +516,7 @@ func _AdvertisementService_DeleteSwiperAdImage_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AdvertisementService_DeleteSwiperAdImage_FullMethodName, + FullMethod: "/AdvertisementService/DeleteSwiperAdImage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteSwiperAdImage(ctx, req.(*ImageIdRequest)) diff --git a/core/service/proto/aftersales_service.pb.go b/core/service/proto/aftersales_service.pb.go index 602fb038b..12f23335c 100644 --- a/core/service/proto/aftersales_service.pb.go +++ b/core/service/proto/aftersales_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: aftersales_service.proto package proto diff --git a/core/service/proto/aftersales_service_grpc.pb.go b/core/service/proto/aftersales_service_grpc.pb.go index 4ccf14bbe..f73d134fc 100644 --- a/core/service/proto/aftersales_service_grpc.pb.go +++ b/core/service/proto/aftersales_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: aftersales_service.proto package proto @@ -18,22 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - AfterSalesService_SubmitAfterSalesOrder_FullMethodName = "/AfterSalesService/SubmitAfterSalesOrder" - AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName = "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder" - AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName = "/AfterSalesService/QueryPagerAfterSalesOrderOfMember" - AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName = "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor" - AfterSalesService_GetAfterSaleOrder_FullMethodName = "/AfterSalesService/GetAfterSaleOrder" - AfterSalesService_AgreeAfterSales_FullMethodName = "/AfterSalesService/AgreeAfterSales" - AfterSalesService_DeclineAfterSales_FullMethodName = "/AfterSalesService/DeclineAfterSales" - AfterSalesService_RequestIntercede_FullMethodName = "/AfterSalesService/RequestIntercede" - AfterSalesService_ConfirmAfterSales_FullMethodName = "/AfterSalesService/ConfirmAfterSales" - AfterSalesService_RejectAfterSales_FullMethodName = "/AfterSalesService/RejectAfterSales" - AfterSalesService_ProcessAfterSalesOrder_FullMethodName = "/AfterSalesService/ProcessAfterSalesOrder" - AfterSalesService_ReturnShipment_FullMethodName = "/AfterSalesService/ReturnShipment" - AfterSalesService_ReceiveItem_FullMethodName = "/AfterSalesService/ReceiveItem" -) - // AfterSalesServiceClient is the client API for AfterSalesService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -76,7 +60,7 @@ func NewAfterSalesServiceClient(cc grpc.ClientConnInterface) AfterSalesServiceCl func (c *afterSalesServiceClient) SubmitAfterSalesOrder(ctx context.Context, in *SubmitAfterSalesOrderRequest, opts ...grpc.CallOption) (*SubmitAfterSalesOrderResponse, error) { out := new(SubmitAfterSalesOrderResponse) - err := c.cc.Invoke(ctx, AfterSalesService_SubmitAfterSalesOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/SubmitAfterSalesOrder", in, out, opts...) if err != nil { return nil, err } @@ -85,7 +69,7 @@ func (c *afterSalesServiceClient) SubmitAfterSalesOrder(ctx context.Context, in func (c *afterSalesServiceClient) GetAllAfterSalesOrderOfSaleOrder(ctx context.Context, in *OriginOrderIdRequest, opts ...grpc.CallOption) (*AfterSalesOrderListResponse, error) { out := new(AfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder", in, out, opts...) if err != nil { return nil, err } @@ -94,7 +78,7 @@ func (c *afterSalesServiceClient) GetAllAfterSalesOrderOfSaleOrder(ctx context.C func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfMember(ctx context.Context, in *PagingBuyerOrdersRequest, opts ...grpc.CallOption) (*PagingBuyerAfterSalesOrderListResponse, error) { out := new(PagingBuyerAfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/QueryPagerAfterSalesOrderOfMember", in, out, opts...) if err != nil { return nil, err } @@ -103,7 +87,7 @@ func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfMember(ctx context. func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfVendor(ctx context.Context, in *PagingSellerOrdersRequest, opts ...grpc.CallOption) (*PagingSellerAfterSalesOrderListResponse, error) { out := new(PagingSellerAfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor", in, out, opts...) if err != nil { return nil, err } @@ -112,7 +96,7 @@ func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfVendor(ctx context. func (c *afterSalesServiceClient) GetAfterSaleOrder(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*SAfterSalesOrder, error) { out := new(SAfterSalesOrder) - err := c.cc.Invoke(ctx, AfterSalesService_GetAfterSaleOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/GetAfterSaleOrder", in, out, opts...) if err != nil { return nil, err } @@ -121,7 +105,7 @@ func (c *afterSalesServiceClient) GetAfterSaleOrder(ctx context.Context, in *Aft func (c *afterSalesServiceClient) AgreeAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_AgreeAfterSales_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/AgreeAfterSales", in, out, opts...) if err != nil { return nil, err } @@ -130,7 +114,7 @@ func (c *afterSalesServiceClient) AgreeAfterSales(ctx context.Context, in *After func (c *afterSalesServiceClient) DeclineAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_DeclineAfterSales_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/DeclineAfterSales", in, out, opts...) if err != nil { return nil, err } @@ -139,7 +123,7 @@ func (c *afterSalesServiceClient) DeclineAfterSales(ctx context.Context, in *Aft func (c *afterSalesServiceClient) RequestIntercede(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_RequestIntercede_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/RequestIntercede", in, out, opts...) if err != nil { return nil, err } @@ -148,7 +132,7 @@ func (c *afterSalesServiceClient) RequestIntercede(ctx context.Context, in *Afte func (c *afterSalesServiceClient) ConfirmAfterSales(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_ConfirmAfterSales_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/ConfirmAfterSales", in, out, opts...) if err != nil { return nil, err } @@ -157,7 +141,7 @@ func (c *afterSalesServiceClient) ConfirmAfterSales(ctx context.Context, in *Aft func (c *afterSalesServiceClient) RejectAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_RejectAfterSales_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/RejectAfterSales", in, out, opts...) if err != nil { return nil, err } @@ -166,7 +150,7 @@ func (c *afterSalesServiceClient) RejectAfterSales(ctx context.Context, in *Afte func (c *afterSalesServiceClient) ProcessAfterSalesOrder(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_ProcessAfterSalesOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/ProcessAfterSalesOrder", in, out, opts...) if err != nil { return nil, err } @@ -175,7 +159,7 @@ func (c *afterSalesServiceClient) ProcessAfterSalesOrder(ctx context.Context, in func (c *afterSalesServiceClient) ReturnShipment(ctx context.Context, in *ReturnShipmentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_ReturnShipment_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/ReturnShipment", in, out, opts...) if err != nil { return nil, err } @@ -184,7 +168,7 @@ func (c *afterSalesServiceClient) ReturnShipment(ctx context.Context, in *Return func (c *afterSalesServiceClient) ReceiveItem(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AfterSalesService_ReceiveItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AfterSalesService/ReceiveItem", in, out, opts...) if err != nil { return nil, err } @@ -290,7 +274,7 @@ func _AfterSalesService_SubmitAfterSalesOrder_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_SubmitAfterSalesOrder_FullMethodName, + FullMethod: "/AfterSalesService/SubmitAfterSalesOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).SubmitAfterSalesOrder(ctx, req.(*SubmitAfterSalesOrderRequest)) @@ -308,7 +292,7 @@ func _AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_Handler(srv interface{} } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName, + FullMethod: "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).GetAllAfterSalesOrderOfSaleOrder(ctx, req.(*OriginOrderIdRequest)) @@ -326,7 +310,7 @@ func _AfterSalesService_QueryPagerAfterSalesOrderOfMember_Handler(srv interface{ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName, + FullMethod: "/AfterSalesService/QueryPagerAfterSalesOrderOfMember", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).QueryPagerAfterSalesOrderOfMember(ctx, req.(*PagingBuyerOrdersRequest)) @@ -344,7 +328,7 @@ func _AfterSalesService_QueryPagerAfterSalesOrderOfVendor_Handler(srv interface{ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName, + FullMethod: "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).QueryPagerAfterSalesOrderOfVendor(ctx, req.(*PagingSellerOrdersRequest)) @@ -362,7 +346,7 @@ func _AfterSalesService_GetAfterSaleOrder_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_GetAfterSaleOrder_FullMethodName, + FullMethod: "/AfterSalesService/GetAfterSaleOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).GetAfterSaleOrder(ctx, req.(*AfterSalesOrderNo)) @@ -380,7 +364,7 @@ func _AfterSalesService_AgreeAfterSales_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_AgreeAfterSales_FullMethodName, + FullMethod: "/AfterSalesService/AgreeAfterSales", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).AgreeAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -398,7 +382,7 @@ func _AfterSalesService_DeclineAfterSales_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_DeclineAfterSales_FullMethodName, + FullMethod: "/AfterSalesService/DeclineAfterSales", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).DeclineAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -416,7 +400,7 @@ func _AfterSalesService_RequestIntercede_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_RequestIntercede_FullMethodName, + FullMethod: "/AfterSalesService/RequestIntercede", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).RequestIntercede(ctx, req.(*AfterSalesProcessRequest)) @@ -434,7 +418,7 @@ func _AfterSalesService_ConfirmAfterSales_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_ConfirmAfterSales_FullMethodName, + FullMethod: "/AfterSalesService/ConfirmAfterSales", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ConfirmAfterSales(ctx, req.(*AfterSalesOrderNo)) @@ -452,7 +436,7 @@ func _AfterSalesService_RejectAfterSales_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_RejectAfterSales_FullMethodName, + FullMethod: "/AfterSalesService/RejectAfterSales", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).RejectAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -470,7 +454,7 @@ func _AfterSalesService_ProcessAfterSalesOrder_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_ProcessAfterSalesOrder_FullMethodName, + FullMethod: "/AfterSalesService/ProcessAfterSalesOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ProcessAfterSalesOrder(ctx, req.(*AfterSalesProcessRequest)) @@ -488,7 +472,7 @@ func _AfterSalesService_ReturnShipment_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_ReturnShipment_FullMethodName, + FullMethod: "/AfterSalesService/ReturnShipment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ReturnShipment(ctx, req.(*ReturnShipmentRequest)) @@ -506,7 +490,7 @@ func _AfterSalesService_ReceiveItem_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AfterSalesService_ReceiveItem_FullMethodName, + FullMethod: "/AfterSalesService/ReceiveItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ReceiveItem(ctx, req.(*AfterSalesOrderNo)) diff --git a/core/service/proto/app_service.pb.go b/core/service/proto/app_service.pb.go index 0b31551a0..a4575b632 100644 --- a/core/service/proto/app_service.pb.go +++ b/core/service/proto/app_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: app_service.proto package proto diff --git a/core/service/proto/app_service_grpc.pb.go b/core/service/proto/app_service_grpc.pb.go index 404bfb07d..e2a1bb4eb 100644 --- a/core/service/proto/app_service_grpc.pb.go +++ b/core/service/proto/app_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: app_service.proto package proto @@ -18,16 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - AppService_SaveProd_FullMethodName = "/AppService/SaveProd" - AppService_SaveVersion_FullMethodName = "/AppService/SaveVersion" - AppService_GetProd_FullMethodName = "/AppService/GetProd" - AppService_GetVersion_FullMethodName = "/AppService/GetVersion" - AppService_DeleteProd_FullMethodName = "/AppService/DeleteProd" - AppService_DeleteVersion_FullMethodName = "/AppService/DeleteVersion" - AppService_CheckVersion_FullMethodName = "/AppService/CheckVersion" -) - // AppServiceClient is the client API for AppService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -58,7 +48,7 @@ func NewAppServiceClient(cc grpc.ClientConnInterface) AppServiceClient { func (c *appServiceClient) SaveProd(ctx context.Context, in *AppProdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AppService_SaveProd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/SaveProd", in, out, opts...) if err != nil { return nil, err } @@ -67,7 +57,7 @@ func (c *appServiceClient) SaveProd(ctx context.Context, in *AppProdRequest, opt func (c *appServiceClient) SaveVersion(ctx context.Context, in *AppVersionRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AppService_SaveVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/SaveVersion", in, out, opts...) if err != nil { return nil, err } @@ -76,7 +66,7 @@ func (c *appServiceClient) SaveVersion(ctx context.Context, in *AppVersionReques func (c *appServiceClient) GetProd(ctx context.Context, in *AppId, opts ...grpc.CallOption) (*SAppProd, error) { out := new(SAppProd) - err := c.cc.Invoke(ctx, AppService_GetProd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/GetProd", in, out, opts...) if err != nil { return nil, err } @@ -85,7 +75,7 @@ func (c *appServiceClient) GetProd(ctx context.Context, in *AppId, opts ...grpc. func (c *appServiceClient) GetVersion(ctx context.Context, in *AppVersionId, opts ...grpc.CallOption) (*SAppVersion, error) { out := new(SAppVersion) - err := c.cc.Invoke(ctx, AppService_GetVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/GetVersion", in, out, opts...) if err != nil { return nil, err } @@ -94,7 +84,7 @@ func (c *appServiceClient) GetVersion(ctx context.Context, in *AppVersionId, opt func (c *appServiceClient) DeleteProd(ctx context.Context, in *AppId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AppService_DeleteProd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/DeleteProd", in, out, opts...) if err != nil { return nil, err } @@ -103,7 +93,7 @@ func (c *appServiceClient) DeleteProd(ctx context.Context, in *AppId, opts ...gr func (c *appServiceClient) DeleteVersion(ctx context.Context, in *AppVersionId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, AppService_DeleteVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/DeleteVersion", in, out, opts...) if err != nil { return nil, err } @@ -112,7 +102,7 @@ func (c *appServiceClient) DeleteVersion(ctx context.Context, in *AppVersionId, func (c *appServiceClient) CheckVersion(ctx context.Context, in *CheckVersionRequest, opts ...grpc.CallOption) (*CheckVersionResponse, error) { out := new(CheckVersionResponse) - err := c.cc.Invoke(ctx, AppService_CheckVersion_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/AppService/CheckVersion", in, out, opts...) if err != nil { return nil, err } @@ -188,7 +178,7 @@ func _AppService_SaveProd_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_SaveProd_FullMethodName, + FullMethod: "/AppService/SaveProd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).SaveProd(ctx, req.(*AppProdRequest)) @@ -206,7 +196,7 @@ func _AppService_SaveVersion_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_SaveVersion_FullMethodName, + FullMethod: "/AppService/SaveVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).SaveVersion(ctx, req.(*AppVersionRequest)) @@ -224,7 +214,7 @@ func _AppService_GetProd_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_GetProd_FullMethodName, + FullMethod: "/AppService/GetProd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).GetProd(ctx, req.(*AppId)) @@ -242,7 +232,7 @@ func _AppService_GetVersion_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_GetVersion_FullMethodName, + FullMethod: "/AppService/GetVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).GetVersion(ctx, req.(*AppVersionId)) @@ -260,7 +250,7 @@ func _AppService_DeleteProd_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_DeleteProd_FullMethodName, + FullMethod: "/AppService/DeleteProd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).DeleteProd(ctx, req.(*AppId)) @@ -278,7 +268,7 @@ func _AppService_DeleteVersion_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_DeleteVersion_FullMethodName, + FullMethod: "/AppService/DeleteVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).DeleteVersion(ctx, req.(*AppVersionId)) @@ -296,7 +286,7 @@ func _AppService_CheckVersion_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: AppService_CheckVersion_FullMethodName, + FullMethod: "/AppService/CheckVersion", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).CheckVersion(ctx, req.(*CheckVersionRequest)) diff --git a/core/service/proto/bank_dto.pb.go b/core/service/proto/bank_dto.pb.go index 4c26b5bd1..0157c3289 100644 --- a/core/service/proto/bank_dto.pb.go +++ b/core/service/proto/bank_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/bank_dto.proto package proto diff --git a/core/service/proto/cart_dto.pb.go b/core/service/proto/cart_dto.pb.go index 6fa293b88..14747e09d 100644 --- a/core/service/proto/cart_dto.pb.go +++ b/core/service/proto/cart_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/cart_dto.proto package proto diff --git a/core/service/proto/cart_service.pb.go b/core/service/proto/cart_service.pb.go index 358959557..fcb8e45c2 100644 --- a/core/service/proto/cart_service.pb.go +++ b/core/service/proto/cart_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: cart_service.proto package proto diff --git a/core/service/proto/cart_service_grpc.pb.go b/core/service/proto/cart_service_grpc.pb.go index 08a8e4e6e..592b5bb80 100644 --- a/core/service/proto/cart_service_grpc.pb.go +++ b/core/service/proto/cart_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: cart_service.proto package proto @@ -18,14 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - CartService_WholesaleCartV1_FullMethodName = "/CartService/WholesaleCartV1" - CartService_GetShoppingCart_FullMethodName = "/CartService/GetShoppingCart" - CartService_PutItems_FullMethodName = "/CartService/PutItems" - CartService_ReduceItems_FullMethodName = "/CartService/ReduceItems" - CartService_CheckCart_FullMethodName = "/CartService/CheckCart" -) - // CartServiceClient is the client API for CartService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -52,7 +44,7 @@ func NewCartServiceClient(cc grpc.ClientConnInterface) CartServiceClient { func (c *cartServiceClient) WholesaleCartV1(ctx context.Context, in *WsCartRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, CartService_WholesaleCartV1_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CartService/WholesaleCartV1", in, out, opts...) if err != nil { return nil, err } @@ -61,7 +53,7 @@ func (c *cartServiceClient) WholesaleCartV1(ctx context.Context, in *WsCartReque func (c *cartServiceClient) GetShoppingCart(ctx context.Context, in *ShoppingCartId, opts ...grpc.CallOption) (*SShoppingCart, error) { out := new(SShoppingCart) - err := c.cc.Invoke(ctx, CartService_GetShoppingCart_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CartService/GetShoppingCart", in, out, opts...) if err != nil { return nil, err } @@ -70,7 +62,7 @@ func (c *cartServiceClient) GetShoppingCart(ctx context.Context, in *ShoppingCar func (c *cartServiceClient) PutItems(ctx context.Context, in *CartItemRequest, opts ...grpc.CallOption) (*CartItemResponse, error) { out := new(CartItemResponse) - err := c.cc.Invoke(ctx, CartService_PutItems_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CartService/PutItems", in, out, opts...) if err != nil { return nil, err } @@ -79,7 +71,7 @@ func (c *cartServiceClient) PutItems(ctx context.Context, in *CartItemRequest, o func (c *cartServiceClient) ReduceItems(ctx context.Context, in *CartItemRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, CartService_ReduceItems_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CartService/ReduceItems", in, out, opts...) if err != nil { return nil, err } @@ -88,7 +80,7 @@ func (c *cartServiceClient) ReduceItems(ctx context.Context, in *CartItemRequest func (c *cartServiceClient) CheckCart(ctx context.Context, in *CheckCartRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, CartService_CheckCart_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CartService/CheckCart", in, out, opts...) if err != nil { return nil, err } @@ -154,7 +146,7 @@ func _CartService_WholesaleCartV1_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CartService_WholesaleCartV1_FullMethodName, + FullMethod: "/CartService/WholesaleCartV1", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).WholesaleCartV1(ctx, req.(*WsCartRequest)) @@ -172,7 +164,7 @@ func _CartService_GetShoppingCart_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CartService_GetShoppingCart_FullMethodName, + FullMethod: "/CartService/GetShoppingCart", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).GetShoppingCart(ctx, req.(*ShoppingCartId)) @@ -190,7 +182,7 @@ func _CartService_PutItems_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CartService_PutItems_FullMethodName, + FullMethod: "/CartService/PutItems", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).PutItems(ctx, req.(*CartItemRequest)) @@ -208,7 +200,7 @@ func _CartService_ReduceItems_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CartService_ReduceItems_FullMethodName, + FullMethod: "/CartService/ReduceItems", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).ReduceItems(ctx, req.(*CartItemRequest)) @@ -226,7 +218,7 @@ func _CartService_CheckCart_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CartService_CheckCart_FullMethodName, + FullMethod: "/CartService/CheckCart", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).CheckCart(ctx, req.(*CheckCartRequest)) diff --git a/core/service/proto/code_service.pb.go b/core/service/proto/code_service.pb.go index 6ffd9e4aa..bcca4a2b2 100644 --- a/core/service/proto/code_service.pb.go +++ b/core/service/proto/code_service.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: code_service.proto package proto diff --git a/core/service/proto/code_service_grpc.pb.go b/core/service/proto/code_service_grpc.pb.go index 0da8564c0..cdef42b83 100644 --- a/core/service/proto/code_service_grpc.pb.go +++ b/core/service/proto/code_service_grpc.pb.go @@ -1,22 +1,7 @@ -//* -// This file is auto generated by tto v0.4.5 ! -// If you want to modify this code, please read the guide -// to modify code template. -// -// Get started: https://github.com/ixre/tto -// -// Copyright (C) 2021 , All rights reserved. -// -// name : template_service.proto -// author : jarrysix -// date : 2021/12/02 10:37:45 -// description : 条码服务 -// history : - // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: code_service.proto package proto @@ -33,12 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - CodeService_SaveQrTemplate_FullMethodName = "/CodeService/SaveQrTemplate" - CodeService_GetQrTemplate_FullMethodName = "/CodeService/GetQrTemplate" - CodeService_DeleteQrTemplate_FullMethodName = "/CodeService/DeleteQrTemplate" -) - // CodeServiceClient is the client API for CodeService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -61,7 +40,7 @@ func NewCodeServiceClient(cc grpc.ClientConnInterface) CodeServiceClient { func (c *codeServiceClient) SaveQrTemplate(ctx context.Context, in *SaveQrTemplateRequest, opts ...grpc.CallOption) (*SaveQrTemplateResponse, error) { out := new(SaveQrTemplateResponse) - err := c.cc.Invoke(ctx, CodeService_SaveQrTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CodeService/SaveQrTemplate", in, out, opts...) if err != nil { return nil, err } @@ -70,7 +49,7 @@ func (c *codeServiceClient) SaveQrTemplate(ctx context.Context, in *SaveQrTempla func (c *codeServiceClient) GetQrTemplate(ctx context.Context, in *CommQrTemplateId, opts ...grpc.CallOption) (*SQrTemplate, error) { out := new(SQrTemplate) - err := c.cc.Invoke(ctx, CodeService_GetQrTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CodeService/GetQrTemplate", in, out, opts...) if err != nil { return nil, err } @@ -79,7 +58,7 @@ func (c *codeServiceClient) GetQrTemplate(ctx context.Context, in *CommQrTemplat func (c *codeServiceClient) DeleteQrTemplate(ctx context.Context, in *CommQrTemplateId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, CodeService_DeleteQrTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/CodeService/DeleteQrTemplate", in, out, opts...) if err != nil { return nil, err } @@ -135,7 +114,7 @@ func _CodeService_SaveQrTemplate_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CodeService_SaveQrTemplate_FullMethodName, + FullMethod: "/CodeService/SaveQrTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).SaveQrTemplate(ctx, req.(*SaveQrTemplateRequest)) @@ -153,7 +132,7 @@ func _CodeService_GetQrTemplate_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CodeService_GetQrTemplate_FullMethodName, + FullMethod: "/CodeService/GetQrTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).GetQrTemplate(ctx, req.(*CommQrTemplateId)) @@ -171,7 +150,7 @@ func _CodeService_DeleteQrTemplate_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: CodeService_DeleteQrTemplate_FullMethodName, + FullMethod: "/CodeService/DeleteQrTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).DeleteQrTemplate(ctx, req.(*CommQrTemplateId)) diff --git a/core/service/proto/content_service.pb.go b/core/service/proto/content_service.pb.go index 43eeb92e7..1a2ee4089 100644 --- a/core/service/proto/content_service.pb.go +++ b/core/service/proto/content_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: content_service.proto package proto diff --git a/core/service/proto/content_service_grpc.pb.go b/core/service/proto/content_service_grpc.pb.go index 5362871c4..159c55265 100644 --- a/core/service/proto/content_service_grpc.pb.go +++ b/core/service/proto/content_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: content_service.proto package proto @@ -18,21 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ContentService_GetPage_FullMethodName = "/ContentService/GetPage" - ContentService_SavePage_FullMethodName = "/ContentService/SavePage" - ContentService_DeletePage_FullMethodName = "/ContentService/DeletePage" - ContentService_GetArticleCategories_FullMethodName = "/ContentService/GetArticleCategories" - ContentService_GetArticleCategory_FullMethodName = "/ContentService/GetArticleCategory" - ContentService_SaveArticleCategory_FullMethodName = "/ContentService/SaveArticleCategory" - ContentService_DeleteArticleCategory_FullMethodName = "/ContentService/DeleteArticleCategory" - ContentService_GetArticle_FullMethodName = "/ContentService/GetArticle" - ContentService_DeleteArticle_FullMethodName = "/ContentService/DeleteArticle" - ContentService_SaveArticle_FullMethodName = "/ContentService/SaveArticle" - ContentService_QueryTopArticles_FullMethodName = "/ContentService/QueryTopArticles" - ContentService_QueryPagingArticles_FullMethodName = "/ContentService/QueryPagingArticles" -) - // ContentServiceClient is the client API for ContentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -73,7 +58,7 @@ func NewContentServiceClient(cc grpc.ClientConnInterface) ContentServiceClient { func (c *contentServiceClient) GetPage(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SPage, error) { out := new(SPage) - err := c.cc.Invoke(ctx, ContentService_GetPage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/GetPage", in, out, opts...) if err != nil { return nil, err } @@ -82,7 +67,7 @@ func (c *contentServiceClient) GetPage(ctx context.Context, in *IdOrName, opts . func (c *contentServiceClient) SavePage(ctx context.Context, in *SPage, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_SavePage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/SavePage", in, out, opts...) if err != nil { return nil, err } @@ -91,7 +76,7 @@ func (c *contentServiceClient) SavePage(ctx context.Context, in *SPage, opts ... func (c *contentServiceClient) DeletePage(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_DeletePage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/DeletePage", in, out, opts...) if err != nil { return nil, err } @@ -100,7 +85,7 @@ func (c *contentServiceClient) DeletePage(ctx context.Context, in *Int64, opts . func (c *contentServiceClient) GetArticleCategories(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ArticleCategoriesResponse, error) { out := new(ArticleCategoriesResponse) - err := c.cc.Invoke(ctx, ContentService_GetArticleCategories_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/GetArticleCategories", in, out, opts...) if err != nil { return nil, err } @@ -109,7 +94,7 @@ func (c *contentServiceClient) GetArticleCategories(ctx context.Context, in *Emp func (c *contentServiceClient) GetArticleCategory(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SArticleCategory, error) { out := new(SArticleCategory) - err := c.cc.Invoke(ctx, ContentService_GetArticleCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/GetArticleCategory", in, out, opts...) if err != nil { return nil, err } @@ -118,7 +103,7 @@ func (c *contentServiceClient) GetArticleCategory(ctx context.Context, in *IdOrN func (c *contentServiceClient) SaveArticleCategory(ctx context.Context, in *SArticleCategory, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_SaveArticleCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/SaveArticleCategory", in, out, opts...) if err != nil { return nil, err } @@ -127,7 +112,7 @@ func (c *contentServiceClient) SaveArticleCategory(ctx context.Context, in *SArt func (c *contentServiceClient) DeleteArticleCategory(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_DeleteArticleCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/DeleteArticleCategory", in, out, opts...) if err != nil { return nil, err } @@ -136,7 +121,7 @@ func (c *contentServiceClient) DeleteArticleCategory(ctx context.Context, in *In func (c *contentServiceClient) GetArticle(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SArticle, error) { out := new(SArticle) - err := c.cc.Invoke(ctx, ContentService_GetArticle_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/GetArticle", in, out, opts...) if err != nil { return nil, err } @@ -145,7 +130,7 @@ func (c *contentServiceClient) GetArticle(ctx context.Context, in *IdOrName, opt func (c *contentServiceClient) DeleteArticle(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_DeleteArticle_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/DeleteArticle", in, out, opts...) if err != nil { return nil, err } @@ -154,7 +139,7 @@ func (c *contentServiceClient) DeleteArticle(ctx context.Context, in *Int64, opt func (c *contentServiceClient) SaveArticle(ctx context.Context, in *SArticle, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ContentService_SaveArticle_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/SaveArticle", in, out, opts...) if err != nil { return nil, err } @@ -163,7 +148,7 @@ func (c *contentServiceClient) SaveArticle(ctx context.Context, in *SArticle, op func (c *contentServiceClient) QueryTopArticles(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*ArticleListResponse, error) { out := new(ArticleListResponse) - err := c.cc.Invoke(ctx, ContentService_QueryTopArticles_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/QueryTopArticles", in, out, opts...) if err != nil { return nil, err } @@ -172,7 +157,7 @@ func (c *contentServiceClient) QueryTopArticles(ctx context.Context, in *IdOrNam func (c *contentServiceClient) QueryPagingArticles(ctx context.Context, in *PagingArticleRequest, opts ...grpc.CallOption) (*ArticleListResponse, error) { out := new(ArticleListResponse) - err := c.cc.Invoke(ctx, ContentService_QueryPagingArticles_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ContentService/QueryPagingArticles", in, out, opts...) if err != nil { return nil, err } @@ -273,7 +258,7 @@ func _ContentService_GetPage_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_GetPage_FullMethodName, + FullMethod: "/ContentService/GetPage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetPage(ctx, req.(*IdOrName)) @@ -291,7 +276,7 @@ func _ContentService_SavePage_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_SavePage_FullMethodName, + FullMethod: "/ContentService/SavePage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SavePage(ctx, req.(*SPage)) @@ -309,7 +294,7 @@ func _ContentService_DeletePage_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_DeletePage_FullMethodName, + FullMethod: "/ContentService/DeletePage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeletePage(ctx, req.(*Int64)) @@ -327,7 +312,7 @@ func _ContentService_GetArticleCategories_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_GetArticleCategories_FullMethodName, + FullMethod: "/ContentService/GetArticleCategories", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticleCategories(ctx, req.(*Empty)) @@ -345,7 +330,7 @@ func _ContentService_GetArticleCategory_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_GetArticleCategory_FullMethodName, + FullMethod: "/ContentService/GetArticleCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticleCategory(ctx, req.(*IdOrName)) @@ -363,7 +348,7 @@ func _ContentService_SaveArticleCategory_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_SaveArticleCategory_FullMethodName, + FullMethod: "/ContentService/SaveArticleCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SaveArticleCategory(ctx, req.(*SArticleCategory)) @@ -381,7 +366,7 @@ func _ContentService_DeleteArticleCategory_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_DeleteArticleCategory_FullMethodName, + FullMethod: "/ContentService/DeleteArticleCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeleteArticleCategory(ctx, req.(*Int64)) @@ -399,7 +384,7 @@ func _ContentService_GetArticle_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_GetArticle_FullMethodName, + FullMethod: "/ContentService/GetArticle", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticle(ctx, req.(*IdOrName)) @@ -417,7 +402,7 @@ func _ContentService_DeleteArticle_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_DeleteArticle_FullMethodName, + FullMethod: "/ContentService/DeleteArticle", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeleteArticle(ctx, req.(*Int64)) @@ -435,7 +420,7 @@ func _ContentService_SaveArticle_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_SaveArticle_FullMethodName, + FullMethod: "/ContentService/SaveArticle", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SaveArticle(ctx, req.(*SArticle)) @@ -453,7 +438,7 @@ func _ContentService_QueryTopArticles_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_QueryTopArticles_FullMethodName, + FullMethod: "/ContentService/QueryTopArticles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).QueryTopArticles(ctx, req.(*IdOrName)) @@ -471,7 +456,7 @@ func _ContentService_QueryPagingArticles_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ContentService_QueryPagingArticles_FullMethodName, + FullMethod: "/ContentService/QueryPagingArticles", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).QueryPagingArticles(ctx, req.(*PagingArticleRequest)) diff --git a/core/service/proto/coupon_dto.pb.go b/core/service/proto/coupon_dto.pb.go index d8f3e9b28..b801055dc 100644 --- a/core/service/proto/coupon_dto.pb.go +++ b/core/service/proto/coupon_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/coupon_dto.proto package proto diff --git a/core/service/proto/events_dto.pb.go b/core/service/proto/events_dto.pb.go index ececb5f79..4e3ab6051 100644 --- a/core/service/proto/events_dto.pb.go +++ b/core/service/proto/events_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/events_dto.proto package proto diff --git a/core/service/proto/execution_service.pb.go b/core/service/proto/execution_service.pb.go index 478415d28..e41bd4daf 100644 --- a/core/service/proto/execution_service.pb.go +++ b/core/service/proto/execution_service.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: execution_service.proto package proto diff --git a/core/service/proto/execution_service_grpc.pb.go b/core/service/proto/execution_service_grpc.pb.go index 6b015fdc2..18772475b 100644 --- a/core/service/proto/execution_service_grpc.pb.go +++ b/core/service/proto/execution_service_grpc.pb.go @@ -1,22 +1,7 @@ -//* -// This file is auto generated by tto v0.4.5 ! -// If you want to modify this code, please read the guide -// to modify code template. -// -// Get started: https://github.com/ixre/tto -// -// Copyright (C) 2009-2022 56X.NET, All rights reserved. -// -// name : job_exec_data_service.proto -// author : jarrysix -// date : 2022/03/06 03:16:21 -// description : -// history : - // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: execution_service.proto package proto @@ -33,13 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ExecutionService_GetJob_FullMethodName = "/ExecutionService/GetJob" - ExecutionService_UpdateExecuteCursor_FullMethodName = "/ExecutionService/UpdateExecuteCursor" - ExecutionService_AddFail_FullMethodName = "/ExecutionService/AddFail" - ExecutionService_RejoinQueue_FullMethodName = "/ExecutionService/RejoinQueue" -) - // ExecutionServiceClient is the client API for ExecutionService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -63,7 +41,7 @@ func NewExecutionServiceClient(cc grpc.ClientConnInterface) ExecutionServiceClie func (c *executionServiceClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*SExecutionData, error) { out := new(SExecutionData) - err := c.cc.Invoke(ctx, ExecutionService_GetJob_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExecutionService/GetJob", in, out, opts...) if err != nil { return nil, err } @@ -72,7 +50,7 @@ func (c *executionServiceClient) GetJob(ctx context.Context, in *GetJobRequest, func (c *executionServiceClient) UpdateExecuteCursor(ctx context.Context, in *UpdateCursorRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ExecutionService_UpdateExecuteCursor_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExecutionService/UpdateExecuteCursor", in, out, opts...) if err != nil { return nil, err } @@ -81,7 +59,7 @@ func (c *executionServiceClient) UpdateExecuteCursor(ctx context.Context, in *Up func (c *executionServiceClient) AddFail(ctx context.Context, in *AddFailRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ExecutionService_AddFail_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExecutionService/AddFail", in, out, opts...) if err != nil { return nil, err } @@ -90,7 +68,7 @@ func (c *executionServiceClient) AddFail(ctx context.Context, in *AddFailRequest func (c *executionServiceClient) RejoinQueue(ctx context.Context, in *RejoinQueueRequest, opts ...grpc.CallOption) (*RejoinQueueResponse, error) { out := new(RejoinQueueResponse) - err := c.cc.Invoke(ctx, ExecutionService_RejoinQueue_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExecutionService/RejoinQueue", in, out, opts...) if err != nil { return nil, err } @@ -150,7 +128,7 @@ func _ExecutionService_GetJob_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExecutionService_GetJob_FullMethodName, + FullMethod: "/ExecutionService/GetJob", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).GetJob(ctx, req.(*GetJobRequest)) @@ -168,7 +146,7 @@ func _ExecutionService_UpdateExecuteCursor_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExecutionService_UpdateExecuteCursor_FullMethodName, + FullMethod: "/ExecutionService/UpdateExecuteCursor", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).UpdateExecuteCursor(ctx, req.(*UpdateCursorRequest)) @@ -186,7 +164,7 @@ func _ExecutionService_AddFail_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExecutionService_AddFail_FullMethodName, + FullMethod: "/ExecutionService/AddFail", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).AddFail(ctx, req.(*AddFailRequest)) @@ -204,7 +182,7 @@ func _ExecutionService_RejoinQueue_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExecutionService_RejoinQueue_FullMethodName, + FullMethod: "/ExecutionService/RejoinQueue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).RejoinQueue(ctx, req.(*RejoinQueueRequest)) diff --git a/core/service/proto/express_service.pb.go b/core/service/proto/express_service.pb.go index 2b96b8903..c6586aa02 100644 --- a/core/service/proto/express_service.pb.go +++ b/core/service/proto/express_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: express_service.proto package proto diff --git a/core/service/proto/express_service_grpc.pb.go b/core/service/proto/express_service_grpc.pb.go index e4a64f330..51aaf7903 100644 --- a/core/service/proto/express_service_grpc.pb.go +++ b/core/service/proto/express_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: express_service.proto package proto @@ -18,18 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ExpressService_GetExpressProvider_FullMethodName = "/ExpressService/GetExpressProvider" - ExpressService_SaveExpressProvider_FullMethodName = "/ExpressService/SaveExpressProvider" - ExpressService_GetProviders_FullMethodName = "/ExpressService/GetProviders" - ExpressService_GetProviderGroup_FullMethodName = "/ExpressService/GetProviderGroup" - ExpressService_SaveExpressTemplate_FullMethodName = "/ExpressService/SaveExpressTemplate" - ExpressService_GetTemplate_FullMethodName = "/ExpressService/GetTemplate" - ExpressService_GetTemplates_FullMethodName = "/ExpressService/GetTemplates" - ExpressService_DeleteTemplate_FullMethodName = "/ExpressService/DeleteTemplate" - ExpressService_SaveAreaTemplate_FullMethodName = "/ExpressService/SaveAreaTemplate" -) - // ExpressServiceClient is the client API for ExpressService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -64,7 +52,7 @@ func NewExpressServiceClient(cc grpc.ClientConnInterface) ExpressServiceClient { func (c *expressServiceClient) GetExpressProvider(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SExpressProvider, error) { out := new(SExpressProvider) - err := c.cc.Invoke(ctx, ExpressService_GetExpressProvider_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/GetExpressProvider", in, out, opts...) if err != nil { return nil, err } @@ -73,7 +61,7 @@ func (c *expressServiceClient) GetExpressProvider(ctx context.Context, in *IdOrN func (c *expressServiceClient) SaveExpressProvider(ctx context.Context, in *SExpressProvider, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ExpressService_SaveExpressProvider_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/SaveExpressProvider", in, out, opts...) if err != nil { return nil, err } @@ -82,7 +70,7 @@ func (c *expressServiceClient) SaveExpressProvider(ctx context.Context, in *SExp func (c *expressServiceClient) GetProviders(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ExpressProviderListResponse, error) { out := new(ExpressProviderListResponse) - err := c.cc.Invoke(ctx, ExpressService_GetProviders_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/GetProviders", in, out, opts...) if err != nil { return nil, err } @@ -91,7 +79,7 @@ func (c *expressServiceClient) GetProviders(ctx context.Context, in *Empty, opts func (c *expressServiceClient) GetProviderGroup(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ExpressProviderGroupResponse, error) { out := new(ExpressProviderGroupResponse) - err := c.cc.Invoke(ctx, ExpressService_GetProviderGroup_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/GetProviderGroup", in, out, opts...) if err != nil { return nil, err } @@ -100,7 +88,7 @@ func (c *expressServiceClient) GetProviderGroup(ctx context.Context, in *Empty, func (c *expressServiceClient) SaveExpressTemplate(ctx context.Context, in *SExpressTemplate, opts ...grpc.CallOption) (*SaveTemplateResponse, error) { out := new(SaveTemplateResponse) - err := c.cc.Invoke(ctx, ExpressService_SaveExpressTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/SaveExpressTemplate", in, out, opts...) if err != nil { return nil, err } @@ -109,7 +97,7 @@ func (c *expressServiceClient) SaveExpressTemplate(ctx context.Context, in *SExp func (c *expressServiceClient) GetTemplate(ctx context.Context, in *ExpressTemplateId, opts ...grpc.CallOption) (*SExpressTemplate, error) { out := new(SExpressTemplate) - err := c.cc.Invoke(ctx, ExpressService_GetTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/GetTemplate", in, out, opts...) if err != nil { return nil, err } @@ -118,7 +106,7 @@ func (c *expressServiceClient) GetTemplate(ctx context.Context, in *ExpressTempl func (c *expressServiceClient) GetTemplates(ctx context.Context, in *GetTemplatesRequest, opts ...grpc.CallOption) (*ExpressTemplateListResponse, error) { out := new(ExpressTemplateListResponse) - err := c.cc.Invoke(ctx, ExpressService_GetTemplates_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/GetTemplates", in, out, opts...) if err != nil { return nil, err } @@ -127,7 +115,7 @@ func (c *expressServiceClient) GetTemplates(ctx context.Context, in *GetTemplate func (c *expressServiceClient) DeleteTemplate(ctx context.Context, in *ExpressTemplateId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ExpressService_DeleteTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/DeleteTemplate", in, out, opts...) if err != nil { return nil, err } @@ -136,7 +124,7 @@ func (c *expressServiceClient) DeleteTemplate(ctx context.Context, in *ExpressTe func (c *expressServiceClient) SaveAreaTemplate(ctx context.Context, in *SaveAreaExpTemplateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ExpressService_SaveAreaTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ExpressService/SaveAreaTemplate", in, out, opts...) if err != nil { return nil, err } @@ -222,7 +210,7 @@ func _ExpressService_GetExpressProvider_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_GetExpressProvider_FullMethodName, + FullMethod: "/ExpressService/GetExpressProvider", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetExpressProvider(ctx, req.(*IdOrName)) @@ -240,7 +228,7 @@ func _ExpressService_SaveExpressProvider_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_SaveExpressProvider_FullMethodName, + FullMethod: "/ExpressService/SaveExpressProvider", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveExpressProvider(ctx, req.(*SExpressProvider)) @@ -258,7 +246,7 @@ func _ExpressService_GetProviders_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_GetProviders_FullMethodName, + FullMethod: "/ExpressService/GetProviders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetProviders(ctx, req.(*Empty)) @@ -276,7 +264,7 @@ func _ExpressService_GetProviderGroup_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_GetProviderGroup_FullMethodName, + FullMethod: "/ExpressService/GetProviderGroup", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetProviderGroup(ctx, req.(*Empty)) @@ -294,7 +282,7 @@ func _ExpressService_SaveExpressTemplate_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_SaveExpressTemplate_FullMethodName, + FullMethod: "/ExpressService/SaveExpressTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveExpressTemplate(ctx, req.(*SExpressTemplate)) @@ -312,7 +300,7 @@ func _ExpressService_GetTemplate_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_GetTemplate_FullMethodName, + FullMethod: "/ExpressService/GetTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetTemplate(ctx, req.(*ExpressTemplateId)) @@ -330,7 +318,7 @@ func _ExpressService_GetTemplates_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_GetTemplates_FullMethodName, + FullMethod: "/ExpressService/GetTemplates", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetTemplates(ctx, req.(*GetTemplatesRequest)) @@ -348,7 +336,7 @@ func _ExpressService_DeleteTemplate_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_DeleteTemplate_FullMethodName, + FullMethod: "/ExpressService/DeleteTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).DeleteTemplate(ctx, req.(*ExpressTemplateId)) @@ -366,7 +354,7 @@ func _ExpressService_SaveAreaTemplate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExpressService_SaveAreaTemplate_FullMethodName, + FullMethod: "/ExpressService/SaveAreaTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveAreaTemplate(ctx, req.(*SaveAreaExpTemplateRequest)) diff --git a/core/service/proto/finance_service.pb.go b/core/service/proto/finance_service.pb.go index 304ea55d0..05d4f1186 100644 --- a/core/service/proto/finance_service.pb.go +++ b/core/service/proto/finance_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: finance_service.proto package proto diff --git a/core/service/proto/finance_service_grpc.pb.go b/core/service/proto/finance_service_grpc.pb.go index b6f35820c..3d913ea43 100644 --- a/core/service/proto/finance_service_grpc.pb.go +++ b/core/service/proto/finance_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: finance_service.proto package proto @@ -18,15 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - FinanceService_GetRiseInfo_FullMethodName = "/FinanceService/GetRiseInfo" - FinanceService_RiseTransferIn_FullMethodName = "/FinanceService/RiseTransferIn" - FinanceService_RiseTransferOut_FullMethodName = "/FinanceService/RiseTransferOut" - FinanceService_RiseSettleByDay_FullMethodName = "/FinanceService/RiseSettleByDay" - FinanceService_CommitTransfer_FullMethodName = "/FinanceService/CommitTransfer" - FinanceService_OpenRiseService_FullMethodName = "/FinanceService/OpenRiseService" -) - // FinanceServiceClient is the client API for FinanceService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -55,7 +46,7 @@ func NewFinanceServiceClient(cc grpc.ClientConnInterface) FinanceServiceClient { func (c *financeServiceClient) GetRiseInfo(ctx context.Context, in *PersonId, opts ...grpc.CallOption) (*SRiseInfo, error) { out := new(SRiseInfo) - err := c.cc.Invoke(ctx, FinanceService_GetRiseInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/GetRiseInfo", in, out, opts...) if err != nil { return nil, err } @@ -64,7 +55,7 @@ func (c *financeServiceClient) GetRiseInfo(ctx context.Context, in *PersonId, op func (c *financeServiceClient) RiseTransferIn(ctx context.Context, in *TransferInRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FinanceService_RiseTransferIn_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/RiseTransferIn", in, out, opts...) if err != nil { return nil, err } @@ -73,7 +64,7 @@ func (c *financeServiceClient) RiseTransferIn(ctx context.Context, in *TransferI func (c *financeServiceClient) RiseTransferOut(ctx context.Context, in *RiseTransferOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FinanceService_RiseTransferOut_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/RiseTransferOut", in, out, opts...) if err != nil { return nil, err } @@ -82,7 +73,7 @@ func (c *financeServiceClient) RiseTransferOut(ctx context.Context, in *RiseTran func (c *financeServiceClient) RiseSettleByDay(ctx context.Context, in *RiseSettleRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FinanceService_RiseSettleByDay_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/RiseSettleByDay", in, out, opts...) if err != nil { return nil, err } @@ -91,7 +82,7 @@ func (c *financeServiceClient) RiseSettleByDay(ctx context.Context, in *RiseSett func (c *financeServiceClient) CommitTransfer(ctx context.Context, in *CommitTransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FinanceService_CommitTransfer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/CommitTransfer", in, out, opts...) if err != nil { return nil, err } @@ -100,7 +91,7 @@ func (c *financeServiceClient) CommitTransfer(ctx context.Context, in *CommitTra func (c *financeServiceClient) OpenRiseService(ctx context.Context, in *PersonId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FinanceService_OpenRiseService_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FinanceService/OpenRiseService", in, out, opts...) if err != nil { return nil, err } @@ -171,7 +162,7 @@ func _FinanceService_GetRiseInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_GetRiseInfo_FullMethodName, + FullMethod: "/FinanceService/GetRiseInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).GetRiseInfo(ctx, req.(*PersonId)) @@ -189,7 +180,7 @@ func _FinanceService_RiseTransferIn_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_RiseTransferIn_FullMethodName, + FullMethod: "/FinanceService/RiseTransferIn", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseTransferIn(ctx, req.(*TransferInRequest)) @@ -207,7 +198,7 @@ func _FinanceService_RiseTransferOut_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_RiseTransferOut_FullMethodName, + FullMethod: "/FinanceService/RiseTransferOut", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseTransferOut(ctx, req.(*RiseTransferOutRequest)) @@ -225,7 +216,7 @@ func _FinanceService_RiseSettleByDay_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_RiseSettleByDay_FullMethodName, + FullMethod: "/FinanceService/RiseSettleByDay", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseSettleByDay(ctx, req.(*RiseSettleRequest)) @@ -243,7 +234,7 @@ func _FinanceService_CommitTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_CommitTransfer_FullMethodName, + FullMethod: "/FinanceService/CommitTransfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).CommitTransfer(ctx, req.(*CommitTransferRequest)) @@ -261,7 +252,7 @@ func _FinanceService_OpenRiseService_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FinanceService_OpenRiseService_FullMethodName, + FullMethod: "/FinanceService/OpenRiseService", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).OpenRiseService(ctx, req.(*PersonId)) diff --git a/core/service/proto/foundation_dto.pb.go b/core/service/proto/foundation_dto.pb.go index aef2cfe16..5b84a3cdb 100644 --- a/core/service/proto/foundation_dto.pb.go +++ b/core/service/proto/foundation_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/foundation_dto.proto package proto diff --git a/core/service/proto/foundation_service.pb.go b/core/service/proto/foundation_service.pb.go index c3dac29e4..e8e30a43f 100644 --- a/core/service/proto/foundation_service.pb.go +++ b/core/service/proto/foundation_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: foundation_service.proto package proto diff --git a/core/service/proto/foundation_service_grpc.pb.go b/core/service/proto/foundation_service_grpc.pb.go index 2760ab061..ad022d6c1 100644 --- a/core/service/proto/foundation_service_grpc.pb.go +++ b/core/service/proto/foundation_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: foundation_service.proto package proto @@ -18,32 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - FoundationService_CheckSensitive_FullMethodName = "/FoundationService/CheckSensitive" - FoundationService_ReplaceSensitive_FullMethodName = "/FoundationService/ReplaceSensitive" - FoundationService_GetSmsSetting_FullMethodName = "/FoundationService/GetSmsSetting" - FoundationService_SaveSmsSetting_FullMethodName = "/FoundationService/SaveSmsSetting" - FoundationService_CleanCache_FullMethodName = "/FoundationService/CleanCache" - FoundationService_SaveBoardHook_FullMethodName = "/FoundationService/SaveBoardHook" - FoundationService_ResourceUrl_FullMethodName = "/FoundationService/ResourceUrl" - FoundationService_RegisterApp_FullMethodName = "/FoundationService/RegisterApp" - FoundationService_GetApp_FullMethodName = "/FoundationService/GetApp" - FoundationService_GetAllSsoApp_FullMethodName = "/FoundationService/GetAllSsoApp" - FoundationService_SuperValidate_FullMethodName = "/FoundationService/SuperValidate" - FoundationService_FlushSuperPwd_FullMethodName = "/FoundationService/FlushSuperPwd" - FoundationService_GetSyncLoginUrl_FullMethodName = "/FoundationService/GetSyncLoginUrl" - FoundationService_GetAreaNames_FullMethodName = "/FoundationService/GetAreaNames" - FoundationService_GetAreaString_FullMethodName = "/FoundationService/GetAreaString" - FoundationService_GetChildAreas_FullMethodName = "/FoundationService/GetChildAreas" - FoundationService_GetMoAppConf_FullMethodName = "/FoundationService/GetMoAppConf" - FoundationService_SaveMoAppConf_FullMethodName = "/FoundationService/SaveMoAppConf" - FoundationService_GetWxApiConfig_FullMethodName = "/FoundationService/GetWxApiConfig" - FoundationService_SaveWxApiConfig_FullMethodName = "/FoundationService/SaveWxApiConfig" - FoundationService_GetPayPlatform_FullMethodName = "/FoundationService/GetPayPlatform" - FoundationService_GetGlobMchSaleConf__FullMethodName = "/FoundationService/GetGlobMchSaleConf_" - FoundationService_SaveGlobMchSaleConf__FullMethodName = "/FoundationService/SaveGlobMchSaleConf_" -) - // FoundationServiceClient is the client API for FoundationService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -115,7 +89,7 @@ func NewFoundationServiceClient(cc grpc.ClientConnInterface) FoundationServiceCl func (c *foundationServiceClient) CheckSensitive(ctx context.Context, in *String, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, FoundationService_CheckSensitive_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/CheckSensitive", in, out, opts...) if err != nil { return nil, err } @@ -124,7 +98,7 @@ func (c *foundationServiceClient) CheckSensitive(ctx context.Context, in *String func (c *foundationServiceClient) ReplaceSensitive(ctx context.Context, in *ReplaceSensitiveRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, FoundationService_ReplaceSensitive_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/ReplaceSensitive", in, out, opts...) if err != nil { return nil, err } @@ -133,7 +107,7 @@ func (c *foundationServiceClient) ReplaceSensitive(ctx context.Context, in *Repl func (c *foundationServiceClient) GetSmsSetting(ctx context.Context, in *GetSmsSettingRequest, opts ...grpc.CallOption) (*SSmsProviderSetting, error) { out := new(SSmsProviderSetting) - err := c.cc.Invoke(ctx, FoundationService_GetSmsSetting_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetSmsSetting", in, out, opts...) if err != nil { return nil, err } @@ -142,7 +116,7 @@ func (c *foundationServiceClient) GetSmsSetting(ctx context.Context, in *GetSmsS func (c *foundationServiceClient) SaveSmsSetting(ctx context.Context, in *SSmsProviderSetting, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_SaveSmsSetting_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SaveSmsSetting", in, out, opts...) if err != nil { return nil, err } @@ -151,7 +125,7 @@ func (c *foundationServiceClient) SaveSmsSetting(ctx context.Context, in *SSmsPr func (c *foundationServiceClient) CleanCache(ctx context.Context, in *CleanCacheRequest, opts ...grpc.CallOption) (*CleanCacheResponse, error) { out := new(CleanCacheResponse) - err := c.cc.Invoke(ctx, FoundationService_CleanCache_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/CleanCache", in, out, opts...) if err != nil { return nil, err } @@ -160,7 +134,7 @@ func (c *foundationServiceClient) CleanCache(ctx context.Context, in *CleanCache func (c *foundationServiceClient) SaveBoardHook(ctx context.Context, in *BoardHookSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_SaveBoardHook_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SaveBoardHook", in, out, opts...) if err != nil { return nil, err } @@ -169,7 +143,7 @@ func (c *foundationServiceClient) SaveBoardHook(ctx context.Context, in *BoardHo func (c *foundationServiceClient) ResourceUrl(ctx context.Context, in *String, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, FoundationService_ResourceUrl_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/ResourceUrl", in, out, opts...) if err != nil { return nil, err } @@ -178,7 +152,7 @@ func (c *foundationServiceClient) ResourceUrl(ctx context.Context, in *String, o func (c *foundationServiceClient) RegisterApp(ctx context.Context, in *SSsoApp, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, FoundationService_RegisterApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/RegisterApp", in, out, opts...) if err != nil { return nil, err } @@ -187,7 +161,7 @@ func (c *foundationServiceClient) RegisterApp(ctx context.Context, in *SSsoApp, func (c *foundationServiceClient) GetApp(ctx context.Context, in *String, opts ...grpc.CallOption) (*SSsoApp, error) { out := new(SSsoApp) - err := c.cc.Invoke(ctx, FoundationService_GetApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetApp", in, out, opts...) if err != nil { return nil, err } @@ -196,7 +170,7 @@ func (c *foundationServiceClient) GetApp(ctx context.Context, in *String, opts . func (c *foundationServiceClient) GetAllSsoApp(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*StringListResponse, error) { out := new(StringListResponse) - err := c.cc.Invoke(ctx, FoundationService_GetAllSsoApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetAllSsoApp", in, out, opts...) if err != nil { return nil, err } @@ -205,7 +179,7 @@ func (c *foundationServiceClient) GetAllSsoApp(ctx context.Context, in *Empty, o func (c *foundationServiceClient) SuperValidate(ctx context.Context, in *UserPwd, opts ...grpc.CallOption) (*SuperLoginResponse, error) { out := new(SuperLoginResponse) - err := c.cc.Invoke(ctx, FoundationService_SuperValidate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SuperValidate", in, out, opts...) if err != nil { return nil, err } @@ -214,7 +188,7 @@ func (c *foundationServiceClient) SuperValidate(ctx context.Context, in *UserPwd func (c *foundationServiceClient) FlushSuperPwd(ctx context.Context, in *UserPwd, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_FlushSuperPwd_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/FlushSuperPwd", in, out, opts...) if err != nil { return nil, err } @@ -223,7 +197,7 @@ func (c *foundationServiceClient) FlushSuperPwd(ctx context.Context, in *UserPwd func (c *foundationServiceClient) GetSyncLoginUrl(ctx context.Context, in *String, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, FoundationService_GetSyncLoginUrl_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetSyncLoginUrl", in, out, opts...) if err != nil { return nil, err } @@ -232,7 +206,7 @@ func (c *foundationServiceClient) GetSyncLoginUrl(ctx context.Context, in *Strin func (c *foundationServiceClient) GetAreaNames(ctx context.Context, in *GetAreaNamesRequest, opts ...grpc.CallOption) (*StringListResponse, error) { out := new(StringListResponse) - err := c.cc.Invoke(ctx, FoundationService_GetAreaNames_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetAreaNames", in, out, opts...) if err != nil { return nil, err } @@ -241,7 +215,7 @@ func (c *foundationServiceClient) GetAreaNames(ctx context.Context, in *GetAreaN func (c *foundationServiceClient) GetAreaString(ctx context.Context, in *AreaStringRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, FoundationService_GetAreaString_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetAreaString", in, out, opts...) if err != nil { return nil, err } @@ -250,7 +224,7 @@ func (c *foundationServiceClient) GetAreaString(ctx context.Context, in *AreaStr func (c *foundationServiceClient) GetChildAreas(ctx context.Context, in *Int32, opts ...grpc.CallOption) (*AreaListResponse, error) { out := new(AreaListResponse) - err := c.cc.Invoke(ctx, FoundationService_GetChildAreas_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetChildAreas", in, out, opts...) if err != nil { return nil, err } @@ -259,7 +233,7 @@ func (c *foundationServiceClient) GetChildAreas(ctx context.Context, in *Int32, func (c *foundationServiceClient) GetMoAppConf(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SMobileAppConfig, error) { out := new(SMobileAppConfig) - err := c.cc.Invoke(ctx, FoundationService_GetMoAppConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetMoAppConf", in, out, opts...) if err != nil { return nil, err } @@ -268,7 +242,7 @@ func (c *foundationServiceClient) GetMoAppConf(ctx context.Context, in *Empty, o func (c *foundationServiceClient) SaveMoAppConf(ctx context.Context, in *SMobileAppConfig, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_SaveMoAppConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SaveMoAppConf", in, out, opts...) if err != nil { return nil, err } @@ -277,7 +251,7 @@ func (c *foundationServiceClient) SaveMoAppConf(ctx context.Context, in *SMobile func (c *foundationServiceClient) GetWxApiConfig(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SWxApiConfig, error) { out := new(SWxApiConfig) - err := c.cc.Invoke(ctx, FoundationService_GetWxApiConfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetWxApiConfig", in, out, opts...) if err != nil { return nil, err } @@ -286,7 +260,7 @@ func (c *foundationServiceClient) GetWxApiConfig(ctx context.Context, in *Empty, func (c *foundationServiceClient) SaveWxApiConfig(ctx context.Context, in *SWxApiConfig, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_SaveWxApiConfig_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SaveWxApiConfig", in, out, opts...) if err != nil { return nil, err } @@ -295,7 +269,7 @@ func (c *foundationServiceClient) SaveWxApiConfig(ctx context.Context, in *SWxAp func (c *foundationServiceClient) GetPayPlatform(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*PaymentPlatformResponse, error) { out := new(PaymentPlatformResponse) - err := c.cc.Invoke(ctx, FoundationService_GetPayPlatform_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetPayPlatform", in, out, opts...) if err != nil { return nil, err } @@ -304,7 +278,7 @@ func (c *foundationServiceClient) GetPayPlatform(ctx context.Context, in *Empty, func (c *foundationServiceClient) GetGlobMchSaleConf_(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SGlobMchSaleConf, error) { out := new(SGlobMchSaleConf) - err := c.cc.Invoke(ctx, FoundationService_GetGlobMchSaleConf__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/GetGlobMchSaleConf_", in, out, opts...) if err != nil { return nil, err } @@ -313,7 +287,7 @@ func (c *foundationServiceClient) GetGlobMchSaleConf_(ctx context.Context, in *E func (c *foundationServiceClient) SaveGlobMchSaleConf_(ctx context.Context, in *SGlobMchSaleConf, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, FoundationService_SaveGlobMchSaleConf__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/FoundationService/SaveGlobMchSaleConf_", in, out, opts...) if err != nil { return nil, err } @@ -478,7 +452,7 @@ func _FoundationService_CheckSensitive_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_CheckSensitive_FullMethodName, + FullMethod: "/FoundationService/CheckSensitive", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).CheckSensitive(ctx, req.(*String)) @@ -496,7 +470,7 @@ func _FoundationService_ReplaceSensitive_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_ReplaceSensitive_FullMethodName, + FullMethod: "/FoundationService/ReplaceSensitive", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).ReplaceSensitive(ctx, req.(*ReplaceSensitiveRequest)) @@ -514,7 +488,7 @@ func _FoundationService_GetSmsSetting_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetSmsSetting_FullMethodName, + FullMethod: "/FoundationService/GetSmsSetting", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetSmsSetting(ctx, req.(*GetSmsSettingRequest)) @@ -532,7 +506,7 @@ func _FoundationService_SaveSmsSetting_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SaveSmsSetting_FullMethodName, + FullMethod: "/FoundationService/SaveSmsSetting", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveSmsSetting(ctx, req.(*SSmsProviderSetting)) @@ -550,7 +524,7 @@ func _FoundationService_CleanCache_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_CleanCache_FullMethodName, + FullMethod: "/FoundationService/CleanCache", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).CleanCache(ctx, req.(*CleanCacheRequest)) @@ -568,7 +542,7 @@ func _FoundationService_SaveBoardHook_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SaveBoardHook_FullMethodName, + FullMethod: "/FoundationService/SaveBoardHook", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveBoardHook(ctx, req.(*BoardHookSaveRequest)) @@ -586,7 +560,7 @@ func _FoundationService_ResourceUrl_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_ResourceUrl_FullMethodName, + FullMethod: "/FoundationService/ResourceUrl", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).ResourceUrl(ctx, req.(*String)) @@ -604,7 +578,7 @@ func _FoundationService_RegisterApp_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_RegisterApp_FullMethodName, + FullMethod: "/FoundationService/RegisterApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).RegisterApp(ctx, req.(*SSsoApp)) @@ -622,7 +596,7 @@ func _FoundationService_GetApp_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetApp_FullMethodName, + FullMethod: "/FoundationService/GetApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetApp(ctx, req.(*String)) @@ -640,7 +614,7 @@ func _FoundationService_GetAllSsoApp_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetAllSsoApp_FullMethodName, + FullMethod: "/FoundationService/GetAllSsoApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAllSsoApp(ctx, req.(*Empty)) @@ -658,7 +632,7 @@ func _FoundationService_SuperValidate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SuperValidate_FullMethodName, + FullMethod: "/FoundationService/SuperValidate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SuperValidate(ctx, req.(*UserPwd)) @@ -676,7 +650,7 @@ func _FoundationService_FlushSuperPwd_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_FlushSuperPwd_FullMethodName, + FullMethod: "/FoundationService/FlushSuperPwd", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).FlushSuperPwd(ctx, req.(*UserPwd)) @@ -694,7 +668,7 @@ func _FoundationService_GetSyncLoginUrl_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetSyncLoginUrl_FullMethodName, + FullMethod: "/FoundationService/GetSyncLoginUrl", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetSyncLoginUrl(ctx, req.(*String)) @@ -712,7 +686,7 @@ func _FoundationService_GetAreaNames_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetAreaNames_FullMethodName, + FullMethod: "/FoundationService/GetAreaNames", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAreaNames(ctx, req.(*GetAreaNamesRequest)) @@ -730,7 +704,7 @@ func _FoundationService_GetAreaString_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetAreaString_FullMethodName, + FullMethod: "/FoundationService/GetAreaString", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAreaString(ctx, req.(*AreaStringRequest)) @@ -748,7 +722,7 @@ func _FoundationService_GetChildAreas_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetChildAreas_FullMethodName, + FullMethod: "/FoundationService/GetChildAreas", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetChildAreas(ctx, req.(*Int32)) @@ -766,7 +740,7 @@ func _FoundationService_GetMoAppConf_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetMoAppConf_FullMethodName, + FullMethod: "/FoundationService/GetMoAppConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetMoAppConf(ctx, req.(*Empty)) @@ -784,7 +758,7 @@ func _FoundationService_SaveMoAppConf_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SaveMoAppConf_FullMethodName, + FullMethod: "/FoundationService/SaveMoAppConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveMoAppConf(ctx, req.(*SMobileAppConfig)) @@ -802,7 +776,7 @@ func _FoundationService_GetWxApiConfig_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetWxApiConfig_FullMethodName, + FullMethod: "/FoundationService/GetWxApiConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetWxApiConfig(ctx, req.(*Empty)) @@ -820,7 +794,7 @@ func _FoundationService_SaveWxApiConfig_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SaveWxApiConfig_FullMethodName, + FullMethod: "/FoundationService/SaveWxApiConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveWxApiConfig(ctx, req.(*SWxApiConfig)) @@ -838,7 +812,7 @@ func _FoundationService_GetPayPlatform_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetPayPlatform_FullMethodName, + FullMethod: "/FoundationService/GetPayPlatform", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetPayPlatform(ctx, req.(*Empty)) @@ -856,7 +830,7 @@ func _FoundationService_GetGlobMchSaleConf__Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_GetGlobMchSaleConf__FullMethodName, + FullMethod: "/FoundationService/GetGlobMchSaleConf_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetGlobMchSaleConf_(ctx, req.(*Empty)) @@ -874,7 +848,7 @@ func _FoundationService_SaveGlobMchSaleConf__Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: FoundationService_SaveGlobMchSaleConf__FullMethodName, + FullMethod: "/FoundationService/SaveGlobMchSaleConf_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveGlobMchSaleConf_(ctx, req.(*SGlobMchSaleConf)) diff --git a/core/service/proto/global.pb.go b/core/service/proto/global.pb.go index 3fa364af4..e2f5fdac2 100644 --- a/core/service/proto/global.pb.go +++ b/core/service/proto/global.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: global.proto package proto diff --git a/core/service/proto/item_dto.pb.go b/core/service/proto/item_dto.pb.go index 766c99903..ca93f4541 100644 --- a/core/service/proto/item_dto.pb.go +++ b/core/service/proto/item_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/item_dto.proto package proto diff --git a/core/service/proto/item_service.pb.go b/core/service/proto/item_service.pb.go index ccd4c8a54..0c56e8226 100644 --- a/core/service/proto/item_service.pb.go +++ b/core/service/proto/item_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: item_service.proto package proto diff --git a/core/service/proto/item_service_grpc.pb.go b/core/service/proto/item_service_grpc.pb.go index d429c02f3..3643b3703 100644 --- a/core/service/proto/item_service_grpc.pb.go +++ b/core/service/proto/item_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: item_service.proto package proto @@ -18,31 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ItemService_GetItem_FullMethodName = "/ItemService/GetItem" - ItemService_SaveItem_FullMethodName = "/ItemService/SaveItem" - ItemService_GetItemBySku_FullMethodName = "/ItemService/GetItemBySku" - ItemService_GetItemAndSnapshot_FullMethodName = "/ItemService/GetItemAndSnapshot" - ItemService_GetTradeSnapshot_FullMethodName = "/ItemService/GetTradeSnapshot" - ItemService_GetSku_FullMethodName = "/ItemService/GetSku" - ItemService_ReviewItem_FullMethodName = "/ItemService/ReviewItem" - ItemService_RecycleItem_FullMethodName = "/ItemService/RecycleItem" - ItemService_SaveLevelPrices_FullMethodName = "/ItemService/SaveLevelPrices" - ItemService_SignAsIllegal_FullMethodName = "/ItemService/SignAsIllegal" - ItemService_SetShelveState_FullMethodName = "/ItemService/SetShelveState" - ItemService_GetItemDetailData_FullMethodName = "/ItemService/GetItemDetailData" - ItemService_GetItems_FullMethodName = "/ItemService/GetItems" - ItemService_GetWholesalePriceArray_FullMethodName = "/ItemService/GetWholesalePriceArray" - ItemService_SaveWholesalePrice_FullMethodName = "/ItemService/SaveWholesalePrice" - ItemService_GetWholesaleDiscountArray_FullMethodName = "/ItemService/GetWholesaleDiscountArray" - ItemService_SaveWholesaleDiscount_FullMethodName = "/ItemService/SaveWholesaleDiscount" - ItemService_GetAllSaleLabels_FullMethodName = "/ItemService/GetAllSaleLabels" - ItemService_GetSaleLabel_FullMethodName = "/ItemService/GetSaleLabel" - ItemService_SaveSaleLabel_FullMethodName = "/ItemService/SaveSaleLabel" - ItemService_DeleteSaleLabel_FullMethodName = "/ItemService/DeleteSaleLabel" - ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName = "/ItemService/GetPagedValueGoodsBySaleLabel_" -) - // ItemServiceClient is the client API for ItemService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -103,7 +78,7 @@ func NewItemServiceClient(cc grpc.ClientConnInterface) ItemServiceClient { func (c *itemServiceClient) GetItem(ctx context.Context, in *GetItemRequest, opts ...grpc.CallOption) (*SItemDataResponse, error) { out := new(SItemDataResponse) - err := c.cc.Invoke(ctx, ItemService_GetItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetItem", in, out, opts...) if err != nil { return nil, err } @@ -112,7 +87,7 @@ func (c *itemServiceClient) GetItem(ctx context.Context, in *GetItemRequest, opt func (c *itemServiceClient) SaveItem(ctx context.Context, in *SaveItemRequest, opts ...grpc.CallOption) (*SaveItemResponse, error) { out := new(SaveItemResponse) - err := c.cc.Invoke(ctx, ItemService_SaveItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SaveItem", in, out, opts...) if err != nil { return nil, err } @@ -121,7 +96,7 @@ func (c *itemServiceClient) SaveItem(ctx context.Context, in *SaveItemRequest, o func (c *itemServiceClient) GetItemBySku(ctx context.Context, in *ItemBySkuRequest, opts ...grpc.CallOption) (*SUnifiedViewItem, error) { out := new(SUnifiedViewItem) - err := c.cc.Invoke(ctx, ItemService_GetItemBySku_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetItemBySku", in, out, opts...) if err != nil { return nil, err } @@ -130,7 +105,7 @@ func (c *itemServiceClient) GetItemBySku(ctx context.Context, in *ItemBySkuReque func (c *itemServiceClient) GetItemAndSnapshot(ctx context.Context, in *GetItemAndSnapshotRequest, opts ...grpc.CallOption) (*ItemSnapshotResponse, error) { out := new(ItemSnapshotResponse) - err := c.cc.Invoke(ctx, ItemService_GetItemAndSnapshot_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetItemAndSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -139,7 +114,7 @@ func (c *itemServiceClient) GetItemAndSnapshot(ctx context.Context, in *GetItemA func (c *itemServiceClient) GetTradeSnapshot(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*STradeSnapshot, error) { out := new(STradeSnapshot) - err := c.cc.Invoke(ctx, ItemService_GetTradeSnapshot_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetTradeSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -148,7 +123,7 @@ func (c *itemServiceClient) GetTradeSnapshot(ctx context.Context, in *Int64, opt func (c *itemServiceClient) GetSku(ctx context.Context, in *SkuId, opts ...grpc.CallOption) (*SSku, error) { out := new(SSku) - err := c.cc.Invoke(ctx, ItemService_GetSku_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetSku", in, out, opts...) if err != nil { return nil, err } @@ -157,7 +132,7 @@ func (c *itemServiceClient) GetSku(ctx context.Context, in *SkuId, opts ...grpc. func (c *itemServiceClient) ReviewItem(ctx context.Context, in *ItemReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_ReviewItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/ReviewItem", in, out, opts...) if err != nil { return nil, err } @@ -166,7 +141,7 @@ func (c *itemServiceClient) ReviewItem(ctx context.Context, in *ItemReviewReques func (c *itemServiceClient) RecycleItem(ctx context.Context, in *RecycleItemRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_RecycleItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/RecycleItem", in, out, opts...) if err != nil { return nil, err } @@ -175,7 +150,7 @@ func (c *itemServiceClient) RecycleItem(ctx context.Context, in *RecycleItemRequ func (c *itemServiceClient) SaveLevelPrices(ctx context.Context, in *SaveLevelPriceRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SaveLevelPrices_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SaveLevelPrices", in, out, opts...) if err != nil { return nil, err } @@ -184,7 +159,7 @@ func (c *itemServiceClient) SaveLevelPrices(ctx context.Context, in *SaveLevelPr func (c *itemServiceClient) SignAsIllegal(ctx context.Context, in *ItemIllegalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SignAsIllegal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SignAsIllegal", in, out, opts...) if err != nil { return nil, err } @@ -193,7 +168,7 @@ func (c *itemServiceClient) SignAsIllegal(ctx context.Context, in *ItemIllegalRe func (c *itemServiceClient) SetShelveState(ctx context.Context, in *ShelveStateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SetShelveState_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SetShelveState", in, out, opts...) if err != nil { return nil, err } @@ -202,7 +177,7 @@ func (c *itemServiceClient) SetShelveState(ctx context.Context, in *ShelveStateR func (c *itemServiceClient) GetItemDetailData(ctx context.Context, in *ItemDetailRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, ItemService_GetItemDetailData_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetItemDetailData", in, out, opts...) if err != nil { return nil, err } @@ -211,7 +186,7 @@ func (c *itemServiceClient) GetItemDetailData(ctx context.Context, in *ItemDetai func (c *itemServiceClient) GetItems(ctx context.Context, in *GetItemsRequest, opts ...grpc.CallOption) (*PagingGoodsResponse, error) { out := new(PagingGoodsResponse) - err := c.cc.Invoke(ctx, ItemService_GetItems_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetItems", in, out, opts...) if err != nil { return nil, err } @@ -220,7 +195,7 @@ func (c *itemServiceClient) GetItems(ctx context.Context, in *GetItemsRequest, o func (c *itemServiceClient) GetWholesalePriceArray(ctx context.Context, in *SkuId, opts ...grpc.CallOption) (*SWsSkuPriceListResponse, error) { out := new(SWsSkuPriceListResponse) - err := c.cc.Invoke(ctx, ItemService_GetWholesalePriceArray_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetWholesalePriceArray", in, out, opts...) if err != nil { return nil, err } @@ -229,7 +204,7 @@ func (c *itemServiceClient) GetWholesalePriceArray(ctx context.Context, in *SkuI func (c *itemServiceClient) SaveWholesalePrice(ctx context.Context, in *SaveSkuPricesRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SaveWholesalePrice_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SaveWholesalePrice", in, out, opts...) if err != nil { return nil, err } @@ -238,7 +213,7 @@ func (c *itemServiceClient) SaveWholesalePrice(ctx context.Context, in *SaveSkuP func (c *itemServiceClient) GetWholesaleDiscountArray(ctx context.Context, in *GetWsDiscountRequest, opts ...grpc.CallOption) (*SWsItemDiscountListResponse, error) { out := new(SWsItemDiscountListResponse) - err := c.cc.Invoke(ctx, ItemService_GetWholesaleDiscountArray_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetWholesaleDiscountArray", in, out, opts...) if err != nil { return nil, err } @@ -247,7 +222,7 @@ func (c *itemServiceClient) GetWholesaleDiscountArray(ctx context.Context, in *G func (c *itemServiceClient) SaveWholesaleDiscount(ctx context.Context, in *SaveItemDiscountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SaveWholesaleDiscount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SaveWholesaleDiscount", in, out, opts...) if err != nil { return nil, err } @@ -256,7 +231,7 @@ func (c *itemServiceClient) SaveWholesaleDiscount(ctx context.Context, in *SaveI func (c *itemServiceClient) GetAllSaleLabels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ItemLabelListResponse, error) { out := new(ItemLabelListResponse) - err := c.cc.Invoke(ctx, ItemService_GetAllSaleLabels_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetAllSaleLabels", in, out, opts...) if err != nil { return nil, err } @@ -265,7 +240,7 @@ func (c *itemServiceClient) GetAllSaleLabels(ctx context.Context, in *Empty, opt func (c *itemServiceClient) GetSaleLabel(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SItemLabel, error) { out := new(SItemLabel) - err := c.cc.Invoke(ctx, ItemService_GetSaleLabel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetSaleLabel", in, out, opts...) if err != nil { return nil, err } @@ -274,7 +249,7 @@ func (c *itemServiceClient) GetSaleLabel(ctx context.Context, in *IdOrName, opts func (c *itemServiceClient) SaveSaleLabel(ctx context.Context, in *SItemLabel, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_SaveSaleLabel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/SaveSaleLabel", in, out, opts...) if err != nil { return nil, err } @@ -283,7 +258,7 @@ func (c *itemServiceClient) SaveSaleLabel(ctx context.Context, in *SItemLabel, o func (c *itemServiceClient) DeleteSaleLabel(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ItemService_DeleteSaleLabel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/DeleteSaleLabel", in, out, opts...) if err != nil { return nil, err } @@ -292,7 +267,7 @@ func (c *itemServiceClient) DeleteSaleLabel(ctx context.Context, in *Int64, opts func (c *itemServiceClient) GetPagedValueGoodsBySaleLabel_(ctx context.Context, in *SaleLabelItemsRequest_, opts ...grpc.CallOption) (*PagingGoodsResponse, error) { out := new(PagingGoodsResponse) - err := c.cc.Invoke(ctx, ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ItemService/GetPagedValueGoodsBySaleLabel_", in, out, opts...) if err != nil { return nil, err } @@ -443,7 +418,7 @@ func _ItemService_GetItem_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetItem_FullMethodName, + FullMethod: "/ItemService/GetItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItem(ctx, req.(*GetItemRequest)) @@ -461,7 +436,7 @@ func _ItemService_SaveItem_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SaveItem_FullMethodName, + FullMethod: "/ItemService/SaveItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveItem(ctx, req.(*SaveItemRequest)) @@ -479,7 +454,7 @@ func _ItemService_GetItemBySku_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetItemBySku_FullMethodName, + FullMethod: "/ItemService/GetItemBySku", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemBySku(ctx, req.(*ItemBySkuRequest)) @@ -497,7 +472,7 @@ func _ItemService_GetItemAndSnapshot_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetItemAndSnapshot_FullMethodName, + FullMethod: "/ItemService/GetItemAndSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemAndSnapshot(ctx, req.(*GetItemAndSnapshotRequest)) @@ -515,7 +490,7 @@ func _ItemService_GetTradeSnapshot_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetTradeSnapshot_FullMethodName, + FullMethod: "/ItemService/GetTradeSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetTradeSnapshot(ctx, req.(*Int64)) @@ -533,7 +508,7 @@ func _ItemService_GetSku_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetSku_FullMethodName, + FullMethod: "/ItemService/GetSku", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetSku(ctx, req.(*SkuId)) @@ -551,7 +526,7 @@ func _ItemService_ReviewItem_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_ReviewItem_FullMethodName, + FullMethod: "/ItemService/ReviewItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).ReviewItem(ctx, req.(*ItemReviewRequest)) @@ -569,7 +544,7 @@ func _ItemService_RecycleItem_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_RecycleItem_FullMethodName, + FullMethod: "/ItemService/RecycleItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).RecycleItem(ctx, req.(*RecycleItemRequest)) @@ -587,7 +562,7 @@ func _ItemService_SaveLevelPrices_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SaveLevelPrices_FullMethodName, + FullMethod: "/ItemService/SaveLevelPrices", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveLevelPrices(ctx, req.(*SaveLevelPriceRequest)) @@ -605,7 +580,7 @@ func _ItemService_SignAsIllegal_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SignAsIllegal_FullMethodName, + FullMethod: "/ItemService/SignAsIllegal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SignAsIllegal(ctx, req.(*ItemIllegalRequest)) @@ -623,7 +598,7 @@ func _ItemService_SetShelveState_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SetShelveState_FullMethodName, + FullMethod: "/ItemService/SetShelveState", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SetShelveState(ctx, req.(*ShelveStateRequest)) @@ -641,7 +616,7 @@ func _ItemService_GetItemDetailData_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetItemDetailData_FullMethodName, + FullMethod: "/ItemService/GetItemDetailData", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemDetailData(ctx, req.(*ItemDetailRequest)) @@ -659,7 +634,7 @@ func _ItemService_GetItems_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetItems_FullMethodName, + FullMethod: "/ItemService/GetItems", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItems(ctx, req.(*GetItemsRequest)) @@ -677,7 +652,7 @@ func _ItemService_GetWholesalePriceArray_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetWholesalePriceArray_FullMethodName, + FullMethod: "/ItemService/GetWholesalePriceArray", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetWholesalePriceArray(ctx, req.(*SkuId)) @@ -695,7 +670,7 @@ func _ItemService_SaveWholesalePrice_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SaveWholesalePrice_FullMethodName, + FullMethod: "/ItemService/SaveWholesalePrice", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveWholesalePrice(ctx, req.(*SaveSkuPricesRequest)) @@ -713,7 +688,7 @@ func _ItemService_GetWholesaleDiscountArray_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetWholesaleDiscountArray_FullMethodName, + FullMethod: "/ItemService/GetWholesaleDiscountArray", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetWholesaleDiscountArray(ctx, req.(*GetWsDiscountRequest)) @@ -731,7 +706,7 @@ func _ItemService_SaveWholesaleDiscount_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SaveWholesaleDiscount_FullMethodName, + FullMethod: "/ItemService/SaveWholesaleDiscount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveWholesaleDiscount(ctx, req.(*SaveItemDiscountRequest)) @@ -749,7 +724,7 @@ func _ItemService_GetAllSaleLabels_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetAllSaleLabels_FullMethodName, + FullMethod: "/ItemService/GetAllSaleLabels", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetAllSaleLabels(ctx, req.(*Empty)) @@ -767,7 +742,7 @@ func _ItemService_GetSaleLabel_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetSaleLabel_FullMethodName, + FullMethod: "/ItemService/GetSaleLabel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetSaleLabel(ctx, req.(*IdOrName)) @@ -785,7 +760,7 @@ func _ItemService_SaveSaleLabel_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_SaveSaleLabel_FullMethodName, + FullMethod: "/ItemService/SaveSaleLabel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveSaleLabel(ctx, req.(*SItemLabel)) @@ -803,7 +778,7 @@ func _ItemService_DeleteSaleLabel_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_DeleteSaleLabel_FullMethodName, + FullMethod: "/ItemService/DeleteSaleLabel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).DeleteSaleLabel(ctx, req.(*Int64)) @@ -821,7 +796,7 @@ func _ItemService_GetPagedValueGoodsBySaleLabel__Handler(srv interface{}, ctx co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName, + FullMethod: "/ItemService/GetPagedValueGoodsBySaleLabel_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetPagedValueGoodsBySaleLabel_(ctx, req.(*SaleLabelItemsRequest_)) diff --git a/core/service/proto/member_dto.pb.go b/core/service/proto/member_dto.pb.go index f88dbe56b..760e36223 100644 --- a/core/service/proto/member_dto.pb.go +++ b/core/service/proto/member_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/member_dto.proto package proto diff --git a/core/service/proto/member_service.pb.go b/core/service/proto/member_service.pb.go index 6dba12b24..e68a05ab1 100644 --- a/core/service/proto/member_service.pb.go +++ b/core/service/proto/member_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: member_service.proto package proto diff --git a/core/service/proto/member_service_grpc.pb.go b/core/service/proto/member_service_grpc.pb.go index a7e1b4ed4..504195256 100644 --- a/core/service/proto/member_service_grpc.pb.go +++ b/core/service/proto/member_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: member_service.proto package proto @@ -18,91 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - MemberService_Register_FullMethodName = "/MemberService/Register" - MemberService_CheckLogin_FullMethodName = "/MemberService/CheckLogin" - MemberService_GrantAccessToken_FullMethodName = "/MemberService/GrantAccessToken" - MemberService_CheckAccessToken_FullMethodName = "/MemberService/CheckAccessToken" - MemberService_VerifyTradePassword_FullMethodName = "/MemberService/VerifyTradePassword" - MemberService_GetLevels_FullMethodName = "/MemberService/GetLevels" - MemberService_GetTrustInfo_FullMethodName = "/MemberService/GetTrustInfo" - MemberService_SubmitTrustInfo_FullMethodName = "/MemberService/SubmitTrustInfo" - MemberService_ReviewTrustedInfo_FullMethodName = "/MemberService/ReviewTrustedInfo" - MemberService_GetMemberLevel_FullMethodName = "/MemberService/GetMemberLevel" - MemberService_SaveMemberLevel_FullMethodName = "/MemberService/SaveMemberLevel" - MemberService_GetLevelBySign_FullMethodName = "/MemberService/GetLevelBySign" - MemberService_DeleteMemberLevel_FullMethodName = "/MemberService/DeleteMemberLevel" - MemberService_GetMember_FullMethodName = "/MemberService/GetMember" - MemberService_FindMember_FullMethodName = "/MemberService/FindMember" - MemberService_GetProfile_FullMethodName = "/MemberService/GetProfile" - MemberService_SaveProfile_FullMethodName = "/MemberService/SaveProfile" - MemberService_GetInviter_FullMethodName = "/MemberService/GetInviter" - MemberService_GetInviteCount_FullMethodName = "/MemberService/GetInviteCount" - MemberService_GetBankCards_FullMethodName = "/MemberService/GetBankCards" - MemberService_AddBankCard_FullMethodName = "/MemberService/AddBankCard" - MemberService_RemoveBankCard_FullMethodName = "/MemberService/RemoveBankCard" - MemberService_Active_FullMethodName = "/MemberService/Active" - MemberService_Lock_FullMethodName = "/MemberService/Lock" - MemberService_Unlock_FullMethodName = "/MemberService/Unlock" - MemberService_GrantFlag_FullMethodName = "/MemberService/GrantFlag" - MemberService_Complex_FullMethodName = "/MemberService/Complex" - MemberService_SendCode_FullMethodName = "/MemberService/SendCode" - MemberService_CompareCode_FullMethodName = "/MemberService/CompareCode" - MemberService_ReceiptsCodes_FullMethodName = "/MemberService/ReceiptsCodes" - MemberService_SaveReceiptsCode_FullMethodName = "/MemberService/SaveReceiptsCode" - MemberService_SetPayPriority_FullMethodName = "/MemberService/SetPayPriority" - MemberService_CheckProfileComplete_FullMethodName = "/MemberService/CheckProfileComplete" - MemberService_MemberLevelInfo_FullMethodName = "/MemberService/MemberLevelInfo" - MemberService_ChangeLevel_FullMethodName = "/MemberService/ChangeLevel" - MemberService_ReviewLevelUpRequest_FullMethodName = "/MemberService/ReviewLevelUpRequest" - MemberService_ConfirmLevelUpRequest_FullMethodName = "/MemberService/ConfirmLevelUpRequest" - MemberService_ChangePhone_FullMethodName = "/MemberService/ChangePhone" - MemberService_ChangeUsername_FullMethodName = "/MemberService/ChangeUsername" - MemberService_ChangeNickname_FullMethodName = "/MemberService/ChangeNickname" - MemberService_ChangeHeadPortrait_FullMethodName = "/MemberService/ChangeHeadPortrait" - MemberService_ChangePassword_FullMethodName = "/MemberService/ChangePassword" - MemberService_ChangeTradePassword_FullMethodName = "/MemberService/ChangeTradePassword" - MemberService_CheckProfileCompleted_FullMethodName = "/MemberService/CheckProfileCompleted" - MemberService_SetInviter_FullMethodName = "/MemberService/SetInviter" - MemberService_Premium_FullMethodName = "/MemberService/Premium" - MemberService_GetToken_FullMethodName = "/MemberService/GetToken" - MemberService_CheckToken_FullMethodName = "/MemberService/CheckToken" - MemberService_RemoveToken_FullMethodName = "/MemberService/RemoveToken" - MemberService_GetAddressList_FullMethodName = "/MemberService/GetAddressList" - MemberService_SaveAddress_FullMethodName = "/MemberService/SaveAddress" - MemberService_GetAddress_FullMethodName = "/MemberService/GetAddress" - MemberService_DeleteAddress_FullMethodName = "/MemberService/DeleteAddress" - MemberService_GetAccount_FullMethodName = "/MemberService/GetAccount" - MemberService_IsInvitation_FullMethodName = "/MemberService/IsInvitation" - MemberService_InviterArray_FullMethodName = "/MemberService/InviterArray" - MemberService_InviteMembersQuantity_FullMethodName = "/MemberService/InviteMembersQuantity" - MemberService_QueryInviteQuantity_FullMethodName = "/MemberService/QueryInviteQuantity" - MemberService_QueryInviteArray_FullMethodName = "/MemberService/QueryInviteArray" - MemberService_GetMyPagedInvitationMembers_FullMethodName = "/MemberService/GetMyPagedInvitationMembers" - MemberService_AccountCharge_FullMethodName = "/MemberService/AccountCharge" - MemberService_AccountCarryTo_FullMethodName = "/MemberService/AccountCarryTo" - MemberService_AccountConsume_FullMethodName = "/MemberService/AccountConsume" - MemberService_AccountDiscount_FullMethodName = "/MemberService/AccountDiscount" - MemberService_Freeze_FullMethodName = "/MemberService/Freeze" - MemberService_Unfreeze_FullMethodName = "/MemberService/Unfreeze" - MemberService_AccountRefund_FullMethodName = "/MemberService/AccountRefund" - MemberService_AccountAdjust_FullMethodName = "/MemberService/AccountAdjust" - MemberService_AccountTransfer_FullMethodName = "/MemberService/AccountTransfer" - MemberService_Withdraw_FullMethodName = "/MemberService/Withdraw" - MemberService_ReviewWithdrawal_FullMethodName = "/MemberService/ReviewWithdrawal" - MemberService_FinishWithdrawal_FullMethodName = "/MemberService/FinishWithdrawal" - MemberService_QueryWithdrawalLog_FullMethodName = "/MemberService/QueryWithdrawalLog" - MemberService_BindOAuthApp_FullMethodName = "/MemberService/BindOAuthApp" - MemberService_UnbindOAuthApp_FullMethodName = "/MemberService/UnbindOAuthApp" - MemberService_GetOAuthBindInfo_FullMethodName = "/MemberService/GetOAuthBindInfo" - MemberService_B4EAuth_FullMethodName = "/MemberService/B4EAuth" - MemberService_GetWalletLog_FullMethodName = "/MemberService/GetWalletLog" - MemberService_RemoveFavorite_FullMethodName = "/MemberService/RemoveFavorite" - MemberService_Favorite_FullMethodName = "/MemberService/Favorite" - MemberService_IsFavored_FullMethodName = "/MemberService/IsFavored" - MemberService_QueryCoupons_FullMethodName = "/MemberService/QueryCoupons" -) - // MemberServiceClient is the client API for MemberService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -293,7 +208,7 @@ func NewMemberServiceClient(cc grpc.ClientConnInterface) MemberServiceClient { func (c *memberServiceClient) Register(ctx context.Context, in *RegisterMemberRequest, opts ...grpc.CallOption) (*RegisterResponse, error) { out := new(RegisterResponse) - err := c.cc.Invoke(ctx, MemberService_Register_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Register", in, out, opts...) if err != nil { return nil, err } @@ -302,7 +217,7 @@ func (c *memberServiceClient) Register(ctx context.Context, in *RegisterMemberRe func (c *memberServiceClient) CheckLogin(ctx context.Context, in *LoginRequest, opts ...grpc.CallOption) (*LoginResponse, error) { out := new(LoginResponse) - err := c.cc.Invoke(ctx, MemberService_CheckLogin_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CheckLogin", in, out, opts...) if err != nil { return nil, err } @@ -311,7 +226,7 @@ func (c *memberServiceClient) CheckLogin(ctx context.Context, in *LoginRequest, func (c *memberServiceClient) GrantAccessToken(ctx context.Context, in *GrantAccessTokenRequest, opts ...grpc.CallOption) (*GrantAccessTokenResponse, error) { out := new(GrantAccessTokenResponse) - err := c.cc.Invoke(ctx, MemberService_GrantAccessToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GrantAccessToken", in, out, opts...) if err != nil { return nil, err } @@ -320,7 +235,7 @@ func (c *memberServiceClient) GrantAccessToken(ctx context.Context, in *GrantAcc func (c *memberServiceClient) CheckAccessToken(ctx context.Context, in *CheckAccessTokenRequest, opts ...grpc.CallOption) (*CheckAccessTokenResponse, error) { out := new(CheckAccessTokenResponse) - err := c.cc.Invoke(ctx, MemberService_CheckAccessToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CheckAccessToken", in, out, opts...) if err != nil { return nil, err } @@ -329,7 +244,7 @@ func (c *memberServiceClient) CheckAccessToken(ctx context.Context, in *CheckAcc func (c *memberServiceClient) VerifyTradePassword(ctx context.Context, in *VerifyPasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_VerifyTradePassword_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/VerifyTradePassword", in, out, opts...) if err != nil { return nil, err } @@ -338,7 +253,7 @@ func (c *memberServiceClient) VerifyTradePassword(ctx context.Context, in *Verif func (c *memberServiceClient) GetLevels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SMemberLevelListResponse, error) { out := new(SMemberLevelListResponse) - err := c.cc.Invoke(ctx, MemberService_GetLevels_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetLevels", in, out, opts...) if err != nil { return nil, err } @@ -347,7 +262,7 @@ func (c *memberServiceClient) GetLevels(ctx context.Context, in *Empty, opts ... func (c *memberServiceClient) GetTrustInfo(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*STrustedInfo, error) { out := new(STrustedInfo) - err := c.cc.Invoke(ctx, MemberService_GetTrustInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetTrustInfo", in, out, opts...) if err != nil { return nil, err } @@ -356,7 +271,7 @@ func (c *memberServiceClient) GetTrustInfo(ctx context.Context, in *MemberIdRequ func (c *memberServiceClient) SubmitTrustInfo(ctx context.Context, in *SubmitTrustInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SubmitTrustInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SubmitTrustInfo", in, out, opts...) if err != nil { return nil, err } @@ -365,7 +280,7 @@ func (c *memberServiceClient) SubmitTrustInfo(ctx context.Context, in *SubmitTru func (c *memberServiceClient) ReviewTrustedInfo(ctx context.Context, in *ReviewTrustInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ReviewTrustedInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ReviewTrustedInfo", in, out, opts...) if err != nil { return nil, err } @@ -374,7 +289,7 @@ func (c *memberServiceClient) ReviewTrustedInfo(ctx context.Context, in *ReviewT func (c *memberServiceClient) GetMemberLevel(ctx context.Context, in *Int32, opts ...grpc.CallOption) (*SMemberLevel, error) { out := new(SMemberLevel) - err := c.cc.Invoke(ctx, MemberService_GetMemberLevel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetMemberLevel", in, out, opts...) if err != nil { return nil, err } @@ -383,7 +298,7 @@ func (c *memberServiceClient) GetMemberLevel(ctx context.Context, in *Int32, opt func (c *memberServiceClient) SaveMemberLevel(ctx context.Context, in *SMemberLevel, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SaveMemberLevel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SaveMemberLevel", in, out, opts...) if err != nil { return nil, err } @@ -392,7 +307,7 @@ func (c *memberServiceClient) SaveMemberLevel(ctx context.Context, in *SMemberLe func (c *memberServiceClient) GetLevelBySign(ctx context.Context, in *String, opts ...grpc.CallOption) (*SMemberLevel, error) { out := new(SMemberLevel) - err := c.cc.Invoke(ctx, MemberService_GetLevelBySign_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetLevelBySign", in, out, opts...) if err != nil { return nil, err } @@ -401,7 +316,7 @@ func (c *memberServiceClient) GetLevelBySign(ctx context.Context, in *String, op func (c *memberServiceClient) DeleteMemberLevel(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_DeleteMemberLevel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/DeleteMemberLevel", in, out, opts...) if err != nil { return nil, err } @@ -410,7 +325,7 @@ func (c *memberServiceClient) DeleteMemberLevel(ctx context.Context, in *Int64, func (c *memberServiceClient) GetMember(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SMember, error) { out := new(SMember) - err := c.cc.Invoke(ctx, MemberService_GetMember_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetMember", in, out, opts...) if err != nil { return nil, err } @@ -419,7 +334,7 @@ func (c *memberServiceClient) GetMember(ctx context.Context, in *MemberIdRequest func (c *memberServiceClient) FindMember(ctx context.Context, in *FindMemberRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MemberService_FindMember_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/FindMember", in, out, opts...) if err != nil { return nil, err } @@ -428,7 +343,7 @@ func (c *memberServiceClient) FindMember(ctx context.Context, in *FindMemberRequ func (c *memberServiceClient) GetProfile(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SProfile, error) { out := new(SProfile) - err := c.cc.Invoke(ctx, MemberService_GetProfile_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetProfile", in, out, opts...) if err != nil { return nil, err } @@ -437,7 +352,7 @@ func (c *memberServiceClient) GetProfile(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) SaveProfile(ctx context.Context, in *SProfile, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SaveProfile_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SaveProfile", in, out, opts...) if err != nil { return nil, err } @@ -446,7 +361,7 @@ func (c *memberServiceClient) SaveProfile(ctx context.Context, in *SProfile, opt func (c *memberServiceClient) GetInviter(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*MemberInviterResponse, error) { out := new(MemberInviterResponse) - err := c.cc.Invoke(ctx, MemberService_GetInviter_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetInviter", in, out, opts...) if err != nil { return nil, err } @@ -455,7 +370,7 @@ func (c *memberServiceClient) GetInviter(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) GetInviteCount(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*MemberInviteCountResponse, error) { out := new(MemberInviteCountResponse) - err := c.cc.Invoke(ctx, MemberService_GetInviteCount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetInviteCount", in, out, opts...) if err != nil { return nil, err } @@ -464,7 +379,7 @@ func (c *memberServiceClient) GetInviteCount(ctx context.Context, in *MemberIdRe func (c *memberServiceClient) GetBankCards(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*BankCardListResponse, error) { out := new(BankCardListResponse) - err := c.cc.Invoke(ctx, MemberService_GetBankCards_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetBankCards", in, out, opts...) if err != nil { return nil, err } @@ -473,7 +388,7 @@ func (c *memberServiceClient) GetBankCards(ctx context.Context, in *MemberIdRequ func (c *memberServiceClient) AddBankCard(ctx context.Context, in *BankCardAddRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AddBankCard_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AddBankCard", in, out, opts...) if err != nil { return nil, err } @@ -482,7 +397,7 @@ func (c *memberServiceClient) AddBankCard(ctx context.Context, in *BankCardAddRe func (c *memberServiceClient) RemoveBankCard(ctx context.Context, in *BankCardRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_RemoveBankCard_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/RemoveBankCard", in, out, opts...) if err != nil { return nil, err } @@ -491,7 +406,7 @@ func (c *memberServiceClient) RemoveBankCard(ctx context.Context, in *BankCardRe func (c *memberServiceClient) Active(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Active_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Active", in, out, opts...) if err != nil { return nil, err } @@ -500,7 +415,7 @@ func (c *memberServiceClient) Active(ctx context.Context, in *MemberIdRequest, o func (c *memberServiceClient) Lock(ctx context.Context, in *LockRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Lock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Lock", in, out, opts...) if err != nil { return nil, err } @@ -509,7 +424,7 @@ func (c *memberServiceClient) Lock(ctx context.Context, in *LockRequest, opts .. func (c *memberServiceClient) Unlock(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Unlock_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Unlock", in, out, opts...) if err != nil { return nil, err } @@ -518,7 +433,7 @@ func (c *memberServiceClient) Unlock(ctx context.Context, in *MemberIdRequest, o func (c *memberServiceClient) GrantFlag(ctx context.Context, in *GrantFlagRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_GrantFlag_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GrantFlag", in, out, opts...) if err != nil { return nil, err } @@ -527,7 +442,7 @@ func (c *memberServiceClient) GrantFlag(ctx context.Context, in *GrantFlagReques func (c *memberServiceClient) Complex(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SComplexMember, error) { out := new(SComplexMember) - err := c.cc.Invoke(ctx, MemberService_Complex_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Complex", in, out, opts...) if err != nil { return nil, err } @@ -536,7 +451,7 @@ func (c *memberServiceClient) Complex(ctx context.Context, in *MemberIdRequest, func (c *memberServiceClient) SendCode(ctx context.Context, in *SendCodeRequest, opts ...grpc.CallOption) (*SendCodeResponse, error) { out := new(SendCodeResponse) - err := c.cc.Invoke(ctx, MemberService_SendCode_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SendCode", in, out, opts...) if err != nil { return nil, err } @@ -545,7 +460,7 @@ func (c *memberServiceClient) SendCode(ctx context.Context, in *SendCodeRequest, func (c *memberServiceClient) CompareCode(ctx context.Context, in *CompareCodeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_CompareCode_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CompareCode", in, out, opts...) if err != nil { return nil, err } @@ -554,7 +469,7 @@ func (c *memberServiceClient) CompareCode(ctx context.Context, in *CompareCodeRe func (c *memberServiceClient) ReceiptsCodes(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SReceiptsCodeListResponse, error) { out := new(SReceiptsCodeListResponse) - err := c.cc.Invoke(ctx, MemberService_ReceiptsCodes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ReceiptsCodes", in, out, opts...) if err != nil { return nil, err } @@ -563,7 +478,7 @@ func (c *memberServiceClient) ReceiptsCodes(ctx context.Context, in *MemberIdReq func (c *memberServiceClient) SaveReceiptsCode(ctx context.Context, in *ReceiptsCodeSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SaveReceiptsCode_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SaveReceiptsCode", in, out, opts...) if err != nil { return nil, err } @@ -572,7 +487,7 @@ func (c *memberServiceClient) SaveReceiptsCode(ctx context.Context, in *Receipts func (c *memberServiceClient) SetPayPriority(ctx context.Context, in *PayPriorityRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SetPayPriority_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SetPayPriority", in, out, opts...) if err != nil { return nil, err } @@ -581,7 +496,7 @@ func (c *memberServiceClient) SetPayPriority(ctx context.Context, in *PayPriorit func (c *memberServiceClient) CheckProfileComplete(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_CheckProfileComplete_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CheckProfileComplete", in, out, opts...) if err != nil { return nil, err } @@ -590,7 +505,7 @@ func (c *memberServiceClient) CheckProfileComplete(ctx context.Context, in *Memb func (c *memberServiceClient) MemberLevelInfo(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SMemberLevelInfo, error) { out := new(SMemberLevelInfo) - err := c.cc.Invoke(ctx, MemberService_MemberLevelInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/MemberLevelInfo", in, out, opts...) if err != nil { return nil, err } @@ -599,7 +514,7 @@ func (c *memberServiceClient) MemberLevelInfo(ctx context.Context, in *MemberIdR func (c *memberServiceClient) ChangeLevel(ctx context.Context, in *ChangeLevelRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangeLevel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangeLevel", in, out, opts...) if err != nil { return nil, err } @@ -608,7 +523,7 @@ func (c *memberServiceClient) ChangeLevel(ctx context.Context, in *ChangeLevelRe func (c *memberServiceClient) ReviewLevelUpRequest(ctx context.Context, in *LevelUpReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ReviewLevelUpRequest_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ReviewLevelUpRequest", in, out, opts...) if err != nil { return nil, err } @@ -617,7 +532,7 @@ func (c *memberServiceClient) ReviewLevelUpRequest(ctx context.Context, in *Leve func (c *memberServiceClient) ConfirmLevelUpRequest(ctx context.Context, in *LevelUpConfirmRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ConfirmLevelUpRequest_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ConfirmLevelUpRequest", in, out, opts...) if err != nil { return nil, err } @@ -626,7 +541,7 @@ func (c *memberServiceClient) ConfirmLevelUpRequest(ctx context.Context, in *Lev func (c *memberServiceClient) ChangePhone(ctx context.Context, in *ChangePhoneRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangePhone_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangePhone", in, out, opts...) if err != nil { return nil, err } @@ -635,7 +550,7 @@ func (c *memberServiceClient) ChangePhone(ctx context.Context, in *ChangePhoneRe func (c *memberServiceClient) ChangeUsername(ctx context.Context, in *ChangeUsernameRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangeUsername_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangeUsername", in, out, opts...) if err != nil { return nil, err } @@ -644,7 +559,7 @@ func (c *memberServiceClient) ChangeUsername(ctx context.Context, in *ChangeUser func (c *memberServiceClient) ChangeNickname(ctx context.Context, in *ChangeNicknameRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangeNickname_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangeNickname", in, out, opts...) if err != nil { return nil, err } @@ -653,7 +568,7 @@ func (c *memberServiceClient) ChangeNickname(ctx context.Context, in *ChangeNick func (c *memberServiceClient) ChangeHeadPortrait(ctx context.Context, in *ChangePortraitRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangeHeadPortrait_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangeHeadPortrait", in, out, opts...) if err != nil { return nil, err } @@ -662,7 +577,7 @@ func (c *memberServiceClient) ChangeHeadPortrait(ctx context.Context, in *Change func (c *memberServiceClient) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangePassword_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangePassword", in, out, opts...) if err != nil { return nil, err } @@ -671,7 +586,7 @@ func (c *memberServiceClient) ChangePassword(ctx context.Context, in *ChangePass func (c *memberServiceClient) ChangeTradePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ChangeTradePassword_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ChangeTradePassword", in, out, opts...) if err != nil { return nil, err } @@ -680,7 +595,7 @@ func (c *memberServiceClient) ChangeTradePassword(ctx context.Context, in *Chang func (c *memberServiceClient) CheckProfileCompleted(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, MemberService_CheckProfileCompleted_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CheckProfileCompleted", in, out, opts...) if err != nil { return nil, err } @@ -689,7 +604,7 @@ func (c *memberServiceClient) CheckProfileCompleted(ctx context.Context, in *Int func (c *memberServiceClient) SetInviter(ctx context.Context, in *SetInviterRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_SetInviter_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SetInviter", in, out, opts...) if err != nil { return nil, err } @@ -698,7 +613,7 @@ func (c *memberServiceClient) SetInviter(ctx context.Context, in *SetInviterRequ func (c *memberServiceClient) Premium(ctx context.Context, in *PremiumRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Premium_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Premium", in, out, opts...) if err != nil { return nil, err } @@ -707,7 +622,7 @@ func (c *memberServiceClient) Premium(ctx context.Context, in *PremiumRequest, o func (c *memberServiceClient) GetToken(ctx context.Context, in *GetTokenRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, MemberService_GetToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetToken", in, out, opts...) if err != nil { return nil, err } @@ -716,7 +631,7 @@ func (c *memberServiceClient) GetToken(ctx context.Context, in *GetTokenRequest, func (c *memberServiceClient) CheckToken(ctx context.Context, in *CheckTokenRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, MemberService_CheckToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/CheckToken", in, out, opts...) if err != nil { return nil, err } @@ -725,7 +640,7 @@ func (c *memberServiceClient) CheckToken(ctx context.Context, in *CheckTokenRequ func (c *memberServiceClient) RemoveToken(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, MemberService_RemoveToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/RemoveToken", in, out, opts...) if err != nil { return nil, err } @@ -734,7 +649,7 @@ func (c *memberServiceClient) RemoveToken(ctx context.Context, in *MemberIdReque func (c *memberServiceClient) GetAddressList(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*AddressListResponse, error) { out := new(AddressListResponse) - err := c.cc.Invoke(ctx, MemberService_GetAddressList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetAddressList", in, out, opts...) if err != nil { return nil, err } @@ -743,7 +658,7 @@ func (c *memberServiceClient) GetAddressList(ctx context.Context, in *MemberIdRe func (c *memberServiceClient) SaveAddress(ctx context.Context, in *SaveAddressRequest, opts ...grpc.CallOption) (*SaveAddressResponse, error) { out := new(SaveAddressResponse) - err := c.cc.Invoke(ctx, MemberService_SaveAddress_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/SaveAddress", in, out, opts...) if err != nil { return nil, err } @@ -752,7 +667,7 @@ func (c *memberServiceClient) SaveAddress(ctx context.Context, in *SaveAddressRe func (c *memberServiceClient) GetAddress(ctx context.Context, in *GetAddressRequest, opts ...grpc.CallOption) (*SAddress, error) { out := new(SAddress) - err := c.cc.Invoke(ctx, MemberService_GetAddress_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetAddress", in, out, opts...) if err != nil { return nil, err } @@ -761,7 +676,7 @@ func (c *memberServiceClient) GetAddress(ctx context.Context, in *GetAddressRequ func (c *memberServiceClient) DeleteAddress(ctx context.Context, in *AddressIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_DeleteAddress_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/DeleteAddress", in, out, opts...) if err != nil { return nil, err } @@ -770,7 +685,7 @@ func (c *memberServiceClient) DeleteAddress(ctx context.Context, in *AddressIdRe func (c *memberServiceClient) GetAccount(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SAccount, error) { out := new(SAccount) - err := c.cc.Invoke(ctx, MemberService_GetAccount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetAccount", in, out, opts...) if err != nil { return nil, err } @@ -779,7 +694,7 @@ func (c *memberServiceClient) GetAccount(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) IsInvitation(ctx context.Context, in *IsInvitationRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, MemberService_IsInvitation_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/IsInvitation", in, out, opts...) if err != nil { return nil, err } @@ -788,7 +703,7 @@ func (c *memberServiceClient) IsInvitation(ctx context.Context, in *IsInvitation func (c *memberServiceClient) InviterArray(ctx context.Context, in *DepthRequest, opts ...grpc.CallOption) (*InviterIdListResponse, error) { out := new(InviterIdListResponse) - err := c.cc.Invoke(ctx, MemberService_InviterArray_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/InviterArray", in, out, opts...) if err != nil { return nil, err } @@ -797,7 +712,7 @@ func (c *memberServiceClient) InviterArray(ctx context.Context, in *DepthRequest func (c *memberServiceClient) InviteMembersQuantity(ctx context.Context, in *DepthRequest, opts ...grpc.CallOption) (*Int32, error) { out := new(Int32) - err := c.cc.Invoke(ctx, MemberService_InviteMembersQuantity_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/InviteMembersQuantity", in, out, opts...) if err != nil { return nil, err } @@ -806,7 +721,7 @@ func (c *memberServiceClient) InviteMembersQuantity(ctx context.Context, in *Dep func (c *memberServiceClient) QueryInviteQuantity(ctx context.Context, in *InviteQuantityRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MemberService_QueryInviteQuantity_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/QueryInviteQuantity", in, out, opts...) if err != nil { return nil, err } @@ -815,7 +730,7 @@ func (c *memberServiceClient) QueryInviteQuantity(ctx context.Context, in *Invit func (c *memberServiceClient) QueryInviteArray(ctx context.Context, in *InviteQuantityRequest, opts ...grpc.CallOption) (*MemberIdListResponse, error) { out := new(MemberIdListResponse) - err := c.cc.Invoke(ctx, MemberService_QueryInviteArray_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/QueryInviteArray", in, out, opts...) if err != nil { return nil, err } @@ -824,7 +739,7 @@ func (c *memberServiceClient) QueryInviteArray(ctx context.Context, in *InviteQu func (c *memberServiceClient) GetMyPagedInvitationMembers(ctx context.Context, in *MemberInvitationPagingRequest, opts ...grpc.CallOption) (*MemberInvitationPagingResponse, error) { out := new(MemberInvitationPagingResponse) - err := c.cc.Invoke(ctx, MemberService_GetMyPagedInvitationMembers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetMyPagedInvitationMembers", in, out, opts...) if err != nil { return nil, err } @@ -833,7 +748,7 @@ func (c *memberServiceClient) GetMyPagedInvitationMembers(ctx context.Context, i func (c *memberServiceClient) AccountCharge(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountCharge_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountCharge", in, out, opts...) if err != nil { return nil, err } @@ -842,7 +757,7 @@ func (c *memberServiceClient) AccountCharge(ctx context.Context, in *AccountChan func (c *memberServiceClient) AccountCarryTo(ctx context.Context, in *AccountCarryRequest, opts ...grpc.CallOption) (*AccountCarryResponse, error) { out := new(AccountCarryResponse) - err := c.cc.Invoke(ctx, MemberService_AccountCarryTo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountCarryTo", in, out, opts...) if err != nil { return nil, err } @@ -851,7 +766,7 @@ func (c *memberServiceClient) AccountCarryTo(ctx context.Context, in *AccountCar func (c *memberServiceClient) AccountConsume(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountConsume_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountConsume", in, out, opts...) if err != nil { return nil, err } @@ -860,7 +775,7 @@ func (c *memberServiceClient) AccountConsume(ctx context.Context, in *AccountCha func (c *memberServiceClient) AccountDiscount(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountDiscount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountDiscount", in, out, opts...) if err != nil { return nil, err } @@ -869,7 +784,7 @@ func (c *memberServiceClient) AccountDiscount(ctx context.Context, in *AccountCh func (c *memberServiceClient) Freeze(ctx context.Context, in *AccountFreezeRequest, opts ...grpc.CallOption) (*AccountFreezeResponse, error) { out := new(AccountFreezeResponse) - err := c.cc.Invoke(ctx, MemberService_Freeze_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Freeze", in, out, opts...) if err != nil { return nil, err } @@ -878,7 +793,7 @@ func (c *memberServiceClient) Freeze(ctx context.Context, in *AccountFreezeReque func (c *memberServiceClient) Unfreeze(ctx context.Context, in *AccountUnfreezeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Unfreeze_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Unfreeze", in, out, opts...) if err != nil { return nil, err } @@ -887,7 +802,7 @@ func (c *memberServiceClient) Unfreeze(ctx context.Context, in *AccountUnfreezeR func (c *memberServiceClient) AccountRefund(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountRefund_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountRefund", in, out, opts...) if err != nil { return nil, err } @@ -896,7 +811,7 @@ func (c *memberServiceClient) AccountRefund(ctx context.Context, in *AccountChan func (c *memberServiceClient) AccountAdjust(ctx context.Context, in *AccountAdjustRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountAdjust_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountAdjust", in, out, opts...) if err != nil { return nil, err } @@ -905,7 +820,7 @@ func (c *memberServiceClient) AccountAdjust(ctx context.Context, in *AccountAdju func (c *memberServiceClient) AccountTransfer(ctx context.Context, in *AccountTransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_AccountTransfer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/AccountTransfer", in, out, opts...) if err != nil { return nil, err } @@ -914,7 +829,7 @@ func (c *memberServiceClient) AccountTransfer(ctx context.Context, in *AccountTr func (c *memberServiceClient) Withdraw(ctx context.Context, in *WithdrawRequest, opts ...grpc.CallOption) (*WithdrawalResponse, error) { out := new(WithdrawalResponse) - err := c.cc.Invoke(ctx, MemberService_Withdraw_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Withdraw", in, out, opts...) if err != nil { return nil, err } @@ -923,7 +838,7 @@ func (c *memberServiceClient) Withdraw(ctx context.Context, in *WithdrawRequest, func (c *memberServiceClient) ReviewWithdrawal(ctx context.Context, in *ReviewWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_ReviewWithdrawal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/ReviewWithdrawal", in, out, opts...) if err != nil { return nil, err } @@ -932,7 +847,7 @@ func (c *memberServiceClient) ReviewWithdrawal(ctx context.Context, in *ReviewWi func (c *memberServiceClient) FinishWithdrawal(ctx context.Context, in *FinishWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_FinishWithdrawal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/FinishWithdrawal", in, out, opts...) if err != nil { return nil, err } @@ -941,7 +856,7 @@ func (c *memberServiceClient) FinishWithdrawal(ctx context.Context, in *FinishWi func (c *memberServiceClient) QueryWithdrawalLog(ctx context.Context, in *WithdrawalLogRequest, opts ...grpc.CallOption) (*WithdrawalLogResponse, error) { out := new(WithdrawalLogResponse) - err := c.cc.Invoke(ctx, MemberService_QueryWithdrawalLog_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/QueryWithdrawalLog", in, out, opts...) if err != nil { return nil, err } @@ -950,7 +865,7 @@ func (c *memberServiceClient) QueryWithdrawalLog(ctx context.Context, in *Withdr func (c *memberServiceClient) BindOAuthApp(ctx context.Context, in *SMemberOAuthAccount, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_BindOAuthApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/BindOAuthApp", in, out, opts...) if err != nil { return nil, err } @@ -959,7 +874,7 @@ func (c *memberServiceClient) BindOAuthApp(ctx context.Context, in *SMemberOAuth func (c *memberServiceClient) UnbindOAuthApp(ctx context.Context, in *MemberOAuthRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_UnbindOAuthApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/UnbindOAuthApp", in, out, opts...) if err != nil { return nil, err } @@ -968,7 +883,7 @@ func (c *memberServiceClient) UnbindOAuthApp(ctx context.Context, in *MemberOAut func (c *memberServiceClient) GetOAuthBindInfo(ctx context.Context, in *MemberOAuthRequest, opts ...grpc.CallOption) (*SMemberOAuthAccount, error) { out := new(SMemberOAuthAccount) - err := c.cc.Invoke(ctx, MemberService_GetOAuthBindInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetOAuthBindInfo", in, out, opts...) if err != nil { return nil, err } @@ -977,7 +892,7 @@ func (c *memberServiceClient) GetOAuthBindInfo(ctx context.Context, in *MemberOA func (c *memberServiceClient) B4EAuth(ctx context.Context, in *B4EAuthRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_B4EAuth_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/B4EAuth", in, out, opts...) if err != nil { return nil, err } @@ -986,7 +901,7 @@ func (c *memberServiceClient) B4EAuth(ctx context.Context, in *B4EAuthRequest, o func (c *memberServiceClient) GetWalletLog(ctx context.Context, in *WalletLogRequest, opts ...grpc.CallOption) (*WalletLogResponse, error) { out := new(WalletLogResponse) - err := c.cc.Invoke(ctx, MemberService_GetWalletLog_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/GetWalletLog", in, out, opts...) if err != nil { return nil, err } @@ -995,7 +910,7 @@ func (c *memberServiceClient) GetWalletLog(ctx context.Context, in *WalletLogReq func (c *memberServiceClient) RemoveFavorite(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_RemoveFavorite_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/RemoveFavorite", in, out, opts...) if err != nil { return nil, err } @@ -1004,7 +919,7 @@ func (c *memberServiceClient) RemoveFavorite(ctx context.Context, in *FavoriteRe func (c *memberServiceClient) Favorite(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MemberService_Favorite_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/Favorite", in, out, opts...) if err != nil { return nil, err } @@ -1013,7 +928,7 @@ func (c *memberServiceClient) Favorite(ctx context.Context, in *FavoriteRequest, func (c *memberServiceClient) IsFavored(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, MemberService_IsFavored_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/IsFavored", in, out, opts...) if err != nil { return nil, err } @@ -1022,7 +937,7 @@ func (c *memberServiceClient) IsFavored(ctx context.Context, in *FavoriteRequest func (c *memberServiceClient) QueryCoupons(ctx context.Context, in *MemberCouponPagingRequest, opts ...grpc.CallOption) (*MemberCouponListResponse, error) { out := new(MemberCouponListResponse) - err := c.cc.Invoke(ctx, MemberService_QueryCoupons_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MemberService/QueryCoupons", in, out, opts...) if err != nil { return nil, err } @@ -1483,7 +1398,7 @@ func _MemberService_Register_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Register_FullMethodName, + FullMethod: "/MemberService/Register", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Register(ctx, req.(*RegisterMemberRequest)) @@ -1501,7 +1416,7 @@ func _MemberService_CheckLogin_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CheckLogin_FullMethodName, + FullMethod: "/MemberService/CheckLogin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckLogin(ctx, req.(*LoginRequest)) @@ -1519,7 +1434,7 @@ func _MemberService_GrantAccessToken_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GrantAccessToken_FullMethodName, + FullMethod: "/MemberService/GrantAccessToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GrantAccessToken(ctx, req.(*GrantAccessTokenRequest)) @@ -1537,7 +1452,7 @@ func _MemberService_CheckAccessToken_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CheckAccessToken_FullMethodName, + FullMethod: "/MemberService/CheckAccessToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckAccessToken(ctx, req.(*CheckAccessTokenRequest)) @@ -1555,7 +1470,7 @@ func _MemberService_VerifyTradePassword_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_VerifyTradePassword_FullMethodName, + FullMethod: "/MemberService/VerifyTradePassword", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).VerifyTradePassword(ctx, req.(*VerifyPasswordRequest)) @@ -1573,7 +1488,7 @@ func _MemberService_GetLevels_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetLevels_FullMethodName, + FullMethod: "/MemberService/GetLevels", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetLevels(ctx, req.(*Empty)) @@ -1591,7 +1506,7 @@ func _MemberService_GetTrustInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetTrustInfo_FullMethodName, + FullMethod: "/MemberService/GetTrustInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetTrustInfo(ctx, req.(*MemberIdRequest)) @@ -1609,7 +1524,7 @@ func _MemberService_SubmitTrustInfo_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SubmitTrustInfo_FullMethodName, + FullMethod: "/MemberService/SubmitTrustInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SubmitTrustInfo(ctx, req.(*SubmitTrustInfoRequest)) @@ -1627,7 +1542,7 @@ func _MemberService_ReviewTrustedInfo_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ReviewTrustedInfo_FullMethodName, + FullMethod: "/MemberService/ReviewTrustedInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewTrustedInfo(ctx, req.(*ReviewTrustInfoRequest)) @@ -1645,7 +1560,7 @@ func _MemberService_GetMemberLevel_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetMemberLevel_FullMethodName, + FullMethod: "/MemberService/GetMemberLevel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMemberLevel(ctx, req.(*Int32)) @@ -1663,7 +1578,7 @@ func _MemberService_SaveMemberLevel_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SaveMemberLevel_FullMethodName, + FullMethod: "/MemberService/SaveMemberLevel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveMemberLevel(ctx, req.(*SMemberLevel)) @@ -1681,7 +1596,7 @@ func _MemberService_GetLevelBySign_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetLevelBySign_FullMethodName, + FullMethod: "/MemberService/GetLevelBySign", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetLevelBySign(ctx, req.(*String)) @@ -1699,7 +1614,7 @@ func _MemberService_DeleteMemberLevel_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_DeleteMemberLevel_FullMethodName, + FullMethod: "/MemberService/DeleteMemberLevel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).DeleteMemberLevel(ctx, req.(*Int64)) @@ -1717,7 +1632,7 @@ func _MemberService_GetMember_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetMember_FullMethodName, + FullMethod: "/MemberService/GetMember", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMember(ctx, req.(*MemberIdRequest)) @@ -1735,7 +1650,7 @@ func _MemberService_FindMember_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_FindMember_FullMethodName, + FullMethod: "/MemberService/FindMember", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).FindMember(ctx, req.(*FindMemberRequest)) @@ -1753,7 +1668,7 @@ func _MemberService_GetProfile_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetProfile_FullMethodName, + FullMethod: "/MemberService/GetProfile", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetProfile(ctx, req.(*MemberIdRequest)) @@ -1771,7 +1686,7 @@ func _MemberService_SaveProfile_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SaveProfile_FullMethodName, + FullMethod: "/MemberService/SaveProfile", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveProfile(ctx, req.(*SProfile)) @@ -1789,7 +1704,7 @@ func _MemberService_GetInviter_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetInviter_FullMethodName, + FullMethod: "/MemberService/GetInviter", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetInviter(ctx, req.(*MemberIdRequest)) @@ -1807,7 +1722,7 @@ func _MemberService_GetInviteCount_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetInviteCount_FullMethodName, + FullMethod: "/MemberService/GetInviteCount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetInviteCount(ctx, req.(*MemberIdRequest)) @@ -1825,7 +1740,7 @@ func _MemberService_GetBankCards_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetBankCards_FullMethodName, + FullMethod: "/MemberService/GetBankCards", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetBankCards(ctx, req.(*MemberIdRequest)) @@ -1843,7 +1758,7 @@ func _MemberService_AddBankCard_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AddBankCard_FullMethodName, + FullMethod: "/MemberService/AddBankCard", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AddBankCard(ctx, req.(*BankCardAddRequest)) @@ -1861,7 +1776,7 @@ func _MemberService_RemoveBankCard_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_RemoveBankCard_FullMethodName, + FullMethod: "/MemberService/RemoveBankCard", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveBankCard(ctx, req.(*BankCardRequest)) @@ -1879,7 +1794,7 @@ func _MemberService_Active_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Active_FullMethodName, + FullMethod: "/MemberService/Active", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Active(ctx, req.(*MemberIdRequest)) @@ -1897,7 +1812,7 @@ func _MemberService_Lock_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Lock_FullMethodName, + FullMethod: "/MemberService/Lock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Lock(ctx, req.(*LockRequest)) @@ -1915,7 +1830,7 @@ func _MemberService_Unlock_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Unlock_FullMethodName, + FullMethod: "/MemberService/Unlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Unlock(ctx, req.(*MemberIdRequest)) @@ -1933,7 +1848,7 @@ func _MemberService_GrantFlag_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GrantFlag_FullMethodName, + FullMethod: "/MemberService/GrantFlag", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GrantFlag(ctx, req.(*GrantFlagRequest)) @@ -1951,7 +1866,7 @@ func _MemberService_Complex_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Complex_FullMethodName, + FullMethod: "/MemberService/Complex", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Complex(ctx, req.(*MemberIdRequest)) @@ -1969,7 +1884,7 @@ func _MemberService_SendCode_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SendCode_FullMethodName, + FullMethod: "/MemberService/SendCode", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SendCode(ctx, req.(*SendCodeRequest)) @@ -1987,7 +1902,7 @@ func _MemberService_CompareCode_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CompareCode_FullMethodName, + FullMethod: "/MemberService/CompareCode", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CompareCode(ctx, req.(*CompareCodeRequest)) @@ -2005,7 +1920,7 @@ func _MemberService_ReceiptsCodes_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ReceiptsCodes_FullMethodName, + FullMethod: "/MemberService/ReceiptsCodes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReceiptsCodes(ctx, req.(*MemberIdRequest)) @@ -2023,7 +1938,7 @@ func _MemberService_SaveReceiptsCode_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SaveReceiptsCode_FullMethodName, + FullMethod: "/MemberService/SaveReceiptsCode", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveReceiptsCode(ctx, req.(*ReceiptsCodeSaveRequest)) @@ -2041,7 +1956,7 @@ func _MemberService_SetPayPriority_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SetPayPriority_FullMethodName, + FullMethod: "/MemberService/SetPayPriority", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SetPayPriority(ctx, req.(*PayPriorityRequest)) @@ -2059,7 +1974,7 @@ func _MemberService_CheckProfileComplete_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CheckProfileComplete_FullMethodName, + FullMethod: "/MemberService/CheckProfileComplete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckProfileComplete(ctx, req.(*MemberIdRequest)) @@ -2077,7 +1992,7 @@ func _MemberService_MemberLevelInfo_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_MemberLevelInfo_FullMethodName, + FullMethod: "/MemberService/MemberLevelInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).MemberLevelInfo(ctx, req.(*MemberIdRequest)) @@ -2095,7 +2010,7 @@ func _MemberService_ChangeLevel_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangeLevel_FullMethodName, + FullMethod: "/MemberService/ChangeLevel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeLevel(ctx, req.(*ChangeLevelRequest)) @@ -2113,7 +2028,7 @@ func _MemberService_ReviewLevelUpRequest_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ReviewLevelUpRequest_FullMethodName, + FullMethod: "/MemberService/ReviewLevelUpRequest", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewLevelUpRequest(ctx, req.(*LevelUpReviewRequest)) @@ -2131,7 +2046,7 @@ func _MemberService_ConfirmLevelUpRequest_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ConfirmLevelUpRequest_FullMethodName, + FullMethod: "/MemberService/ConfirmLevelUpRequest", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ConfirmLevelUpRequest(ctx, req.(*LevelUpConfirmRequest)) @@ -2149,7 +2064,7 @@ func _MemberService_ChangePhone_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangePhone_FullMethodName, + FullMethod: "/MemberService/ChangePhone", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangePhone(ctx, req.(*ChangePhoneRequest)) @@ -2167,7 +2082,7 @@ func _MemberService_ChangeUsername_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangeUsername_FullMethodName, + FullMethod: "/MemberService/ChangeUsername", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeUsername(ctx, req.(*ChangeUsernameRequest)) @@ -2185,7 +2100,7 @@ func _MemberService_ChangeNickname_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangeNickname_FullMethodName, + FullMethod: "/MemberService/ChangeNickname", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeNickname(ctx, req.(*ChangeNicknameRequest)) @@ -2203,7 +2118,7 @@ func _MemberService_ChangeHeadPortrait_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangeHeadPortrait_FullMethodName, + FullMethod: "/MemberService/ChangeHeadPortrait", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeHeadPortrait(ctx, req.(*ChangePortraitRequest)) @@ -2221,7 +2136,7 @@ func _MemberService_ChangePassword_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangePassword_FullMethodName, + FullMethod: "/MemberService/ChangePassword", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangePassword(ctx, req.(*ChangePasswordRequest)) @@ -2239,7 +2154,7 @@ func _MemberService_ChangeTradePassword_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ChangeTradePassword_FullMethodName, + FullMethod: "/MemberService/ChangeTradePassword", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeTradePassword(ctx, req.(*ChangePasswordRequest)) @@ -2257,7 +2172,7 @@ func _MemberService_CheckProfileCompleted_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CheckProfileCompleted_FullMethodName, + FullMethod: "/MemberService/CheckProfileCompleted", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckProfileCompleted(ctx, req.(*Int64)) @@ -2275,7 +2190,7 @@ func _MemberService_SetInviter_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SetInviter_FullMethodName, + FullMethod: "/MemberService/SetInviter", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SetInviter(ctx, req.(*SetInviterRequest)) @@ -2293,7 +2208,7 @@ func _MemberService_Premium_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Premium_FullMethodName, + FullMethod: "/MemberService/Premium", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Premium(ctx, req.(*PremiumRequest)) @@ -2311,7 +2226,7 @@ func _MemberService_GetToken_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetToken_FullMethodName, + FullMethod: "/MemberService/GetToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetToken(ctx, req.(*GetTokenRequest)) @@ -2329,7 +2244,7 @@ func _MemberService_CheckToken_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_CheckToken_FullMethodName, + FullMethod: "/MemberService/CheckToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckToken(ctx, req.(*CheckTokenRequest)) @@ -2347,7 +2262,7 @@ func _MemberService_RemoveToken_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_RemoveToken_FullMethodName, + FullMethod: "/MemberService/RemoveToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveToken(ctx, req.(*MemberIdRequest)) @@ -2365,7 +2280,7 @@ func _MemberService_GetAddressList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetAddressList_FullMethodName, + FullMethod: "/MemberService/GetAddressList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAddressList(ctx, req.(*MemberIdRequest)) @@ -2383,7 +2298,7 @@ func _MemberService_SaveAddress_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_SaveAddress_FullMethodName, + FullMethod: "/MemberService/SaveAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveAddress(ctx, req.(*SaveAddressRequest)) @@ -2401,7 +2316,7 @@ func _MemberService_GetAddress_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetAddress_FullMethodName, + FullMethod: "/MemberService/GetAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAddress(ctx, req.(*GetAddressRequest)) @@ -2419,7 +2334,7 @@ func _MemberService_DeleteAddress_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_DeleteAddress_FullMethodName, + FullMethod: "/MemberService/DeleteAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).DeleteAddress(ctx, req.(*AddressIdRequest)) @@ -2437,7 +2352,7 @@ func _MemberService_GetAccount_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetAccount_FullMethodName, + FullMethod: "/MemberService/GetAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAccount(ctx, req.(*MemberIdRequest)) @@ -2455,7 +2370,7 @@ func _MemberService_IsInvitation_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_IsInvitation_FullMethodName, + FullMethod: "/MemberService/IsInvitation", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).IsInvitation(ctx, req.(*IsInvitationRequest)) @@ -2473,7 +2388,7 @@ func _MemberService_InviterArray_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_InviterArray_FullMethodName, + FullMethod: "/MemberService/InviterArray", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).InviterArray(ctx, req.(*DepthRequest)) @@ -2491,7 +2406,7 @@ func _MemberService_InviteMembersQuantity_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_InviteMembersQuantity_FullMethodName, + FullMethod: "/MemberService/InviteMembersQuantity", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).InviteMembersQuantity(ctx, req.(*DepthRequest)) @@ -2509,7 +2424,7 @@ func _MemberService_QueryInviteQuantity_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_QueryInviteQuantity_FullMethodName, + FullMethod: "/MemberService/QueryInviteQuantity", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryInviteQuantity(ctx, req.(*InviteQuantityRequest)) @@ -2527,7 +2442,7 @@ func _MemberService_QueryInviteArray_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_QueryInviteArray_FullMethodName, + FullMethod: "/MemberService/QueryInviteArray", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryInviteArray(ctx, req.(*InviteQuantityRequest)) @@ -2545,7 +2460,7 @@ func _MemberService_GetMyPagedInvitationMembers_Handler(srv interface{}, ctx con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetMyPagedInvitationMembers_FullMethodName, + FullMethod: "/MemberService/GetMyPagedInvitationMembers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMyPagedInvitationMembers(ctx, req.(*MemberInvitationPagingRequest)) @@ -2563,7 +2478,7 @@ func _MemberService_AccountCharge_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountCharge_FullMethodName, + FullMethod: "/MemberService/AccountCharge", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountCharge(ctx, req.(*AccountChangeRequest)) @@ -2581,7 +2496,7 @@ func _MemberService_AccountCarryTo_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountCarryTo_FullMethodName, + FullMethod: "/MemberService/AccountCarryTo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountCarryTo(ctx, req.(*AccountCarryRequest)) @@ -2599,7 +2514,7 @@ func _MemberService_AccountConsume_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountConsume_FullMethodName, + FullMethod: "/MemberService/AccountConsume", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountConsume(ctx, req.(*AccountChangeRequest)) @@ -2617,7 +2532,7 @@ func _MemberService_AccountDiscount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountDiscount_FullMethodName, + FullMethod: "/MemberService/AccountDiscount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountDiscount(ctx, req.(*AccountChangeRequest)) @@ -2635,7 +2550,7 @@ func _MemberService_Freeze_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Freeze_FullMethodName, + FullMethod: "/MemberService/Freeze", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Freeze(ctx, req.(*AccountFreezeRequest)) @@ -2653,7 +2568,7 @@ func _MemberService_Unfreeze_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Unfreeze_FullMethodName, + FullMethod: "/MemberService/Unfreeze", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Unfreeze(ctx, req.(*AccountUnfreezeRequest)) @@ -2671,7 +2586,7 @@ func _MemberService_AccountRefund_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountRefund_FullMethodName, + FullMethod: "/MemberService/AccountRefund", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountRefund(ctx, req.(*AccountChangeRequest)) @@ -2689,7 +2604,7 @@ func _MemberService_AccountAdjust_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountAdjust_FullMethodName, + FullMethod: "/MemberService/AccountAdjust", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountAdjust(ctx, req.(*AccountAdjustRequest)) @@ -2707,7 +2622,7 @@ func _MemberService_AccountTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_AccountTransfer_FullMethodName, + FullMethod: "/MemberService/AccountTransfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountTransfer(ctx, req.(*AccountTransferRequest)) @@ -2725,7 +2640,7 @@ func _MemberService_Withdraw_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Withdraw_FullMethodName, + FullMethod: "/MemberService/Withdraw", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Withdraw(ctx, req.(*WithdrawRequest)) @@ -2743,7 +2658,7 @@ func _MemberService_ReviewWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_ReviewWithdrawal_FullMethodName, + FullMethod: "/MemberService/ReviewWithdrawal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewWithdrawal(ctx, req.(*ReviewWithdrawalRequest)) @@ -2761,7 +2676,7 @@ func _MemberService_FinishWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_FinishWithdrawal_FullMethodName, + FullMethod: "/MemberService/FinishWithdrawal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).FinishWithdrawal(ctx, req.(*FinishWithdrawalRequest)) @@ -2779,7 +2694,7 @@ func _MemberService_QueryWithdrawalLog_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_QueryWithdrawalLog_FullMethodName, + FullMethod: "/MemberService/QueryWithdrawalLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryWithdrawalLog(ctx, req.(*WithdrawalLogRequest)) @@ -2797,7 +2712,7 @@ func _MemberService_BindOAuthApp_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_BindOAuthApp_FullMethodName, + FullMethod: "/MemberService/BindOAuthApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).BindOAuthApp(ctx, req.(*SMemberOAuthAccount)) @@ -2815,7 +2730,7 @@ func _MemberService_UnbindOAuthApp_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_UnbindOAuthApp_FullMethodName, + FullMethod: "/MemberService/UnbindOAuthApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).UnbindOAuthApp(ctx, req.(*MemberOAuthRequest)) @@ -2833,7 +2748,7 @@ func _MemberService_GetOAuthBindInfo_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetOAuthBindInfo_FullMethodName, + FullMethod: "/MemberService/GetOAuthBindInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetOAuthBindInfo(ctx, req.(*MemberOAuthRequest)) @@ -2851,7 +2766,7 @@ func _MemberService_B4EAuth_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_B4EAuth_FullMethodName, + FullMethod: "/MemberService/B4EAuth", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).B4EAuth(ctx, req.(*B4EAuthRequest)) @@ -2869,7 +2784,7 @@ func _MemberService_GetWalletLog_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_GetWalletLog_FullMethodName, + FullMethod: "/MemberService/GetWalletLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetWalletLog(ctx, req.(*WalletLogRequest)) @@ -2887,7 +2802,7 @@ func _MemberService_RemoveFavorite_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_RemoveFavorite_FullMethodName, + FullMethod: "/MemberService/RemoveFavorite", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveFavorite(ctx, req.(*FavoriteRequest)) @@ -2905,7 +2820,7 @@ func _MemberService_Favorite_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_Favorite_FullMethodName, + FullMethod: "/MemberService/Favorite", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Favorite(ctx, req.(*FavoriteRequest)) @@ -2923,7 +2838,7 @@ func _MemberService_IsFavored_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_IsFavored_FullMethodName, + FullMethod: "/MemberService/IsFavored", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).IsFavored(ctx, req.(*FavoriteRequest)) @@ -2941,7 +2856,7 @@ func _MemberService_QueryCoupons_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MemberService_QueryCoupons_FullMethodName, + FullMethod: "/MemberService/QueryCoupons", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryCoupons(ctx, req.(*MemberCouponPagingRequest)) diff --git a/core/service/proto/merchant_dto.pb.go b/core/service/proto/merchant_dto.pb.go index 04b372d48..b70cd924a 100644 --- a/core/service/proto/merchant_dto.pb.go +++ b/core/service/proto/merchant_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/merchant_dto.proto package proto diff --git a/core/service/proto/merchant_service.pb.go b/core/service/proto/merchant_service.pb.go index 25d7ff349..d032125c4 100644 --- a/core/service/proto/merchant_service.pb.go +++ b/core/service/proto/merchant_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: merchant_service.proto package proto diff --git a/core/service/proto/merchant_service_grpc.pb.go b/core/service/proto/merchant_service_grpc.pb.go index e2a35ede0..333955cc8 100644 --- a/core/service/proto/merchant_service_grpc.pb.go +++ b/core/service/proto/merchant_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: merchant_service.proto package proto @@ -18,51 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - MerchantService_GetMerchant_FullMethodName = "/MerchantService/GetMerchant" - MerchantService_CreateMerchant_FullMethodName = "/MerchantService/CreateMerchant" - MerchantService_SaveMerchant_FullMethodName = "/MerchantService/SaveMerchant" - MerchantService_CheckLogin_FullMethodName = "/MerchantService/CheckLogin" - MerchantService_Stat_FullMethodName = "/MerchantService/Stat" - MerchantService_SyncWholesaleItem_FullMethodName = "/MerchantService/SyncWholesaleItem" - MerchantService_GetAllTradeConf__FullMethodName = "/MerchantService/GetAllTradeConf_" - MerchantService_GetTradeConf_FullMethodName = "/MerchantService/GetTradeConf" - MerchantService_SaveTradeConf_FullMethodName = "/MerchantService/SaveTradeConf" - MerchantService_CreateSignUpToken_FullMethodName = "/MerchantService/CreateSignUpToken" - MerchantService_GetMemberFromSignUpToken_FullMethodName = "/MerchantService/GetMemberFromSignUpToken" - MerchantService_SignUp_FullMethodName = "/MerchantService/SignUp" - MerchantService_GetMchSignUpId_FullMethodName = "/MerchantService/GetMchSignUpId" - MerchantService_GetSignUp_FullMethodName = "/MerchantService/GetSignUp" - MerchantService_ReviewSignUp_FullMethodName = "/MerchantService/ReviewSignUp" - MerchantService_RemoveMerchantSignUp_FullMethodName = "/MerchantService/RemoveMerchantSignUp" - MerchantService_GetMerchantIdByMember_FullMethodName = "/MerchantService/GetMerchantIdByMember" - MerchantService_ChangeMemberBind_FullMethodName = "/MerchantService/ChangeMemberBind" - MerchantService_GetEnterpriseInfo_FullMethodName = "/MerchantService/GetEnterpriseInfo" - MerchantService_SaveEnterpriseInfo_FullMethodName = "/MerchantService/SaveEnterpriseInfo" - MerchantService_ReviewEnterpriseInfo_FullMethodName = "/MerchantService/ReviewEnterpriseInfo" - MerchantService_GetAccount_FullMethodName = "/MerchantService/GetAccount" - MerchantService_SetEnabled_FullMethodName = "/MerchantService/SetEnabled" - MerchantService_GetMerchantIdByHost_FullMethodName = "/MerchantService/GetMerchantIdByHost" - MerchantService_GetMerchantMajorHost_FullMethodName = "/MerchantService/GetMerchantMajorHost" - MerchantService_SaveSaleConf_FullMethodName = "/MerchantService/SaveSaleConf" - MerchantService_GetSaleConf_FullMethodName = "/MerchantService/GetSaleConf" - MerchantService_GetShopId_FullMethodName = "/MerchantService/GetShopId" - MerchantService_ChangePassword_FullMethodName = "/MerchantService/ChangePassword" - MerchantService_GetApiInfo_FullMethodName = "/MerchantService/GetApiInfo" - MerchantService_ToggleApiPerm_FullMethodName = "/MerchantService/ToggleApiPerm" - MerchantService_GetMerchantIdByApiId_FullMethodName = "/MerchantService/GetMerchantIdByApiId" - MerchantService_PagedNormalOrderOfVendor_FullMethodName = "/MerchantService/PagedNormalOrderOfVendor" - MerchantService_PagedWholesaleOrderOfVendor_FullMethodName = "/MerchantService/PagedWholesaleOrderOfVendor" - MerchantService_PagedTradeOrderOfVendor_FullMethodName = "/MerchantService/PagedTradeOrderOfVendor" - MerchantService_WithdrawToMemberAccount_FullMethodName = "/MerchantService/WithdrawToMemberAccount" - MerchantService_ChargeAccount_FullMethodName = "/MerchantService/ChargeAccount" - MerchantService_GetMchBuyerGroup__FullMethodName = "/MerchantService/GetMchBuyerGroup_" - MerchantService_SaveMchBuyerGroup_FullMethodName = "/MerchantService/SaveMchBuyerGroup" - MerchantService_GetBuyerGroups_FullMethodName = "/MerchantService/GetBuyerGroups" - MerchantService_GetRebateRate_FullMethodName = "/MerchantService/GetRebateRate" - MerchantService_SaveGroupRebateRate_FullMethodName = "/MerchantService/SaveGroupRebateRate" -) - // MerchantServiceClient is the client API for MerchantService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -160,7 +115,7 @@ func NewMerchantServiceClient(cc grpc.ClientConnInterface) MerchantServiceClient func (c *merchantServiceClient) GetMerchant(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMerchant, error) { out := new(SMerchant) - err := c.cc.Invoke(ctx, MerchantService_GetMerchant_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMerchant", in, out, opts...) if err != nil { return nil, err } @@ -169,7 +124,7 @@ func (c *merchantServiceClient) GetMerchant(ctx context.Context, in *Int64, opts func (c *merchantServiceClient) CreateMerchant(ctx context.Context, in *MerchantCreateRequest, opts ...grpc.CallOption) (*MerchantCreateResponse, error) { out := new(MerchantCreateResponse) - err := c.cc.Invoke(ctx, MerchantService_CreateMerchant_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/CreateMerchant", in, out, opts...) if err != nil { return nil, err } @@ -178,7 +133,7 @@ func (c *merchantServiceClient) CreateMerchant(ctx context.Context, in *Merchant func (c *merchantServiceClient) SaveMerchant(ctx context.Context, in *SaveMerchantRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveMerchant_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveMerchant", in, out, opts...) if err != nil { return nil, err } @@ -187,7 +142,7 @@ func (c *merchantServiceClient) SaveMerchant(ctx context.Context, in *SaveMercha func (c *merchantServiceClient) CheckLogin(ctx context.Context, in *MchUserPwdRequest, opts ...grpc.CallOption) (*MchLoginResponse, error) { out := new(MchLoginResponse) - err := c.cc.Invoke(ctx, MerchantService_CheckLogin_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/CheckLogin", in, out, opts...) if err != nil { return nil, err } @@ -196,7 +151,7 @@ func (c *merchantServiceClient) CheckLogin(ctx context.Context, in *MchUserPwdRe func (c *merchantServiceClient) Stat(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_Stat_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/Stat", in, out, opts...) if err != nil { return nil, err } @@ -205,7 +160,7 @@ func (c *merchantServiceClient) Stat(ctx context.Context, in *Int64, opts ...grp func (c *merchantServiceClient) SyncWholesaleItem(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SyncWSItemsResponse, error) { out := new(SyncWSItemsResponse) - err := c.cc.Invoke(ctx, MerchantService_SyncWholesaleItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SyncWholesaleItem", in, out, opts...) if err != nil { return nil, err } @@ -214,7 +169,7 @@ func (c *merchantServiceClient) SyncWholesaleItem(ctx context.Context, in *Int64 func (c *merchantServiceClient) GetAllTradeConf_(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*STradeConfListResponse, error) { out := new(STradeConfListResponse) - err := c.cc.Invoke(ctx, MerchantService_GetAllTradeConf__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetAllTradeConf_", in, out, opts...) if err != nil { return nil, err } @@ -223,7 +178,7 @@ func (c *merchantServiceClient) GetAllTradeConf_(ctx context.Context, in *Int64, func (c *merchantServiceClient) GetTradeConf(ctx context.Context, in *TradeConfRequest, opts ...grpc.CallOption) (*STradeConf_, error) { out := new(STradeConf_) - err := c.cc.Invoke(ctx, MerchantService_GetTradeConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetTradeConf", in, out, opts...) if err != nil { return nil, err } @@ -232,7 +187,7 @@ func (c *merchantServiceClient) GetTradeConf(ctx context.Context, in *TradeConfR func (c *merchantServiceClient) SaveTradeConf(ctx context.Context, in *TradeConfSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveTradeConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveTradeConf", in, out, opts...) if err != nil { return nil, err } @@ -241,7 +196,7 @@ func (c *merchantServiceClient) SaveTradeConf(ctx context.Context, in *TradeConf func (c *merchantServiceClient) CreateSignUpToken(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, MerchantService_CreateSignUpToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/CreateSignUpToken", in, out, opts...) if err != nil { return nil, err } @@ -250,7 +205,7 @@ func (c *merchantServiceClient) CreateSignUpToken(ctx context.Context, in *Membe func (c *merchantServiceClient) GetMemberFromSignUpToken(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetMemberFromSignUpToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMemberFromSignUpToken", in, out, opts...) if err != nil { return nil, err } @@ -259,7 +214,7 @@ func (c *merchantServiceClient) GetMemberFromSignUpToken(ctx context.Context, in func (c *merchantServiceClient) SignUp(ctx context.Context, in *SMchSignUp, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SignUp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SignUp", in, out, opts...) if err != nil { return nil, err } @@ -268,7 +223,7 @@ func (c *merchantServiceClient) SignUp(ctx context.Context, in *SMchSignUp, opts func (c *merchantServiceClient) GetMchSignUpId(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetMchSignUpId_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMchSignUpId", in, out, opts...) if err != nil { return nil, err } @@ -277,7 +232,7 @@ func (c *merchantServiceClient) GetMchSignUpId(ctx context.Context, in *MemberId func (c *merchantServiceClient) GetSignUp(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMchSignUp, error) { out := new(SMchSignUp) - err := c.cc.Invoke(ctx, MerchantService_GetSignUp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetSignUp", in, out, opts...) if err != nil { return nil, err } @@ -286,7 +241,7 @@ func (c *merchantServiceClient) GetSignUp(ctx context.Context, in *Int64, opts . func (c *merchantServiceClient) ReviewSignUp(ctx context.Context, in *MchReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ReviewSignUp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ReviewSignUp", in, out, opts...) if err != nil { return nil, err } @@ -295,7 +250,7 @@ func (c *merchantServiceClient) ReviewSignUp(ctx context.Context, in *MchReviewR func (c *merchantServiceClient) RemoveMerchantSignUp(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_RemoveMerchantSignUp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/RemoveMerchantSignUp", in, out, opts...) if err != nil { return nil, err } @@ -304,7 +259,7 @@ func (c *merchantServiceClient) RemoveMerchantSignUp(ctx context.Context, in *Me func (c *merchantServiceClient) GetMerchantIdByMember(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByMember_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByMember", in, out, opts...) if err != nil { return nil, err } @@ -313,7 +268,7 @@ func (c *merchantServiceClient) GetMerchantIdByMember(ctx context.Context, in *M func (c *merchantServiceClient) ChangeMemberBind(ctx context.Context, in *ChangeMemberBindRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ChangeMemberBind_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ChangeMemberBind", in, out, opts...) if err != nil { return nil, err } @@ -322,7 +277,7 @@ func (c *merchantServiceClient) ChangeMemberBind(ctx context.Context, in *Change func (c *merchantServiceClient) GetEnterpriseInfo(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SEnterpriseInfo, error) { out := new(SEnterpriseInfo) - err := c.cc.Invoke(ctx, MerchantService_GetEnterpriseInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetEnterpriseInfo", in, out, opts...) if err != nil { return nil, err } @@ -331,7 +286,7 @@ func (c *merchantServiceClient) GetEnterpriseInfo(ctx context.Context, in *Merch func (c *merchantServiceClient) SaveEnterpriseInfo(ctx context.Context, in *SaveEnterpriseRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveEnterpriseInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveEnterpriseInfo", in, out, opts...) if err != nil { return nil, err } @@ -340,7 +295,7 @@ func (c *merchantServiceClient) SaveEnterpriseInfo(ctx context.Context, in *Save func (c *merchantServiceClient) ReviewEnterpriseInfo(ctx context.Context, in *MchReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ReviewEnterpriseInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ReviewEnterpriseInfo", in, out, opts...) if err != nil { return nil, err } @@ -349,7 +304,7 @@ func (c *merchantServiceClient) ReviewEnterpriseInfo(ctx context.Context, in *Mc func (c *merchantServiceClient) GetAccount(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantAccount, error) { out := new(SMerchantAccount) - err := c.cc.Invoke(ctx, MerchantService_GetAccount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetAccount", in, out, opts...) if err != nil { return nil, err } @@ -358,7 +313,7 @@ func (c *merchantServiceClient) GetAccount(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) SetEnabled(ctx context.Context, in *MerchantDisableRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SetEnabled_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SetEnabled", in, out, opts...) if err != nil { return nil, err } @@ -367,7 +322,7 @@ func (c *merchantServiceClient) SetEnabled(ctx context.Context, in *MerchantDisa func (c *merchantServiceClient) GetMerchantIdByHost(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByHost_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByHost", in, out, opts...) if err != nil { return nil, err } @@ -376,7 +331,7 @@ func (c *merchantServiceClient) GetMerchantIdByHost(ctx context.Context, in *Str func (c *merchantServiceClient) GetMerchantMajorHost(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, MerchantService_GetMerchantMajorHost_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantMajorHost", in, out, opts...) if err != nil { return nil, err } @@ -385,7 +340,7 @@ func (c *merchantServiceClient) GetMerchantMajorHost(ctx context.Context, in *Me func (c *merchantServiceClient) SaveSaleConf(ctx context.Context, in *SaveMerchantSaleConfRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveSaleConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveSaleConf", in, out, opts...) if err != nil { return nil, err } @@ -394,7 +349,7 @@ func (c *merchantServiceClient) SaveSaleConf(ctx context.Context, in *SaveMercha func (c *merchantServiceClient) GetSaleConf(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantSaleConf, error) { out := new(SMerchantSaleConf) - err := c.cc.Invoke(ctx, MerchantService_GetSaleConf_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetSaleConf", in, out, opts...) if err != nil { return nil, err } @@ -403,7 +358,7 @@ func (c *merchantServiceClient) GetSaleConf(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) GetShopId(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetShopId_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetShopId", in, out, opts...) if err != nil { return nil, err } @@ -412,7 +367,7 @@ func (c *merchantServiceClient) GetShopId(ctx context.Context, in *MerchantId, o func (c *merchantServiceClient) ChangePassword(ctx context.Context, in *ModifyMerchantPasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ChangePassword_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ChangePassword", in, out, opts...) if err != nil { return nil, err } @@ -421,7 +376,7 @@ func (c *merchantServiceClient) ChangePassword(ctx context.Context, in *ModifyMe func (c *merchantServiceClient) GetApiInfo(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantApiInfo, error) { out := new(SMerchantApiInfo) - err := c.cc.Invoke(ctx, MerchantService_GetApiInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetApiInfo", in, out, opts...) if err != nil { return nil, err } @@ -430,7 +385,7 @@ func (c *merchantServiceClient) GetApiInfo(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) ToggleApiPerm(ctx context.Context, in *MerchantApiPermRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ToggleApiPerm_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ToggleApiPerm", in, out, opts...) if err != nil { return nil, err } @@ -439,7 +394,7 @@ func (c *merchantServiceClient) ToggleApiPerm(ctx context.Context, in *MerchantA func (c *merchantServiceClient) GetMerchantIdByApiId(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByApiId_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByApiId", in, out, opts...) if err != nil { return nil, err } @@ -448,7 +403,7 @@ func (c *merchantServiceClient) GetMerchantIdByApiId(ctx context.Context, in *St func (c *merchantServiceClient) PagedNormalOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, MerchantService_PagedNormalOrderOfVendor_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/PagedNormalOrderOfVendor", in, out, opts...) if err != nil { return nil, err } @@ -457,7 +412,7 @@ func (c *merchantServiceClient) PagedNormalOrderOfVendor(ctx context.Context, in func (c *merchantServiceClient) PagedWholesaleOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, MerchantService_PagedWholesaleOrderOfVendor_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/PagedWholesaleOrderOfVendor", in, out, opts...) if err != nil { return nil, err } @@ -466,7 +421,7 @@ func (c *merchantServiceClient) PagedWholesaleOrderOfVendor(ctx context.Context, func (c *merchantServiceClient) PagedTradeOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, MerchantService_PagedTradeOrderOfVendor_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/PagedTradeOrderOfVendor", in, out, opts...) if err != nil { return nil, err } @@ -475,7 +430,7 @@ func (c *merchantServiceClient) PagedTradeOrderOfVendor(ctx context.Context, in func (c *merchantServiceClient) WithdrawToMemberAccount(ctx context.Context, in *WithdrawToMemberAccountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_WithdrawToMemberAccount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/WithdrawToMemberAccount", in, out, opts...) if err != nil { return nil, err } @@ -484,7 +439,7 @@ func (c *merchantServiceClient) WithdrawToMemberAccount(ctx context.Context, in func (c *merchantServiceClient) ChargeAccount(ctx context.Context, in *MerchantChargeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_ChargeAccount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/ChargeAccount", in, out, opts...) if err != nil { return nil, err } @@ -493,7 +448,7 @@ func (c *merchantServiceClient) ChargeAccount(ctx context.Context, in *MerchantC func (c *merchantServiceClient) GetMchBuyerGroup_(ctx context.Context, in *MerchantBuyerGroupId, opts ...grpc.CallOption) (*SMerchantBuyerGroup, error) { out := new(SMerchantBuyerGroup) - err := c.cc.Invoke(ctx, MerchantService_GetMchBuyerGroup__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetMchBuyerGroup_", in, out, opts...) if err != nil { return nil, err } @@ -502,7 +457,7 @@ func (c *merchantServiceClient) GetMchBuyerGroup_(ctx context.Context, in *Merch func (c *merchantServiceClient) SaveMchBuyerGroup(ctx context.Context, in *SaveMerchantBuyerGroupRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveMchBuyerGroup_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveMchBuyerGroup", in, out, opts...) if err != nil { return nil, err } @@ -511,7 +466,7 @@ func (c *merchantServiceClient) SaveMchBuyerGroup(ctx context.Context, in *SaveM func (c *merchantServiceClient) GetBuyerGroups(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*MerchantBuyerGroupListResponse, error) { out := new(MerchantBuyerGroupListResponse) - err := c.cc.Invoke(ctx, MerchantService_GetBuyerGroups_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetBuyerGroups", in, out, opts...) if err != nil { return nil, err } @@ -520,7 +475,7 @@ func (c *merchantServiceClient) GetBuyerGroups(ctx context.Context, in *Merchant func (c *merchantServiceClient) GetRebateRate(ctx context.Context, in *MerchantBuyerGroupId, opts ...grpc.CallOption) (*WholesaleRebateRateListResponse, error) { out := new(WholesaleRebateRateListResponse) - err := c.cc.Invoke(ctx, MerchantService_GetRebateRate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/GetRebateRate", in, out, opts...) if err != nil { return nil, err } @@ -529,7 +484,7 @@ func (c *merchantServiceClient) GetRebateRate(ctx context.Context, in *MerchantB func (c *merchantServiceClient) SaveGroupRebateRate(ctx context.Context, in *SaveWholesaleRebateRateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MerchantService_SaveGroupRebateRate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MerchantService/SaveGroupRebateRate", in, out, opts...) if err != nil { return nil, err } @@ -777,7 +732,7 @@ func _MerchantService_GetMerchant_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMerchant_FullMethodName, + FullMethod: "/MerchantService/GetMerchant", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchant(ctx, req.(*Int64)) @@ -795,7 +750,7 @@ func _MerchantService_CreateMerchant_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_CreateMerchant_FullMethodName, + FullMethod: "/MerchantService/CreateMerchant", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CreateMerchant(ctx, req.(*MerchantCreateRequest)) @@ -813,7 +768,7 @@ func _MerchantService_SaveMerchant_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveMerchant_FullMethodName, + FullMethod: "/MerchantService/SaveMerchant", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveMerchant(ctx, req.(*SaveMerchantRequest)) @@ -831,7 +786,7 @@ func _MerchantService_CheckLogin_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_CheckLogin_FullMethodName, + FullMethod: "/MerchantService/CheckLogin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CheckLogin(ctx, req.(*MchUserPwdRequest)) @@ -849,7 +804,7 @@ func _MerchantService_Stat_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_Stat_FullMethodName, + FullMethod: "/MerchantService/Stat", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).Stat(ctx, req.(*Int64)) @@ -867,7 +822,7 @@ func _MerchantService_SyncWholesaleItem_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SyncWholesaleItem_FullMethodName, + FullMethod: "/MerchantService/SyncWholesaleItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SyncWholesaleItem(ctx, req.(*Int64)) @@ -885,7 +840,7 @@ func _MerchantService_GetAllTradeConf__Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetAllTradeConf__FullMethodName, + FullMethod: "/MerchantService/GetAllTradeConf_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetAllTradeConf_(ctx, req.(*Int64)) @@ -903,7 +858,7 @@ func _MerchantService_GetTradeConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetTradeConf_FullMethodName, + FullMethod: "/MerchantService/GetTradeConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetTradeConf(ctx, req.(*TradeConfRequest)) @@ -921,7 +876,7 @@ func _MerchantService_SaveTradeConf_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveTradeConf_FullMethodName, + FullMethod: "/MerchantService/SaveTradeConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveTradeConf(ctx, req.(*TradeConfSaveRequest)) @@ -939,7 +894,7 @@ func _MerchantService_CreateSignUpToken_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_CreateSignUpToken_FullMethodName, + FullMethod: "/MerchantService/CreateSignUpToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CreateSignUpToken(ctx, req.(*MemberId)) @@ -957,7 +912,7 @@ func _MerchantService_GetMemberFromSignUpToken_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMemberFromSignUpToken_FullMethodName, + FullMethod: "/MerchantService/GetMemberFromSignUpToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMemberFromSignUpToken(ctx, req.(*String)) @@ -975,7 +930,7 @@ func _MerchantService_SignUp_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SignUp_FullMethodName, + FullMethod: "/MerchantService/SignUp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SignUp(ctx, req.(*SMchSignUp)) @@ -993,7 +948,7 @@ func _MerchantService_GetMchSignUpId_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMchSignUpId_FullMethodName, + FullMethod: "/MerchantService/GetMchSignUpId", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMchSignUpId(ctx, req.(*MemberId)) @@ -1011,7 +966,7 @@ func _MerchantService_GetSignUp_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetSignUp_FullMethodName, + FullMethod: "/MerchantService/GetSignUp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetSignUp(ctx, req.(*Int64)) @@ -1029,7 +984,7 @@ func _MerchantService_ReviewSignUp_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ReviewSignUp_FullMethodName, + FullMethod: "/MerchantService/ReviewSignUp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ReviewSignUp(ctx, req.(*MchReviewRequest)) @@ -1047,7 +1002,7 @@ func _MerchantService_RemoveMerchantSignUp_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_RemoveMerchantSignUp_FullMethodName, + FullMethod: "/MerchantService/RemoveMerchantSignUp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).RemoveMerchantSignUp(ctx, req.(*MemberId)) @@ -1065,7 +1020,7 @@ func _MerchantService_GetMerchantIdByMember_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMerchantIdByMember_FullMethodName, + FullMethod: "/MerchantService/GetMerchantIdByMember", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByMember(ctx, req.(*MemberId)) @@ -1083,7 +1038,7 @@ func _MerchantService_ChangeMemberBind_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ChangeMemberBind_FullMethodName, + FullMethod: "/MerchantService/ChangeMemberBind", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChangeMemberBind(ctx, req.(*ChangeMemberBindRequest)) @@ -1101,7 +1056,7 @@ func _MerchantService_GetEnterpriseInfo_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetEnterpriseInfo_FullMethodName, + FullMethod: "/MerchantService/GetEnterpriseInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetEnterpriseInfo(ctx, req.(*MerchantId)) @@ -1119,7 +1074,7 @@ func _MerchantService_SaveEnterpriseInfo_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveEnterpriseInfo_FullMethodName, + FullMethod: "/MerchantService/SaveEnterpriseInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveEnterpriseInfo(ctx, req.(*SaveEnterpriseRequest)) @@ -1137,7 +1092,7 @@ func _MerchantService_ReviewEnterpriseInfo_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ReviewEnterpriseInfo_FullMethodName, + FullMethod: "/MerchantService/ReviewEnterpriseInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ReviewEnterpriseInfo(ctx, req.(*MchReviewRequest)) @@ -1155,7 +1110,7 @@ func _MerchantService_GetAccount_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetAccount_FullMethodName, + FullMethod: "/MerchantService/GetAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetAccount(ctx, req.(*MerchantId)) @@ -1173,7 +1128,7 @@ func _MerchantService_SetEnabled_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SetEnabled_FullMethodName, + FullMethod: "/MerchantService/SetEnabled", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SetEnabled(ctx, req.(*MerchantDisableRequest)) @@ -1191,7 +1146,7 @@ func _MerchantService_GetMerchantIdByHost_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMerchantIdByHost_FullMethodName, + FullMethod: "/MerchantService/GetMerchantIdByHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByHost(ctx, req.(*String)) @@ -1209,7 +1164,7 @@ func _MerchantService_GetMerchantMajorHost_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMerchantMajorHost_FullMethodName, + FullMethod: "/MerchantService/GetMerchantMajorHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantMajorHost(ctx, req.(*MerchantId)) @@ -1227,7 +1182,7 @@ func _MerchantService_SaveSaleConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveSaleConf_FullMethodName, + FullMethod: "/MerchantService/SaveSaleConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveSaleConf(ctx, req.(*SaveMerchantSaleConfRequest)) @@ -1245,7 +1200,7 @@ func _MerchantService_GetSaleConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetSaleConf_FullMethodName, + FullMethod: "/MerchantService/GetSaleConf", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetSaleConf(ctx, req.(*MerchantId)) @@ -1263,7 +1218,7 @@ func _MerchantService_GetShopId_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetShopId_FullMethodName, + FullMethod: "/MerchantService/GetShopId", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetShopId(ctx, req.(*MerchantId)) @@ -1281,7 +1236,7 @@ func _MerchantService_ChangePassword_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ChangePassword_FullMethodName, + FullMethod: "/MerchantService/ChangePassword", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChangePassword(ctx, req.(*ModifyMerchantPasswordRequest)) @@ -1299,7 +1254,7 @@ func _MerchantService_GetApiInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetApiInfo_FullMethodName, + FullMethod: "/MerchantService/GetApiInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetApiInfo(ctx, req.(*MerchantId)) @@ -1317,7 +1272,7 @@ func _MerchantService_ToggleApiPerm_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ToggleApiPerm_FullMethodName, + FullMethod: "/MerchantService/ToggleApiPerm", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ToggleApiPerm(ctx, req.(*MerchantApiPermRequest)) @@ -1335,7 +1290,7 @@ func _MerchantService_GetMerchantIdByApiId_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMerchantIdByApiId_FullMethodName, + FullMethod: "/MerchantService/GetMerchantIdByApiId", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByApiId(ctx, req.(*String)) @@ -1353,7 +1308,7 @@ func _MerchantService_PagedNormalOrderOfVendor_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_PagedNormalOrderOfVendor_FullMethodName, + FullMethod: "/MerchantService/PagedNormalOrderOfVendor", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedNormalOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1371,7 +1326,7 @@ func _MerchantService_PagedWholesaleOrderOfVendor_Handler(srv interface{}, ctx c } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_PagedWholesaleOrderOfVendor_FullMethodName, + FullMethod: "/MerchantService/PagedWholesaleOrderOfVendor", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedWholesaleOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1389,7 +1344,7 @@ func _MerchantService_PagedTradeOrderOfVendor_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_PagedTradeOrderOfVendor_FullMethodName, + FullMethod: "/MerchantService/PagedTradeOrderOfVendor", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedTradeOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1407,7 +1362,7 @@ func _MerchantService_WithdrawToMemberAccount_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_WithdrawToMemberAccount_FullMethodName, + FullMethod: "/MerchantService/WithdrawToMemberAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).WithdrawToMemberAccount(ctx, req.(*WithdrawToMemberAccountRequest)) @@ -1425,7 +1380,7 @@ func _MerchantService_ChargeAccount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_ChargeAccount_FullMethodName, + FullMethod: "/MerchantService/ChargeAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChargeAccount(ctx, req.(*MerchantChargeRequest)) @@ -1443,7 +1398,7 @@ func _MerchantService_GetMchBuyerGroup__Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetMchBuyerGroup__FullMethodName, + FullMethod: "/MerchantService/GetMchBuyerGroup_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMchBuyerGroup_(ctx, req.(*MerchantBuyerGroupId)) @@ -1461,7 +1416,7 @@ func _MerchantService_SaveMchBuyerGroup_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveMchBuyerGroup_FullMethodName, + FullMethod: "/MerchantService/SaveMchBuyerGroup", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveMchBuyerGroup(ctx, req.(*SaveMerchantBuyerGroupRequest)) @@ -1479,7 +1434,7 @@ func _MerchantService_GetBuyerGroups_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetBuyerGroups_FullMethodName, + FullMethod: "/MerchantService/GetBuyerGroups", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetBuyerGroups(ctx, req.(*MerchantId)) @@ -1497,7 +1452,7 @@ func _MerchantService_GetRebateRate_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_GetRebateRate_FullMethodName, + FullMethod: "/MerchantService/GetRebateRate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetRebateRate(ctx, req.(*MerchantBuyerGroupId)) @@ -1515,7 +1470,7 @@ func _MerchantService_SaveGroupRebateRate_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MerchantService_SaveGroupRebateRate_FullMethodName, + FullMethod: "/MerchantService/SaveGroupRebateRate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveGroupRebateRate(ctx, req.(*SaveWholesaleRebateRateRequest)) diff --git a/core/service/proto/message_dto.pb.go b/core/service/proto/message_dto.pb.go index 6fe2da18a..40e8447fc 100644 --- a/core/service/proto/message_dto.pb.go +++ b/core/service/proto/message_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/message_dto.proto package proto diff --git a/core/service/proto/message_service.pb.go b/core/service/proto/message_service.pb.go index da5d6cf89..0d5be53b7 100644 --- a/core/service/proto/message_service.pb.go +++ b/core/service/proto/message_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message_service.proto package proto diff --git a/core/service/proto/message_service_grpc.pb.go b/core/service/proto/message_service_grpc.pb.go index b8279eec0..b653e9d8a 100644 --- a/core/service/proto/message_service_grpc.pb.go +++ b/core/service/proto/message_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: message_service.proto package proto @@ -18,18 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - MessageService_GetNotifyItem_FullMethodName = "/MessageService/GetNotifyItem" - MessageService_SendPhoneMessage_FullMethodName = "/MessageService/SendPhoneMessage" - MessageService_GetAllNotifyItem_FullMethodName = "/MessageService/GetAllNotifyItem" - MessageService_SaveNotifyItem_FullMethodName = "/MessageService/SaveNotifyItem" - MessageService_GetMailTemplate_FullMethodName = "/MessageService/GetMailTemplate" - MessageService_SaveMailTemplate_FullMethodName = "/MessageService/SaveMailTemplate" - MessageService_GetMailTemplates_FullMethodName = "/MessageService/GetMailTemplates" - MessageService_DeleteMailTemplate_FullMethodName = "/MessageService/DeleteMailTemplate" - MessageService_SendSiteMessage_FullMethodName = "/MessageService/SendSiteMessage" -) - // MessageServiceClient is the client API for MessageService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -68,7 +56,7 @@ func NewMessageServiceClient(cc grpc.ClientConnInterface) MessageServiceClient { func (c *messageServiceClient) GetNotifyItem(ctx context.Context, in *String, opts ...grpc.CallOption) (*SNotifyItem, error) { out := new(SNotifyItem) - err := c.cc.Invoke(ctx, MessageService_GetNotifyItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/GetNotifyItem", in, out, opts...) if err != nil { return nil, err } @@ -77,7 +65,7 @@ func (c *messageServiceClient) GetNotifyItem(ctx context.Context, in *String, op func (c *messageServiceClient) SendPhoneMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MessageService_SendPhoneMessage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/SendPhoneMessage", in, out, opts...) if err != nil { return nil, err } @@ -86,7 +74,7 @@ func (c *messageServiceClient) SendPhoneMessage(ctx context.Context, in *SendMes func (c *messageServiceClient) GetAllNotifyItem(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*NotifyItemListResponse, error) { out := new(NotifyItemListResponse) - err := c.cc.Invoke(ctx, MessageService_GetAllNotifyItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/GetAllNotifyItem", in, out, opts...) if err != nil { return nil, err } @@ -95,7 +83,7 @@ func (c *messageServiceClient) GetAllNotifyItem(ctx context.Context, in *Empty, func (c *messageServiceClient) SaveNotifyItem(ctx context.Context, in *SNotifyItem, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MessageService_SaveNotifyItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/SaveNotifyItem", in, out, opts...) if err != nil { return nil, err } @@ -104,7 +92,7 @@ func (c *messageServiceClient) SaveNotifyItem(ctx context.Context, in *SNotifyIt func (c *messageServiceClient) GetMailTemplate(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMailTemplate, error) { out := new(SMailTemplate) - err := c.cc.Invoke(ctx, MessageService_GetMailTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/GetMailTemplate", in, out, opts...) if err != nil { return nil, err } @@ -113,7 +101,7 @@ func (c *messageServiceClient) GetMailTemplate(ctx context.Context, in *Int64, o func (c *messageServiceClient) SaveMailTemplate(ctx context.Context, in *SMailTemplate, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MessageService_SaveMailTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/SaveMailTemplate", in, out, opts...) if err != nil { return nil, err } @@ -122,7 +110,7 @@ func (c *messageServiceClient) SaveMailTemplate(ctx context.Context, in *SMailTe func (c *messageServiceClient) GetMailTemplates(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*MailTemplateListResponse, error) { out := new(MailTemplateListResponse) - err := c.cc.Invoke(ctx, MessageService_GetMailTemplates_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/GetMailTemplates", in, out, opts...) if err != nil { return nil, err } @@ -131,7 +119,7 @@ func (c *messageServiceClient) GetMailTemplates(ctx context.Context, in *Empty, func (c *messageServiceClient) DeleteMailTemplate(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MessageService_DeleteMailTemplate_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/DeleteMailTemplate", in, out, opts...) if err != nil { return nil, err } @@ -140,7 +128,7 @@ func (c *messageServiceClient) DeleteMailTemplate(ctx context.Context, in *Int64 func (c *messageServiceClient) SendSiteMessage(ctx context.Context, in *SendSiteMessageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, MessageService_SendSiteMessage_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/MessageService/SendSiteMessage", in, out, opts...) if err != nil { return nil, err } @@ -230,7 +218,7 @@ func _MessageService_GetNotifyItem_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_GetNotifyItem_FullMethodName, + FullMethod: "/MessageService/GetNotifyItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetNotifyItem(ctx, req.(*String)) @@ -248,7 +236,7 @@ func _MessageService_SendPhoneMessage_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_SendPhoneMessage_FullMethodName, + FullMethod: "/MessageService/SendPhoneMessage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SendPhoneMessage(ctx, req.(*SendMessageRequest)) @@ -266,7 +254,7 @@ func _MessageService_GetAllNotifyItem_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_GetAllNotifyItem_FullMethodName, + FullMethod: "/MessageService/GetAllNotifyItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetAllNotifyItem(ctx, req.(*Empty)) @@ -284,7 +272,7 @@ func _MessageService_SaveNotifyItem_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_SaveNotifyItem_FullMethodName, + FullMethod: "/MessageService/SaveNotifyItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SaveNotifyItem(ctx, req.(*SNotifyItem)) @@ -302,7 +290,7 @@ func _MessageService_GetMailTemplate_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_GetMailTemplate_FullMethodName, + FullMethod: "/MessageService/GetMailTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetMailTemplate(ctx, req.(*Int64)) @@ -320,7 +308,7 @@ func _MessageService_SaveMailTemplate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_SaveMailTemplate_FullMethodName, + FullMethod: "/MessageService/SaveMailTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SaveMailTemplate(ctx, req.(*SMailTemplate)) @@ -338,7 +326,7 @@ func _MessageService_GetMailTemplates_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_GetMailTemplates_FullMethodName, + FullMethod: "/MessageService/GetMailTemplates", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetMailTemplates(ctx, req.(*Empty)) @@ -356,7 +344,7 @@ func _MessageService_DeleteMailTemplate_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_DeleteMailTemplate_FullMethodName, + FullMethod: "/MessageService/DeleteMailTemplate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).DeleteMailTemplate(ctx, req.(*Int64)) @@ -374,7 +362,7 @@ func _MessageService_SendSiteMessage_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: MessageService_SendSiteMessage_FullMethodName, + FullMethod: "/MessageService/SendSiteMessage", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SendSiteMessage(ctx, req.(*SendSiteMessageRequest)) diff --git a/core/service/proto/order_dto.pb.go b/core/service/proto/order_dto.pb.go index 455b36547..e65efd2a7 100644 --- a/core/service/proto/order_dto.pb.go +++ b/core/service/proto/order_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/order_dto.proto package proto diff --git a/core/service/proto/order_service.pb.go b/core/service/proto/order_service.pb.go index f5cb17618..1d71bc7d7 100644 --- a/core/service/proto/order_service.pb.go +++ b/core/service/proto/order_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: order_service.proto package proto diff --git a/core/service/proto/order_service_grpc.pb.go b/core/service/proto/order_service_grpc.pb.go index 781dea93f..ba9c099a3 100644 --- a/core/service/proto/order_service_grpc.pb.go +++ b/core/service/proto/order_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: order_service.proto package proto @@ -18,25 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - OrderService_SubmitOrder_FullMethodName = "/OrderService/SubmitOrder" - OrderService_PrepareOrder_FullMethodName = "/OrderService/PrepareOrder" - OrderService_GetParentOrder_FullMethodName = "/OrderService/GetParentOrder" - OrderService_GetOrder_FullMethodName = "/OrderService/GetOrder" - OrderService_TradeOrderCashPay_FullMethodName = "/OrderService/TradeOrderCashPay" - OrderService_TradeOrderUpdateTicket_FullMethodName = "/OrderService/TradeOrderUpdateTicket" - OrderService_PrepareOrderWithCoupon__FullMethodName = "/OrderService/PrepareOrderWithCoupon_" - OrderService_CancelOrder_FullMethodName = "/OrderService/CancelOrder" - OrderService_ConfirmOrder_FullMethodName = "/OrderService/ConfirmOrder" - OrderService_ChangeShipmentAddress_FullMethodName = "/OrderService/ChangeShipmentAddress" - OrderService_PickUp_FullMethodName = "/OrderService/PickUp" - OrderService_Ship_FullMethodName = "/OrderService/Ship" - OrderService_BuyerReceived_FullMethodName = "/OrderService/BuyerReceived" - OrderService_Forbid_FullMethodName = "/OrderService/forbid" - OrderService_LogBytes_FullMethodName = "/OrderService/LogBytes" - OrderService_QueryRebateListList_FullMethodName = "/OrderService/QueryRebateListList" -) - // OrderServiceClient is the client API for OrderService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -49,14 +30,6 @@ type OrderServiceClient interface { GetParentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SParentOrder, error) // 获取子订单,orderId GetOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SSingleOrder, error) - // 获取订单和商品项信息 - // rpc GetOrderAndItems (GetOrderItemsRequest) returns (SSingleOrder) { - // } - // 根据订单号获取子订单,orderNo - // rpc GetSubOrderByNo (String) returns (SSingleOrder) {} - // 获取订单商品项,subOrderId - // rpc GetSubOrderItems (Int64) returns (ComplexItemsResponse) { - // }~ // 交易单现金支付,orderId TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) // 上传交易单发票 @@ -93,7 +66,7 @@ func NewOrderServiceClient(cc grpc.ClientConnInterface) OrderServiceClient { func (c *orderServiceClient) SubmitOrder(ctx context.Context, in *SubmitOrderRequest, opts ...grpc.CallOption) (*OrderSubmitResponse, error) { out := new(OrderSubmitResponse) - err := c.cc.Invoke(ctx, OrderService_SubmitOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/SubmitOrder", in, out, opts...) if err != nil { return nil, err } @@ -102,7 +75,7 @@ func (c *orderServiceClient) SubmitOrder(ctx context.Context, in *SubmitOrderReq func (c *orderServiceClient) PrepareOrder(ctx context.Context, in *PrepareOrderRequest, opts ...grpc.CallOption) (*PrepareOrderResponse, error) { out := new(PrepareOrderResponse) - err := c.cc.Invoke(ctx, OrderService_PrepareOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/PrepareOrder", in, out, opts...) if err != nil { return nil, err } @@ -111,7 +84,7 @@ func (c *orderServiceClient) PrepareOrder(ctx context.Context, in *PrepareOrderR func (c *orderServiceClient) GetParentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SParentOrder, error) { out := new(SParentOrder) - err := c.cc.Invoke(ctx, OrderService_GetParentOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/GetParentOrder", in, out, opts...) if err != nil { return nil, err } @@ -120,7 +93,7 @@ func (c *orderServiceClient) GetParentOrder(ctx context.Context, in *OrderNoV2, func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SSingleOrder, error) { out := new(SSingleOrder) - err := c.cc.Invoke(ctx, OrderService_GetOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/GetOrder", in, out, opts...) if err != nil { return nil, err } @@ -129,7 +102,7 @@ func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderNoV2, opts . func (c *orderServiceClient) TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_TradeOrderCashPay_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/TradeOrderCashPay", in, out, opts...) if err != nil { return nil, err } @@ -138,7 +111,7 @@ func (c *orderServiceClient) TradeOrderCashPay(ctx context.Context, in *Int64, o func (c *orderServiceClient) TradeOrderUpdateTicket(ctx context.Context, in *TradeOrderTicketRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_TradeOrderUpdateTicket_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/TradeOrderUpdateTicket", in, out, opts...) if err != nil { return nil, err } @@ -147,7 +120,7 @@ func (c *orderServiceClient) TradeOrderUpdateTicket(ctx context.Context, in *Tra func (c *orderServiceClient) PrepareOrderWithCoupon_(ctx context.Context, in *PrepareOrderRequest, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, OrderService_PrepareOrderWithCoupon__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/PrepareOrderWithCoupon_", in, out, opts...) if err != nil { return nil, err } @@ -156,7 +129,7 @@ func (c *orderServiceClient) PrepareOrderWithCoupon_(ctx context.Context, in *Pr func (c *orderServiceClient) CancelOrder(ctx context.Context, in *CancelOrderRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_CancelOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/CancelOrder", in, out, opts...) if err != nil { return nil, err } @@ -165,7 +138,7 @@ func (c *orderServiceClient) CancelOrder(ctx context.Context, in *CancelOrderReq func (c *orderServiceClient) ConfirmOrder(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_ConfirmOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/ConfirmOrder", in, out, opts...) if err != nil { return nil, err } @@ -174,7 +147,7 @@ func (c *orderServiceClient) ConfirmOrder(ctx context.Context, in *OrderNo, opts func (c *orderServiceClient) ChangeShipmentAddress(ctx context.Context, in *ChangeOrderAddressRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_ChangeShipmentAddress_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/ChangeShipmentAddress", in, out, opts...) if err != nil { return nil, err } @@ -183,7 +156,7 @@ func (c *orderServiceClient) ChangeShipmentAddress(ctx context.Context, in *Chan func (c *orderServiceClient) PickUp(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_PickUp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/PickUp", in, out, opts...) if err != nil { return nil, err } @@ -192,7 +165,7 @@ func (c *orderServiceClient) PickUp(ctx context.Context, in *OrderNo, opts ...gr func (c *orderServiceClient) Ship(ctx context.Context, in *OrderShipmentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_Ship_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/Ship", in, out, opts...) if err != nil { return nil, err } @@ -201,7 +174,7 @@ func (c *orderServiceClient) Ship(ctx context.Context, in *OrderShipmentRequest, func (c *orderServiceClient) BuyerReceived(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_BuyerReceived_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/BuyerReceived", in, out, opts...) if err != nil { return nil, err } @@ -210,7 +183,7 @@ func (c *orderServiceClient) BuyerReceived(ctx context.Context, in *OrderNo, opt func (c *orderServiceClient) Forbid(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, OrderService_Forbid_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/forbid", in, out, opts...) if err != nil { return nil, err } @@ -219,7 +192,7 @@ func (c *orderServiceClient) Forbid(ctx context.Context, in *OrderNo, opts ...gr func (c *orderServiceClient) LogBytes(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, OrderService_LogBytes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/LogBytes", in, out, opts...) if err != nil { return nil, err } @@ -228,7 +201,7 @@ func (c *orderServiceClient) LogBytes(ctx context.Context, in *OrderNo, opts ... func (c *orderServiceClient) QueryRebateListList(ctx context.Context, in *QueryRebateListRequest, opts ...grpc.CallOption) (*QueryRebateListResponse, error) { out := new(QueryRebateListResponse) - err := c.cc.Invoke(ctx, OrderService_QueryRebateListList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/OrderService/QueryRebateListList", in, out, opts...) if err != nil { return nil, err } @@ -247,14 +220,6 @@ type OrderServiceServer interface { GetParentOrder(context.Context, *OrderNoV2) (*SParentOrder, error) // 获取子订单,orderId GetOrder(context.Context, *OrderNoV2) (*SSingleOrder, error) - // 获取订单和商品项信息 - // rpc GetOrderAndItems (GetOrderItemsRequest) returns (SSingleOrder) { - // } - // 根据订单号获取子订单,orderNo - // rpc GetSubOrderByNo (String) returns (SSingleOrder) {} - // 获取订单商品项,subOrderId - // rpc GetSubOrderItems (Int64) returns (ComplexItemsResponse) { - // }~ // 交易单现金支付,orderId TradeOrderCashPay(context.Context, *Int64) (*Result, error) // 上传交易单发票 @@ -357,7 +322,7 @@ func _OrderService_SubmitOrder_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_SubmitOrder_FullMethodName, + FullMethod: "/OrderService/SubmitOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).SubmitOrder(ctx, req.(*SubmitOrderRequest)) @@ -375,7 +340,7 @@ func _OrderService_PrepareOrder_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_PrepareOrder_FullMethodName, + FullMethod: "/OrderService/PrepareOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PrepareOrder(ctx, req.(*PrepareOrderRequest)) @@ -393,7 +358,7 @@ func _OrderService_GetParentOrder_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_GetParentOrder_FullMethodName, + FullMethod: "/OrderService/GetParentOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).GetParentOrder(ctx, req.(*OrderNoV2)) @@ -411,7 +376,7 @@ func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_GetOrder_FullMethodName, + FullMethod: "/OrderService/GetOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).GetOrder(ctx, req.(*OrderNoV2)) @@ -429,7 +394,7 @@ func _OrderService_TradeOrderCashPay_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_TradeOrderCashPay_FullMethodName, + FullMethod: "/OrderService/TradeOrderCashPay", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).TradeOrderCashPay(ctx, req.(*Int64)) @@ -447,7 +412,7 @@ func _OrderService_TradeOrderUpdateTicket_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_TradeOrderUpdateTicket_FullMethodName, + FullMethod: "/OrderService/TradeOrderUpdateTicket", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).TradeOrderUpdateTicket(ctx, req.(*TradeOrderTicketRequest)) @@ -465,7 +430,7 @@ func _OrderService_PrepareOrderWithCoupon__Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_PrepareOrderWithCoupon__FullMethodName, + FullMethod: "/OrderService/PrepareOrderWithCoupon_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PrepareOrderWithCoupon_(ctx, req.(*PrepareOrderRequest)) @@ -483,7 +448,7 @@ func _OrderService_CancelOrder_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_CancelOrder_FullMethodName, + FullMethod: "/OrderService/CancelOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).CancelOrder(ctx, req.(*CancelOrderRequest)) @@ -501,7 +466,7 @@ func _OrderService_ConfirmOrder_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_ConfirmOrder_FullMethodName, + FullMethod: "/OrderService/ConfirmOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).ConfirmOrder(ctx, req.(*OrderNo)) @@ -519,7 +484,7 @@ func _OrderService_ChangeShipmentAddress_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_ChangeShipmentAddress_FullMethodName, + FullMethod: "/OrderService/ChangeShipmentAddress", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).ChangeShipmentAddress(ctx, req.(*ChangeOrderAddressRequest)) @@ -537,7 +502,7 @@ func _OrderService_PickUp_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_PickUp_FullMethodName, + FullMethod: "/OrderService/PickUp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PickUp(ctx, req.(*OrderNo)) @@ -555,7 +520,7 @@ func _OrderService_Ship_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_Ship_FullMethodName, + FullMethod: "/OrderService/Ship", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).Ship(ctx, req.(*OrderShipmentRequest)) @@ -573,7 +538,7 @@ func _OrderService_BuyerReceived_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_BuyerReceived_FullMethodName, + FullMethod: "/OrderService/BuyerReceived", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).BuyerReceived(ctx, req.(*OrderNo)) @@ -591,7 +556,7 @@ func _OrderService_Forbid_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_Forbid_FullMethodName, + FullMethod: "/OrderService/forbid", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).Forbid(ctx, req.(*OrderNo)) @@ -609,7 +574,7 @@ func _OrderService_LogBytes_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_LogBytes_FullMethodName, + FullMethod: "/OrderService/LogBytes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).LogBytes(ctx, req.(*OrderNo)) @@ -627,7 +592,7 @@ func _OrderService_QueryRebateListList_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OrderService_QueryRebateListList_FullMethodName, + FullMethod: "/OrderService/QueryRebateListList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).QueryRebateListList(ctx, req.(*QueryRebateListRequest)) diff --git a/core/service/proto/payment_dto.pb.go b/core/service/proto/payment_dto.pb.go index 3ffd55ec7..f55269c1c 100644 --- a/core/service/proto/payment_dto.pb.go +++ b/core/service/proto/payment_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/payment_dto.proto package proto diff --git a/core/service/proto/payment_service.pb.go b/core/service/proto/payment_service.pb.go index 1e2d7d813..02134a904 100644 --- a/core/service/proto/payment_service.pb.go +++ b/core/service/proto/payment_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: payment_service.proto package proto diff --git a/core/service/proto/payment_service_grpc.pb.go b/core/service/proto/payment_service_grpc.pb.go index 8dd13c82f..196c70106 100644 --- a/core/service/proto/payment_service_grpc.pb.go +++ b/core/service/proto/payment_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: payment_service.proto package proto @@ -18,25 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - PaymentService_SubmitPaymentOrder_FullMethodName = "/PaymentService/SubmitPaymentOrder" - PaymentService_GetPaymentOrder_FullMethodName = "/PaymentService/GetPaymentOrder" - PaymentService_AdjustOrder_FullMethodName = "/PaymentService/AdjustOrder" - PaymentService_DiscountByBalance_FullMethodName = "/PaymentService/DiscountByBalance" - PaymentService_DiscountByIntegral_FullMethodName = "/PaymentService/DiscountByIntegral" - PaymentService_PaymentByWallet_FullMethodName = "/PaymentService/PaymentByWallet" - PaymentService_HybridPayment_FullMethodName = "/PaymentService/HybridPayment" - PaymentService_FinishPayment_FullMethodName = "/PaymentService/FinishPayment" - PaymentService_GatewayV1_FullMethodName = "/PaymentService/GatewayV1" - PaymentService_GetPreparePaymentInfo_FullMethodName = "/PaymentService/GetPreparePaymentInfo" - PaymentService_GatewayV2_FullMethodName = "/PaymentService/GatewayV2" - PaymentService_MixedPayment_FullMethodName = "/PaymentService/MixedPayment" - PaymentService_SaveIntegrateApp_FullMethodName = "/PaymentService/SaveIntegrateApp" - PaymentService_QueryIntegrateAppList_FullMethodName = "/PaymentService/QueryIntegrateAppList" - PaymentService_PrepareIntegrateParams_FullMethodName = "/PaymentService/PrepareIntegrateParams" - PaymentService_DeleteIntegrateApp_FullMethodName = "/PaymentService/DeleteIntegrateApp" -) - // PaymentServiceClient is the client API for PaymentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -91,7 +72,7 @@ func NewPaymentServiceClient(cc grpc.ClientConnInterface) PaymentServiceClient { func (c *paymentServiceClient) SubmitPaymentOrder(ctx context.Context, in *SPaymentOrder, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_SubmitPaymentOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/SubmitPaymentOrder", in, out, opts...) if err != nil { return nil, err } @@ -100,7 +81,7 @@ func (c *paymentServiceClient) SubmitPaymentOrder(ctx context.Context, in *SPaym func (c *paymentServiceClient) GetPaymentOrder(ctx context.Context, in *PaymentOrderRequest, opts ...grpc.CallOption) (*SPaymentOrder, error) { out := new(SPaymentOrder) - err := c.cc.Invoke(ctx, PaymentService_GetPaymentOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/GetPaymentOrder", in, out, opts...) if err != nil { return nil, err } @@ -109,7 +90,7 @@ func (c *paymentServiceClient) GetPaymentOrder(ctx context.Context, in *PaymentO func (c *paymentServiceClient) AdjustOrder(ctx context.Context, in *AdjustOrderRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_AdjustOrder_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/AdjustOrder", in, out, opts...) if err != nil { return nil, err } @@ -118,7 +99,7 @@ func (c *paymentServiceClient) AdjustOrder(ctx context.Context, in *AdjustOrderR func (c *paymentServiceClient) DiscountByBalance(ctx context.Context, in *DiscountBalanceRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_DiscountByBalance_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/DiscountByBalance", in, out, opts...) if err != nil { return nil, err } @@ -127,7 +108,7 @@ func (c *paymentServiceClient) DiscountByBalance(ctx context.Context, in *Discou func (c *paymentServiceClient) DiscountByIntegral(ctx context.Context, in *DiscountIntegralRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_DiscountByIntegral_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/DiscountByIntegral", in, out, opts...) if err != nil { return nil, err } @@ -136,7 +117,7 @@ func (c *paymentServiceClient) DiscountByIntegral(ctx context.Context, in *Disco func (c *paymentServiceClient) PaymentByWallet(ctx context.Context, in *WalletPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_PaymentByWallet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/PaymentByWallet", in, out, opts...) if err != nil { return nil, err } @@ -145,7 +126,7 @@ func (c *paymentServiceClient) PaymentByWallet(ctx context.Context, in *WalletPa func (c *paymentServiceClient) HybridPayment(ctx context.Context, in *HyperPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_HybridPayment_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/HybridPayment", in, out, opts...) if err != nil { return nil, err } @@ -154,7 +135,7 @@ func (c *paymentServiceClient) HybridPayment(ctx context.Context, in *HyperPayme func (c *paymentServiceClient) FinishPayment(ctx context.Context, in *FinishPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_FinishPayment_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/FinishPayment", in, out, opts...) if err != nil { return nil, err } @@ -163,7 +144,7 @@ func (c *paymentServiceClient) FinishPayment(ctx context.Context, in *FinishPaym func (c *paymentServiceClient) GatewayV1(ctx context.Context, in *PayGatewayRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_GatewayV1_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/GatewayV1", in, out, opts...) if err != nil { return nil, err } @@ -172,7 +153,7 @@ func (c *paymentServiceClient) GatewayV1(ctx context.Context, in *PayGatewayRequ func (c *paymentServiceClient) GetPreparePaymentInfo(ctx context.Context, in *OrderInfoRequest, opts ...grpc.CallOption) (*SPrepareTradeData, error) { out := new(SPrepareTradeData) - err := c.cc.Invoke(ctx, PaymentService_GetPreparePaymentInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/GetPreparePaymentInfo", in, out, opts...) if err != nil { return nil, err } @@ -181,7 +162,7 @@ func (c *paymentServiceClient) GetPreparePaymentInfo(ctx context.Context, in *Or func (c *paymentServiceClient) GatewayV2(ctx context.Context, in *PayGatewayV2Request, opts ...grpc.CallOption) (*PayGatewayResponse, error) { out := new(PayGatewayResponse) - err := c.cc.Invoke(ctx, PaymentService_GatewayV2_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/GatewayV2", in, out, opts...) if err != nil { return nil, err } @@ -190,7 +171,7 @@ func (c *paymentServiceClient) GatewayV2(ctx context.Context, in *PayGatewayV2Re func (c *paymentServiceClient) MixedPayment(ctx context.Context, in *MixedPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_MixedPayment_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/MixedPayment", in, out, opts...) if err != nil { return nil, err } @@ -199,7 +180,7 @@ func (c *paymentServiceClient) MixedPayment(ctx context.Context, in *MixedPaymen func (c *paymentServiceClient) SaveIntegrateApp(ctx context.Context, in *SIntegrateApp, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_SaveIntegrateApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/SaveIntegrateApp", in, out, opts...) if err != nil { return nil, err } @@ -208,7 +189,7 @@ func (c *paymentServiceClient) SaveIntegrateApp(ctx context.Context, in *SIntegr func (c *paymentServiceClient) QueryIntegrateAppList(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*QueryIntegrateAppResponse, error) { out := new(QueryIntegrateAppResponse) - err := c.cc.Invoke(ctx, PaymentService_QueryIntegrateAppList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/QueryIntegrateAppList", in, out, opts...) if err != nil { return nil, err } @@ -217,7 +198,7 @@ func (c *paymentServiceClient) QueryIntegrateAppList(ctx context.Context, in *Em func (c *paymentServiceClient) PrepareIntegrateParams(ctx context.Context, in *IntegrateParamsRequest, opts ...grpc.CallOption) (*IntegrateParamsResponse, error) { out := new(IntegrateParamsResponse) - err := c.cc.Invoke(ctx, PaymentService_PrepareIntegrateParams_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/PrepareIntegrateParams", in, out, opts...) if err != nil { return nil, err } @@ -226,7 +207,7 @@ func (c *paymentServiceClient) PrepareIntegrateParams(ctx context.Context, in *I func (c *paymentServiceClient) DeleteIntegrateApp(ctx context.Context, in *PayIntegrateAppId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PaymentService_DeleteIntegrateApp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PaymentService/DeleteIntegrateApp", in, out, opts...) if err != nil { return nil, err } @@ -353,7 +334,7 @@ func _PaymentService_SubmitPaymentOrder_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_SubmitPaymentOrder_FullMethodName, + FullMethod: "/PaymentService/SubmitPaymentOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).SubmitPaymentOrder(ctx, req.(*SPaymentOrder)) @@ -371,7 +352,7 @@ func _PaymentService_GetPaymentOrder_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_GetPaymentOrder_FullMethodName, + FullMethod: "/PaymentService/GetPaymentOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GetPaymentOrder(ctx, req.(*PaymentOrderRequest)) @@ -389,7 +370,7 @@ func _PaymentService_AdjustOrder_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_AdjustOrder_FullMethodName, + FullMethod: "/PaymentService/AdjustOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).AdjustOrder(ctx, req.(*AdjustOrderRequest)) @@ -407,7 +388,7 @@ func _PaymentService_DiscountByBalance_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_DiscountByBalance_FullMethodName, + FullMethod: "/PaymentService/DiscountByBalance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DiscountByBalance(ctx, req.(*DiscountBalanceRequest)) @@ -425,7 +406,7 @@ func _PaymentService_DiscountByIntegral_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_DiscountByIntegral_FullMethodName, + FullMethod: "/PaymentService/DiscountByIntegral", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DiscountByIntegral(ctx, req.(*DiscountIntegralRequest)) @@ -443,7 +424,7 @@ func _PaymentService_PaymentByWallet_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_PaymentByWallet_FullMethodName, + FullMethod: "/PaymentService/PaymentByWallet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).PaymentByWallet(ctx, req.(*WalletPaymentRequest)) @@ -461,7 +442,7 @@ func _PaymentService_HybridPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_HybridPayment_FullMethodName, + FullMethod: "/PaymentService/HybridPayment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).HybridPayment(ctx, req.(*HyperPaymentRequest)) @@ -479,7 +460,7 @@ func _PaymentService_FinishPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_FinishPayment_FullMethodName, + FullMethod: "/PaymentService/FinishPayment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).FinishPayment(ctx, req.(*FinishPaymentRequest)) @@ -497,7 +478,7 @@ func _PaymentService_GatewayV1_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_GatewayV1_FullMethodName, + FullMethod: "/PaymentService/GatewayV1", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GatewayV1(ctx, req.(*PayGatewayRequest)) @@ -515,7 +496,7 @@ func _PaymentService_GetPreparePaymentInfo_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_GetPreparePaymentInfo_FullMethodName, + FullMethod: "/PaymentService/GetPreparePaymentInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GetPreparePaymentInfo(ctx, req.(*OrderInfoRequest)) @@ -533,7 +514,7 @@ func _PaymentService_GatewayV2_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_GatewayV2_FullMethodName, + FullMethod: "/PaymentService/GatewayV2", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GatewayV2(ctx, req.(*PayGatewayV2Request)) @@ -551,7 +532,7 @@ func _PaymentService_MixedPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_MixedPayment_FullMethodName, + FullMethod: "/PaymentService/MixedPayment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).MixedPayment(ctx, req.(*MixedPaymentRequest)) @@ -569,7 +550,7 @@ func _PaymentService_SaveIntegrateApp_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_SaveIntegrateApp_FullMethodName, + FullMethod: "/PaymentService/SaveIntegrateApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).SaveIntegrateApp(ctx, req.(*SIntegrateApp)) @@ -587,7 +568,7 @@ func _PaymentService_QueryIntegrateAppList_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_QueryIntegrateAppList_FullMethodName, + FullMethod: "/PaymentService/QueryIntegrateAppList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).QueryIntegrateAppList(ctx, req.(*Empty)) @@ -605,7 +586,7 @@ func _PaymentService_PrepareIntegrateParams_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_PrepareIntegrateParams_FullMethodName, + FullMethod: "/PaymentService/PrepareIntegrateParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).PrepareIntegrateParams(ctx, req.(*IntegrateParamsRequest)) @@ -623,7 +604,7 @@ func _PaymentService_DeleteIntegrateApp_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PaymentService_DeleteIntegrateApp_FullMethodName, + FullMethod: "/PaymentService/DeleteIntegrateApp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DeleteIntegrateApp(ctx, req.(*PayIntegrateAppId)) diff --git a/core/service/proto/portal_service.pb.go b/core/service/proto/portal_service.pb.go index 5333c5927..98cb78b03 100644 --- a/core/service/proto/portal_service.pb.go +++ b/core/service/proto/portal_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: portal_service.proto package proto diff --git a/core/service/proto/portal_service_grpc.pb.go b/core/service/proto/portal_service_grpc.pb.go index 92ccebaf7..490c12d38 100644 --- a/core/service/proto/portal_service_grpc.pb.go +++ b/core/service/proto/portal_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: portal_service.proto package proto @@ -18,20 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - PortalService_SaveNav_FullMethodName = "/PortalService/SaveNav" - PortalService_GetNav_FullMethodName = "/PortalService/GetNav" - PortalService_QueryNavList_FullMethodName = "/PortalService/QueryNavList" - PortalService_DeleteNav_FullMethodName = "/PortalService/DeleteNav" - PortalService_SaveNavGroup_FullMethodName = "/PortalService/SaveNavGroup" - PortalService_QueryNavGroupList_FullMethodName = "/PortalService/QueryNavGroupList" - PortalService_DeleteNavGroup_FullMethodName = "/PortalService/DeleteNavGroup" - PortalService_SaveSearchWord_FullMethodName = "/PortalService/SaveSearchWord" - PortalService_GetSearchWord_FullMethodName = "/PortalService/GetSearchWord" - PortalService_QuerySearchWordList_FullMethodName = "/PortalService/QuerySearchWordList" - PortalService_DeleteSearchWord_FullMethodName = "/PortalService/DeleteSearchWord" -) - // PortalServiceClient is the client API for PortalService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -70,7 +56,7 @@ func NewPortalServiceClient(cc grpc.ClientConnInterface) PortalServiceClient { func (c *portalServiceClient) SaveNav(ctx context.Context, in *SaveNavRequest, opts ...grpc.CallOption) (*SaveNavResponse, error) { out := new(SaveNavResponse) - err := c.cc.Invoke(ctx, PortalService_SaveNav_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/SaveNav", in, out, opts...) if err != nil { return nil, err } @@ -79,7 +65,7 @@ func (c *portalServiceClient) SaveNav(ctx context.Context, in *SaveNavRequest, o func (c *portalServiceClient) GetNav(ctx context.Context, in *PortalNavId, opts ...grpc.CallOption) (*SNav, error) { out := new(SNav) - err := c.cc.Invoke(ctx, PortalService_GetNav_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/GetNav", in, out, opts...) if err != nil { return nil, err } @@ -88,7 +74,7 @@ func (c *portalServiceClient) GetNav(ctx context.Context, in *PortalNavId, opts func (c *portalServiceClient) QueryNavList(ctx context.Context, in *QueryNavRequest, opts ...grpc.CallOption) (*QueryNavResponse, error) { out := new(QueryNavResponse) - err := c.cc.Invoke(ctx, PortalService_QueryNavList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/QueryNavList", in, out, opts...) if err != nil { return nil, err } @@ -97,7 +83,7 @@ func (c *portalServiceClient) QueryNavList(ctx context.Context, in *QueryNavRequ func (c *portalServiceClient) DeleteNav(ctx context.Context, in *PortalNavId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PortalService_DeleteNav_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/DeleteNav", in, out, opts...) if err != nil { return nil, err } @@ -106,7 +92,7 @@ func (c *portalServiceClient) DeleteNav(ctx context.Context, in *PortalNavId, op func (c *portalServiceClient) SaveNavGroup(ctx context.Context, in *SaveNavGroupRequest, opts ...grpc.CallOption) (*SaveNavGroupResponse, error) { out := new(SaveNavGroupResponse) - err := c.cc.Invoke(ctx, PortalService_SaveNavGroup_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/SaveNavGroup", in, out, opts...) if err != nil { return nil, err } @@ -115,7 +101,7 @@ func (c *portalServiceClient) SaveNavGroup(ctx context.Context, in *SaveNavGroup func (c *portalServiceClient) QueryNavGroupList(ctx context.Context, in *QueryNavGroupRequest, opts ...grpc.CallOption) (*QueryNavGroupResponse, error) { out := new(QueryNavGroupResponse) - err := c.cc.Invoke(ctx, PortalService_QueryNavGroupList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/QueryNavGroupList", in, out, opts...) if err != nil { return nil, err } @@ -124,7 +110,7 @@ func (c *portalServiceClient) QueryNavGroupList(ctx context.Context, in *QueryNa func (c *portalServiceClient) DeleteNavGroup(ctx context.Context, in *PortalNavGroupId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PortalService_DeleteNavGroup_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/DeleteNavGroup", in, out, opts...) if err != nil { return nil, err } @@ -133,7 +119,7 @@ func (c *portalServiceClient) DeleteNavGroup(ctx context.Context, in *PortalNavG func (c *portalServiceClient) SaveSearchWord(ctx context.Context, in *SaveSearchWordRequest, opts ...grpc.CallOption) (*SaveSearchWordResponse, error) { out := new(SaveSearchWordResponse) - err := c.cc.Invoke(ctx, PortalService_SaveSearchWord_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/SaveSearchWord", in, out, opts...) if err != nil { return nil, err } @@ -142,7 +128,7 @@ func (c *portalServiceClient) SaveSearchWord(ctx context.Context, in *SaveSearch func (c *portalServiceClient) GetSearchWord(ctx context.Context, in *SysSearchWordId, opts ...grpc.CallOption) (*SSearchWord, error) { out := new(SSearchWord) - err := c.cc.Invoke(ctx, PortalService_GetSearchWord_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/GetSearchWord", in, out, opts...) if err != nil { return nil, err } @@ -151,7 +137,7 @@ func (c *portalServiceClient) GetSearchWord(ctx context.Context, in *SysSearchWo func (c *portalServiceClient) QuerySearchWordList(ctx context.Context, in *QuerySearchWordRequest, opts ...grpc.CallOption) (*QuerySearchWordResponse, error) { out := new(QuerySearchWordResponse) - err := c.cc.Invoke(ctx, PortalService_QuerySearchWordList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/QuerySearchWordList", in, out, opts...) if err != nil { return nil, err } @@ -160,7 +146,7 @@ func (c *portalServiceClient) QuerySearchWordList(ctx context.Context, in *Query func (c *portalServiceClient) DeleteSearchWord(ctx context.Context, in *SysSearchWordId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, PortalService_DeleteSearchWord_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/PortalService/DeleteSearchWord", in, out, opts...) if err != nil { return nil, err } @@ -256,7 +242,7 @@ func _PortalService_SaveNav_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_SaveNav_FullMethodName, + FullMethod: "/PortalService/SaveNav", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveNav(ctx, req.(*SaveNavRequest)) @@ -274,7 +260,7 @@ func _PortalService_GetNav_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_GetNav_FullMethodName, + FullMethod: "/PortalService/GetNav", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).GetNav(ctx, req.(*PortalNavId)) @@ -292,7 +278,7 @@ func _PortalService_QueryNavList_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_QueryNavList_FullMethodName, + FullMethod: "/PortalService/QueryNavList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QueryNavList(ctx, req.(*QueryNavRequest)) @@ -310,7 +296,7 @@ func _PortalService_DeleteNav_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_DeleteNav_FullMethodName, + FullMethod: "/PortalService/DeleteNav", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteNav(ctx, req.(*PortalNavId)) @@ -328,7 +314,7 @@ func _PortalService_SaveNavGroup_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_SaveNavGroup_FullMethodName, + FullMethod: "/PortalService/SaveNavGroup", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveNavGroup(ctx, req.(*SaveNavGroupRequest)) @@ -346,7 +332,7 @@ func _PortalService_QueryNavGroupList_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_QueryNavGroupList_FullMethodName, + FullMethod: "/PortalService/QueryNavGroupList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QueryNavGroupList(ctx, req.(*QueryNavGroupRequest)) @@ -364,7 +350,7 @@ func _PortalService_DeleteNavGroup_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_DeleteNavGroup_FullMethodName, + FullMethod: "/PortalService/DeleteNavGroup", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteNavGroup(ctx, req.(*PortalNavGroupId)) @@ -382,7 +368,7 @@ func _PortalService_SaveSearchWord_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_SaveSearchWord_FullMethodName, + FullMethod: "/PortalService/SaveSearchWord", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveSearchWord(ctx, req.(*SaveSearchWordRequest)) @@ -400,7 +386,7 @@ func _PortalService_GetSearchWord_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_GetSearchWord_FullMethodName, + FullMethod: "/PortalService/GetSearchWord", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).GetSearchWord(ctx, req.(*SysSearchWordId)) @@ -418,7 +404,7 @@ func _PortalService_QuerySearchWordList_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_QuerySearchWordList_FullMethodName, + FullMethod: "/PortalService/QuerySearchWordList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QuerySearchWordList(ctx, req.(*QuerySearchWordRequest)) @@ -436,7 +422,7 @@ func _PortalService_DeleteSearchWord_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: PortalService_DeleteSearchWord_FullMethodName, + FullMethod: "/PortalService/DeleteSearchWord", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteSearchWord(ctx, req.(*SysSearchWordId)) diff --git a/core/service/proto/product_service.pb.go b/core/service/proto/product_service.pb.go index 64146241d..c5c84b125 100644 --- a/core/service/proto/product_service.pb.go +++ b/core/service/proto/product_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: product_service.proto package proto diff --git a/core/service/proto/product_service_grpc.pb.go b/core/service/proto/product_service_grpc.pb.go index b29cf6e7b..63f829660 100644 --- a/core/service/proto/product_service_grpc.pb.go +++ b/core/service/proto/product_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: product_service.proto package proto @@ -18,28 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ProductService_GetProductModel_FullMethodName = "/ProductService/GetProductModel" - ProductService_GetModels_FullMethodName = "/ProductService/GetModels" - ProductService_GetAttr_FullMethodName = "/ProductService/GetAttr" - ProductService_GetAttrItem_FullMethodName = "/ProductService/GetAttrItem" - ProductService_SaveProductModel_FullMethodName = "/ProductService/SaveProductModel" - ProductService_DeleteModel__FullMethodName = "/ProductService/DeleteModel_" - ProductService_GetBrand_FullMethodName = "/ProductService/GetBrand" - ProductService_SaveBrand_FullMethodName = "/ProductService/SaveBrand" - ProductService_DeleteBrand_FullMethodName = "/ProductService/DeleteBrand" - ProductService_GetBrands_FullMethodName = "/ProductService/GetBrands" - ProductService_GetCategory_FullMethodName = "/ProductService/GetCategory" - ProductService_DeleteCategory_FullMethodName = "/ProductService/DeleteCategory" - ProductService_SaveCategory_FullMethodName = "/ProductService/SaveCategory" - ProductService_GetCategoryTreeNode_FullMethodName = "/ProductService/GetCategoryTreeNode" - ProductService_FindParentCategory_FullMethodName = "/ProductService/FindParentCategory" - ProductService_GetProduct_FullMethodName = "/ProductService/GetProduct" - ProductService_SaveProduct_FullMethodName = "/ProductService/SaveProduct" - ProductService_DeleteProduct_FullMethodName = "/ProductService/DeleteProduct" - ProductService_SaveProductInfo_FullMethodName = "/ProductService/SaveProductInfo" -) - // ProductServiceClient is the client API for ProductService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -96,7 +74,7 @@ func NewProductServiceClient(cc grpc.ClientConnInterface) ProductServiceClient { func (c *productServiceClient) GetProductModel(ctx context.Context, in *ProductModelId, opts ...grpc.CallOption) (*SProductModel, error) { out := new(SProductModel) - err := c.cc.Invoke(ctx, ProductService_GetProductModel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetProductModel", in, out, opts...) if err != nil { return nil, err } @@ -105,7 +83,7 @@ func (c *productServiceClient) GetProductModel(ctx context.Context, in *ProductM func (c *productServiceClient) GetModels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ProductModelListResponse, error) { out := new(ProductModelListResponse) - err := c.cc.Invoke(ctx, ProductService_GetModels_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetModels", in, out, opts...) if err != nil { return nil, err } @@ -114,7 +92,7 @@ func (c *productServiceClient) GetModels(ctx context.Context, in *Empty, opts .. func (c *productServiceClient) GetAttr(ctx context.Context, in *ProductAttrId, opts ...grpc.CallOption) (*SProductAttr, error) { out := new(SProductAttr) - err := c.cc.Invoke(ctx, ProductService_GetAttr_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetAttr", in, out, opts...) if err != nil { return nil, err } @@ -123,7 +101,7 @@ func (c *productServiceClient) GetAttr(ctx context.Context, in *ProductAttrId, o func (c *productServiceClient) GetAttrItem(ctx context.Context, in *ProductAttrItemId, opts ...grpc.CallOption) (*SProductAttrItem, error) { out := new(SProductAttrItem) - err := c.cc.Invoke(ctx, ProductService_GetAttrItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetAttrItem", in, out, opts...) if err != nil { return nil, err } @@ -132,7 +110,7 @@ func (c *productServiceClient) GetAttrItem(ctx context.Context, in *ProductAttrI func (c *productServiceClient) SaveProductModel(ctx context.Context, in *SaveProductModelRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_SaveProductModel_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/SaveProductModel", in, out, opts...) if err != nil { return nil, err } @@ -141,7 +119,7 @@ func (c *productServiceClient) SaveProductModel(ctx context.Context, in *SavePro func (c *productServiceClient) DeleteModel_(ctx context.Context, in *ProductModelId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_DeleteModel__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/DeleteModel_", in, out, opts...) if err != nil { return nil, err } @@ -150,7 +128,7 @@ func (c *productServiceClient) DeleteModel_(ctx context.Context, in *ProductMode func (c *productServiceClient) GetBrand(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SProductBrand, error) { out := new(SProductBrand) - err := c.cc.Invoke(ctx, ProductService_GetBrand_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetBrand", in, out, opts...) if err != nil { return nil, err } @@ -159,7 +137,7 @@ func (c *productServiceClient) GetBrand(ctx context.Context, in *Int64, opts ... func (c *productServiceClient) SaveBrand(ctx context.Context, in *SProductBrand, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_SaveBrand_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/SaveBrand", in, out, opts...) if err != nil { return nil, err } @@ -168,7 +146,7 @@ func (c *productServiceClient) SaveBrand(ctx context.Context, in *SProductBrand, func (c *productServiceClient) DeleteBrand(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_DeleteBrand_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/DeleteBrand", in, out, opts...) if err != nil { return nil, err } @@ -177,7 +155,7 @@ func (c *productServiceClient) DeleteBrand(ctx context.Context, in *Int64, opts func (c *productServiceClient) GetBrands(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ProductBrandListResponse, error) { out := new(ProductBrandListResponse) - err := c.cc.Invoke(ctx, ProductService_GetBrands_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetBrands", in, out, opts...) if err != nil { return nil, err } @@ -186,7 +164,7 @@ func (c *productServiceClient) GetBrands(ctx context.Context, in *Empty, opts .. func (c *productServiceClient) GetCategory(ctx context.Context, in *GetCategoryRequest, opts ...grpc.CallOption) (*SProductCategory, error) { out := new(SProductCategory) - err := c.cc.Invoke(ctx, ProductService_GetCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetCategory", in, out, opts...) if err != nil { return nil, err } @@ -195,7 +173,7 @@ func (c *productServiceClient) GetCategory(ctx context.Context, in *GetCategoryR func (c *productServiceClient) DeleteCategory(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_DeleteCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/DeleteCategory", in, out, opts...) if err != nil { return nil, err } @@ -204,7 +182,7 @@ func (c *productServiceClient) DeleteCategory(ctx context.Context, in *Int64, op func (c *productServiceClient) SaveCategory(ctx context.Context, in *SaveProductCategoryRequest, opts ...grpc.CallOption) (*SaveProductCategoryResponse, error) { out := new(SaveProductCategoryResponse) - err := c.cc.Invoke(ctx, ProductService_SaveCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/SaveCategory", in, out, opts...) if err != nil { return nil, err } @@ -213,7 +191,7 @@ func (c *productServiceClient) SaveCategory(ctx context.Context, in *SaveProduct func (c *productServiceClient) GetCategoryTreeNode(ctx context.Context, in *CategoryTreeRequest, opts ...grpc.CallOption) (*CategoryTreeResponse, error) { out := new(CategoryTreeResponse) - err := c.cc.Invoke(ctx, ProductService_GetCategoryTreeNode_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetCategoryTreeNode", in, out, opts...) if err != nil { return nil, err } @@ -222,7 +200,7 @@ func (c *productServiceClient) GetCategoryTreeNode(ctx context.Context, in *Cate func (c *productServiceClient) FindParentCategory(ctx context.Context, in *CategoryIdRequest, opts ...grpc.CallOption) (*CategoriesResponse, error) { out := new(CategoriesResponse) - err := c.cc.Invoke(ctx, ProductService_FindParentCategory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/FindParentCategory", in, out, opts...) if err != nil { return nil, err } @@ -231,7 +209,7 @@ func (c *productServiceClient) FindParentCategory(ctx context.Context, in *Categ func (c *productServiceClient) GetProduct(ctx context.Context, in *ProductId, opts ...grpc.CallOption) (*SProduct, error) { out := new(SProduct) - err := c.cc.Invoke(ctx, ProductService_GetProduct_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/GetProduct", in, out, opts...) if err != nil { return nil, err } @@ -240,7 +218,7 @@ func (c *productServiceClient) GetProduct(ctx context.Context, in *ProductId, op func (c *productServiceClient) SaveProduct(ctx context.Context, in *SaveProductRequest, opts ...grpc.CallOption) (*SaveProductResponse, error) { out := new(SaveProductResponse) - err := c.cc.Invoke(ctx, ProductService_SaveProduct_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/SaveProduct", in, out, opts...) if err != nil { return nil, err } @@ -249,7 +227,7 @@ func (c *productServiceClient) SaveProduct(ctx context.Context, in *SaveProductR func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_DeleteProduct_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/DeleteProduct", in, out, opts...) if err != nil { return nil, err } @@ -258,7 +236,7 @@ func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProd func (c *productServiceClient) SaveProductInfo(ctx context.Context, in *ProductInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ProductService_SaveProductInfo_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ProductService/SaveProductInfo", in, out, opts...) if err != nil { return nil, err } @@ -396,7 +374,7 @@ func _ProductService_GetProductModel_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetProductModel_FullMethodName, + FullMethod: "/ProductService/GetProductModel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetProductModel(ctx, req.(*ProductModelId)) @@ -414,7 +392,7 @@ func _ProductService_GetModels_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetModels_FullMethodName, + FullMethod: "/ProductService/GetModels", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetModels(ctx, req.(*Empty)) @@ -432,7 +410,7 @@ func _ProductService_GetAttr_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetAttr_FullMethodName, + FullMethod: "/ProductService/GetAttr", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetAttr(ctx, req.(*ProductAttrId)) @@ -450,7 +428,7 @@ func _ProductService_GetAttrItem_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetAttrItem_FullMethodName, + FullMethod: "/ProductService/GetAttrItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetAttrItem(ctx, req.(*ProductAttrItemId)) @@ -468,7 +446,7 @@ func _ProductService_SaveProductModel_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_SaveProductModel_FullMethodName, + FullMethod: "/ProductService/SaveProductModel", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProductModel(ctx, req.(*SaveProductModelRequest)) @@ -486,7 +464,7 @@ func _ProductService_DeleteModel__Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_DeleteModel__FullMethodName, + FullMethod: "/ProductService/DeleteModel_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteModel_(ctx, req.(*ProductModelId)) @@ -504,7 +482,7 @@ func _ProductService_GetBrand_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetBrand_FullMethodName, + FullMethod: "/ProductService/GetBrand", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetBrand(ctx, req.(*Int64)) @@ -522,7 +500,7 @@ func _ProductService_SaveBrand_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_SaveBrand_FullMethodName, + FullMethod: "/ProductService/SaveBrand", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveBrand(ctx, req.(*SProductBrand)) @@ -540,7 +518,7 @@ func _ProductService_DeleteBrand_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_DeleteBrand_FullMethodName, + FullMethod: "/ProductService/DeleteBrand", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteBrand(ctx, req.(*Int64)) @@ -558,7 +536,7 @@ func _ProductService_GetBrands_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetBrands_FullMethodName, + FullMethod: "/ProductService/GetBrands", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetBrands(ctx, req.(*Empty)) @@ -576,7 +554,7 @@ func _ProductService_GetCategory_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetCategory_FullMethodName, + FullMethod: "/ProductService/GetCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetCategory(ctx, req.(*GetCategoryRequest)) @@ -594,7 +572,7 @@ func _ProductService_DeleteCategory_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_DeleteCategory_FullMethodName, + FullMethod: "/ProductService/DeleteCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteCategory(ctx, req.(*Int64)) @@ -612,7 +590,7 @@ func _ProductService_SaveCategory_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_SaveCategory_FullMethodName, + FullMethod: "/ProductService/SaveCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveCategory(ctx, req.(*SaveProductCategoryRequest)) @@ -630,7 +608,7 @@ func _ProductService_GetCategoryTreeNode_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetCategoryTreeNode_FullMethodName, + FullMethod: "/ProductService/GetCategoryTreeNode", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetCategoryTreeNode(ctx, req.(*CategoryTreeRequest)) @@ -648,7 +626,7 @@ func _ProductService_FindParentCategory_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_FindParentCategory_FullMethodName, + FullMethod: "/ProductService/FindParentCategory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).FindParentCategory(ctx, req.(*CategoryIdRequest)) @@ -666,7 +644,7 @@ func _ProductService_GetProduct_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_GetProduct_FullMethodName, + FullMethod: "/ProductService/GetProduct", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetProduct(ctx, req.(*ProductId)) @@ -684,7 +662,7 @@ func _ProductService_SaveProduct_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_SaveProduct_FullMethodName, + FullMethod: "/ProductService/SaveProduct", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProduct(ctx, req.(*SaveProductRequest)) @@ -702,7 +680,7 @@ func _ProductService_DeleteProduct_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_DeleteProduct_FullMethodName, + FullMethod: "/ProductService/DeleteProduct", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteProduct(ctx, req.(*DeleteProductRequest)) @@ -720,7 +698,7 @@ func _ProductService_SaveProductInfo_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ProductService_SaveProductInfo_FullMethodName, + FullMethod: "/ProductService/SaveProductInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProductInfo(ctx, req.(*ProductInfoRequest)) diff --git a/core/service/proto/query_dto.pb.go b/core/service/proto/query_dto.pb.go index 05c09d49b..7275cde15 100644 --- a/core/service/proto/query_dto.pb.go +++ b/core/service/proto/query_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/query_dto.proto package proto diff --git a/core/service/proto/query_service.pb.go b/core/service/proto/query_service.pb.go index 1e87ab6a1..db012b2ab 100644 --- a/core/service/proto/query_service.pb.go +++ b/core/service/proto/query_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: query_service.proto package proto diff --git a/core/service/proto/query_service_grpc.pb.go b/core/service/proto/query_service_grpc.pb.go index 48e309096..55b340556 100644 --- a/core/service/proto/query_service_grpc.pb.go +++ b/core/service/proto/query_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: query_service.proto package proto @@ -18,23 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - QueryService_SummaryStatistics_FullMethodName = "/QueryService/SummaryStatistics" - QueryService_MemberStatistics_FullMethodName = "/QueryService/MemberStatistics" - QueryService_PagingShops_FullMethodName = "/QueryService/PagingShops" - QueryService_MemberNormalOrders_FullMethodName = "/QueryService/MemberNormalOrders" - QueryService_QueryWholesaleOrders_FullMethodName = "/QueryService/QueryWholesaleOrders" - QueryService_QueryTradeOrders_FullMethodName = "/QueryService/QueryTradeOrders" - QueryService_QueryMemberList_FullMethodName = "/QueryService/QueryMemberList" - QueryService_SearchMembers_FullMethodName = "/QueryService/SearchMembers" - QueryService_QueryMemberFavoriteShops_FullMethodName = "/QueryService/QueryMemberFavoriteShops" - QueryService_QueryMemberFavoriteGoods_FullMethodName = "/QueryService/QueryMemberFavoriteGoods" - QueryService_PagingMemberAccountLog_FullMethodName = "/QueryService/PagingMemberAccountLog" - QueryService_PagingOnShelvesGoods_FullMethodName = "/QueryService/PagingOnShelvesGoods" - QueryService_QueryItemSalesHistory_FullMethodName = "/QueryService/QueryItemSalesHistory" - QueryService_SearchItem_FullMethodName = "/QueryService/SearchItem" -) - // QueryServiceClient is the client API for QueryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -79,7 +62,7 @@ func NewQueryServiceClient(cc grpc.ClientConnInterface) QueryServiceClient { func (c *queryServiceClient) SummaryStatistics(ctx context.Context, in *SummaryStatisticsRequest, opts ...grpc.CallOption) (*SummaryStatisticsResponse, error) { out := new(SummaryStatisticsResponse) - err := c.cc.Invoke(ctx, QueryService_SummaryStatistics_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/SummaryStatistics", in, out, opts...) if err != nil { return nil, err } @@ -88,7 +71,7 @@ func (c *queryServiceClient) SummaryStatistics(ctx context.Context, in *SummaryS func (c *queryServiceClient) MemberStatistics(ctx context.Context, in *MemberStatisticsRequest, opts ...grpc.CallOption) (*MemberStatisticsResponse, error) { out := new(MemberStatisticsResponse) - err := c.cc.Invoke(ctx, QueryService_MemberStatistics_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/MemberStatistics", in, out, opts...) if err != nil { return nil, err } @@ -97,7 +80,7 @@ func (c *queryServiceClient) MemberStatistics(ctx context.Context, in *MemberSta func (c *queryServiceClient) PagingShops(ctx context.Context, in *QueryPagingShopRequest, opts ...grpc.CallOption) (*QueryPagingShopsResponse, error) { out := new(QueryPagingShopsResponse) - err := c.cc.Invoke(ctx, QueryService_PagingShops_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/PagingShops", in, out, opts...) if err != nil { return nil, err } @@ -106,7 +89,7 @@ func (c *queryServiceClient) PagingShops(ctx context.Context, in *QueryPagingSho func (c *queryServiceClient) MemberNormalOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, QueryService_MemberNormalOrders_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/MemberNormalOrders", in, out, opts...) if err != nil { return nil, err } @@ -115,7 +98,7 @@ func (c *queryServiceClient) MemberNormalOrders(ctx context.Context, in *MemberO func (c *queryServiceClient) QueryWholesaleOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, QueryService_QueryWholesaleOrders_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryWholesaleOrders", in, out, opts...) if err != nil { return nil, err } @@ -124,7 +107,7 @@ func (c *queryServiceClient) QueryWholesaleOrders(ctx context.Context, in *Membe func (c *queryServiceClient) QueryTradeOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, QueryService_QueryTradeOrders_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryTradeOrders", in, out, opts...) if err != nil { return nil, err } @@ -133,7 +116,7 @@ func (c *queryServiceClient) QueryTradeOrders(ctx context.Context, in *MemberOrd func (c *queryServiceClient) QueryMemberList(ctx context.Context, in *MemberListRequest, opts ...grpc.CallOption) (*MemberListResponse, error) { out := new(MemberListResponse) - err := c.cc.Invoke(ctx, QueryService_QueryMemberList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryMemberList", in, out, opts...) if err != nil { return nil, err } @@ -142,7 +125,7 @@ func (c *queryServiceClient) QueryMemberList(ctx context.Context, in *MemberList func (c *queryServiceClient) SearchMembers(ctx context.Context, in *MemberSearchRequest, opts ...grpc.CallOption) (*MemberListResponse, error) { out := new(MemberListResponse) - err := c.cc.Invoke(ctx, QueryService_SearchMembers_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/SearchMembers", in, out, opts...) if err != nil { return nil, err } @@ -151,7 +134,7 @@ func (c *queryServiceClient) SearchMembers(ctx context.Context, in *MemberSearch func (c *queryServiceClient) QueryMemberFavoriteShops(ctx context.Context, in *FavoriteQueryRequest, opts ...grpc.CallOption) (*PagingShopFavoriteResponse, error) { out := new(PagingShopFavoriteResponse) - err := c.cc.Invoke(ctx, QueryService_QueryMemberFavoriteShops_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryMemberFavoriteShops", in, out, opts...) if err != nil { return nil, err } @@ -160,7 +143,7 @@ func (c *queryServiceClient) QueryMemberFavoriteShops(ctx context.Context, in *F func (c *queryServiceClient) QueryMemberFavoriteGoods(ctx context.Context, in *FavoriteQueryRequest, opts ...grpc.CallOption) (*PagingGoodsFavoriteResponse, error) { out := new(PagingGoodsFavoriteResponse) - err := c.cc.Invoke(ctx, QueryService_QueryMemberFavoriteGoods_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryMemberFavoriteGoods", in, out, opts...) if err != nil { return nil, err } @@ -169,7 +152,7 @@ func (c *queryServiceClient) QueryMemberFavoriteGoods(ctx context.Context, in *F func (c *queryServiceClient) PagingMemberAccountLog(ctx context.Context, in *PagingAccountLogRequest, opts ...grpc.CallOption) (*MemberAccountPagingLogResponse, error) { out := new(MemberAccountPagingLogResponse) - err := c.cc.Invoke(ctx, QueryService_PagingMemberAccountLog_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/PagingMemberAccountLog", in, out, opts...) if err != nil { return nil, err } @@ -178,7 +161,7 @@ func (c *queryServiceClient) PagingMemberAccountLog(ctx context.Context, in *Pag func (c *queryServiceClient) PagingOnShelvesGoods(ctx context.Context, in *PagingShopGoodsRequest, opts ...grpc.CallOption) (*PagingShopGoodsResponse, error) { out := new(PagingShopGoodsResponse) - err := c.cc.Invoke(ctx, QueryService_PagingOnShelvesGoods_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/PagingOnShelvesGoods", in, out, opts...) if err != nil { return nil, err } @@ -187,7 +170,7 @@ func (c *queryServiceClient) PagingOnShelvesGoods(ctx context.Context, in *Pagin func (c *queryServiceClient) QueryItemSalesHistory(ctx context.Context, in *QueryItemSalesHistoryRequest, opts ...grpc.CallOption) (*QueryItemSalesHistoryResponse, error) { out := new(QueryItemSalesHistoryResponse) - err := c.cc.Invoke(ctx, QueryService_QueryItemSalesHistory_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/QueryItemSalesHistory", in, out, opts...) if err != nil { return nil, err } @@ -196,7 +179,7 @@ func (c *queryServiceClient) QueryItemSalesHistory(ctx context.Context, in *Quer func (c *queryServiceClient) SearchItem(ctx context.Context, in *SearchItemRequest, opts ...grpc.CallOption) (*SearchItemResponse, error) { out := new(SearchItemResponse) - err := c.cc.Invoke(ctx, QueryService_SearchItem_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QueryService/SearchItem", in, out, opts...) if err != nil { return nil, err } @@ -307,7 +290,7 @@ func _QueryService_SummaryStatistics_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_SummaryStatistics_FullMethodName, + FullMethod: "/QueryService/SummaryStatistics", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SummaryStatistics(ctx, req.(*SummaryStatisticsRequest)) @@ -325,7 +308,7 @@ func _QueryService_MemberStatistics_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_MemberStatistics_FullMethodName, + FullMethod: "/QueryService/MemberStatistics", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).MemberStatistics(ctx, req.(*MemberStatisticsRequest)) @@ -343,7 +326,7 @@ func _QueryService_PagingShops_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_PagingShops_FullMethodName, + FullMethod: "/QueryService/PagingShops", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingShops(ctx, req.(*QueryPagingShopRequest)) @@ -361,7 +344,7 @@ func _QueryService_MemberNormalOrders_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_MemberNormalOrders_FullMethodName, + FullMethod: "/QueryService/MemberNormalOrders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).MemberNormalOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -379,7 +362,7 @@ func _QueryService_QueryWholesaleOrders_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryWholesaleOrders_FullMethodName, + FullMethod: "/QueryService/QueryWholesaleOrders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryWholesaleOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -397,7 +380,7 @@ func _QueryService_QueryTradeOrders_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryTradeOrders_FullMethodName, + FullMethod: "/QueryService/QueryTradeOrders", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryTradeOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -415,7 +398,7 @@ func _QueryService_QueryMemberList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryMemberList_FullMethodName, + FullMethod: "/QueryService/QueryMemberList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberList(ctx, req.(*MemberListRequest)) @@ -433,7 +416,7 @@ func _QueryService_SearchMembers_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_SearchMembers_FullMethodName, + FullMethod: "/QueryService/SearchMembers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SearchMembers(ctx, req.(*MemberSearchRequest)) @@ -451,7 +434,7 @@ func _QueryService_QueryMemberFavoriteShops_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryMemberFavoriteShops_FullMethodName, + FullMethod: "/QueryService/QueryMemberFavoriteShops", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberFavoriteShops(ctx, req.(*FavoriteQueryRequest)) @@ -469,7 +452,7 @@ func _QueryService_QueryMemberFavoriteGoods_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryMemberFavoriteGoods_FullMethodName, + FullMethod: "/QueryService/QueryMemberFavoriteGoods", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberFavoriteGoods(ctx, req.(*FavoriteQueryRequest)) @@ -487,7 +470,7 @@ func _QueryService_PagingMemberAccountLog_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_PagingMemberAccountLog_FullMethodName, + FullMethod: "/QueryService/PagingMemberAccountLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingMemberAccountLog(ctx, req.(*PagingAccountLogRequest)) @@ -505,7 +488,7 @@ func _QueryService_PagingOnShelvesGoods_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_PagingOnShelvesGoods_FullMethodName, + FullMethod: "/QueryService/PagingOnShelvesGoods", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingOnShelvesGoods(ctx, req.(*PagingShopGoodsRequest)) @@ -523,7 +506,7 @@ func _QueryService_QueryItemSalesHistory_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_QueryItemSalesHistory_FullMethodName, + FullMethod: "/QueryService/QueryItemSalesHistory", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryItemSalesHistory(ctx, req.(*QueryItemSalesHistoryRequest)) @@ -541,7 +524,7 @@ func _QueryService_SearchItem_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QueryService_SearchItem_FullMethodName, + FullMethod: "/QueryService/SearchItem", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SearchItem(ctx, req.(*SearchItemRequest)) diff --git a/core/service/proto/quick_pay_service.pb.go b/core/service/proto/quick_pay_service.pb.go index 09f25384b..aa3327a9c 100644 --- a/core/service/proto/quick_pay_service.pb.go +++ b/core/service/proto/quick_pay_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: quick_pay_service.proto package proto diff --git a/core/service/proto/quick_pay_service_grpc.pb.go b/core/service/proto/quick_pay_service_grpc.pb.go index 01765d7a9..cf318e3bd 100644 --- a/core/service/proto/quick_pay_service_grpc.pb.go +++ b/core/service/proto/quick_pay_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: quick_pay_service.proto package proto @@ -18,16 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - QuickPayService_QueryCardBin_FullMethodName = "/QuickPayService/QueryCardBin" - QuickPayService_CheckSign_FullMethodName = "/QuickPayService/CheckSign" - QuickPayService_RequestBankSideAuth_FullMethodName = "/QuickPayService/RequestBankSideAuth" - QuickPayService_QueryBankAuthResult_FullMethodName = "/QuickPayService/QueryBankAuthResult" - QuickPayService_DirectPayment_FullMethodName = "/QuickPayService/DirectPayment" - QuickPayService_QueryPaymentStatus_FullMethodName = "/QuickPayService/QueryPaymentStatus" - QuickPayService_BatchTransfer_FullMethodName = "/QuickPayService/BatchTransfer" -) - // QuickPayServiceClient is the client API for QuickPayService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -58,7 +48,7 @@ func NewQuickPayServiceClient(cc grpc.ClientConnInterface) QuickPayServiceClient func (c *quickPayServiceClient) QueryCardBin(ctx context.Context, in *BankCardNo, opts ...grpc.CallOption) (*CardBinQueryResponse, error) { out := new(CardBinQueryResponse) - err := c.cc.Invoke(ctx, QuickPayService_QueryCardBin_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/QueryCardBin", in, out, opts...) if err != nil { return nil, err } @@ -67,7 +57,7 @@ func (c *quickPayServiceClient) QueryCardBin(ctx context.Context, in *BankCardNo func (c *quickPayServiceClient) CheckSign(ctx context.Context, in *CheckQPaySignRequest, opts ...grpc.CallOption) (*CheckQPaySignResponse, error) { out := new(CheckQPaySignResponse) - err := c.cc.Invoke(ctx, QuickPayService_CheckSign_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/CheckSign", in, out, opts...) if err != nil { return nil, err } @@ -76,7 +66,7 @@ func (c *quickPayServiceClient) CheckSign(ctx context.Context, in *CheckQPaySign func (c *quickPayServiceClient) RequestBankSideAuth(ctx context.Context, in *BankAuthRequest, opts ...grpc.CallOption) (*BankAuthResponse, error) { out := new(BankAuthResponse) - err := c.cc.Invoke(ctx, QuickPayService_RequestBankSideAuth_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/RequestBankSideAuth", in, out, opts...) if err != nil { return nil, err } @@ -85,7 +75,7 @@ func (c *quickPayServiceClient) RequestBankSideAuth(ctx context.Context, in *Ban func (c *quickPayServiceClient) QueryBankAuthResult(ctx context.Context, in *BankAuthQueryRequest, opts ...grpc.CallOption) (*BankAuthQueryResponse, error) { out := new(BankAuthQueryResponse) - err := c.cc.Invoke(ctx, QuickPayService_QueryBankAuthResult_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/QueryBankAuthResult", in, out, opts...) if err != nil { return nil, err } @@ -94,7 +84,7 @@ func (c *quickPayServiceClient) QueryBankAuthResult(ctx context.Context, in *Ban func (c *quickPayServiceClient) DirectPayment(ctx context.Context, in *QPaymentRequest, opts ...grpc.CallOption) (*QPaymentResponse, error) { out := new(QPaymentResponse) - err := c.cc.Invoke(ctx, QuickPayService_DirectPayment_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/DirectPayment", in, out, opts...) if err != nil { return nil, err } @@ -103,7 +93,7 @@ func (c *quickPayServiceClient) DirectPayment(ctx context.Context, in *QPaymentR func (c *quickPayServiceClient) QueryPaymentStatus(ctx context.Context, in *QPaymentQueryRequest, opts ...grpc.CallOption) (*QPaymentQueryResponse, error) { out := new(QPaymentQueryResponse) - err := c.cc.Invoke(ctx, QuickPayService_QueryPaymentStatus_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/QueryPaymentStatus", in, out, opts...) if err != nil { return nil, err } @@ -112,7 +102,7 @@ func (c *quickPayServiceClient) QueryPaymentStatus(ctx context.Context, in *QPay func (c *quickPayServiceClient) BatchTransfer(ctx context.Context, in *BatchTransferRequest, opts ...grpc.CallOption) (*BatchTransferResponse, error) { out := new(BatchTransferResponse) - err := c.cc.Invoke(ctx, QuickPayService_BatchTransfer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/QuickPayService/BatchTransfer", in, out, opts...) if err != nil { return nil, err } @@ -188,7 +178,7 @@ func _QuickPayService_QueryCardBin_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_QueryCardBin_FullMethodName, + FullMethod: "/QuickPayService/QueryCardBin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryCardBin(ctx, req.(*BankCardNo)) @@ -206,7 +196,7 @@ func _QuickPayService_CheckSign_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_CheckSign_FullMethodName, + FullMethod: "/QuickPayService/CheckSign", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).CheckSign(ctx, req.(*CheckQPaySignRequest)) @@ -224,7 +214,7 @@ func _QuickPayService_RequestBankSideAuth_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_RequestBankSideAuth_FullMethodName, + FullMethod: "/QuickPayService/RequestBankSideAuth", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).RequestBankSideAuth(ctx, req.(*BankAuthRequest)) @@ -242,7 +232,7 @@ func _QuickPayService_QueryBankAuthResult_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_QueryBankAuthResult_FullMethodName, + FullMethod: "/QuickPayService/QueryBankAuthResult", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryBankAuthResult(ctx, req.(*BankAuthQueryRequest)) @@ -260,7 +250,7 @@ func _QuickPayService_DirectPayment_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_DirectPayment_FullMethodName, + FullMethod: "/QuickPayService/DirectPayment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).DirectPayment(ctx, req.(*QPaymentRequest)) @@ -278,7 +268,7 @@ func _QuickPayService_QueryPaymentStatus_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_QueryPaymentStatus_FullMethodName, + FullMethod: "/QuickPayService/QueryPaymentStatus", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryPaymentStatus(ctx, req.(*QPaymentQueryRequest)) @@ -296,7 +286,7 @@ func _QuickPayService_BatchTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: QuickPayService_BatchTransfer_FullMethodName, + FullMethod: "/QuickPayService/BatchTransfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).BatchTransfer(ctx, req.(*BatchTransferRequest)) diff --git a/core/service/proto/rbac_service.pb.go b/core/service/proto/rbac_service.pb.go index 4a17140c9..3e8f922b7 100644 --- a/core/service/proto/rbac_service.pb.go +++ b/core/service/proto/rbac_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: rbac_service.proto package proto diff --git a/core/service/proto/rbac_service_grpc.pb.go b/core/service/proto/rbac_service_grpc.pb.go index 595235f8e..8bf3b9ee2 100644 --- a/core/service/proto/rbac_service_grpc.pb.go +++ b/core/service/proto/rbac_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: rbac_service.proto package proto @@ -18,37 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - RbacService_UserLogin_FullMethodName = "/RbacService/UserLogin" - RbacService_CheckRBACToken_FullMethodName = "/RbacService/CheckRBACToken" - RbacService_GetJwtToken_FullMethodName = "/RbacService/GetJwtToken" - RbacService_GetUserResource_FullMethodName = "/RbacService/GetUserResource" - RbacService_QueryResList_FullMethodName = "/RbacService/QueryResList" - RbacService_MoveResOrdinal_FullMethodName = "/RbacService/MoveResOrdinal" - RbacService_DepartTree_FullMethodName = "/RbacService/DepartTree" - RbacService_SavePermDept_FullMethodName = "/RbacService/SavePermDept" - RbacService_GetPermDept_FullMethodName = "/RbacService/GetPermDept" - RbacService_DeletePermDept_FullMethodName = "/RbacService/DeletePermDept" - RbacService_SavePermJob_FullMethodName = "/RbacService/SavePermJob" - RbacService_GetPermJob_FullMethodName = "/RbacService/GetPermJob" - RbacService_QueryPermJobList_FullMethodName = "/RbacService/QueryPermJobList" - RbacService_DeletePermJob_FullMethodName = "/RbacService/DeletePermJob" - RbacService_PagingPermJob_FullMethodName = "/RbacService/PagingPermJob" - RbacService_SavePermUser_FullMethodName = "/RbacService/SavePermUser" - RbacService_GetPermUser_FullMethodName = "/RbacService/GetPermUser" - RbacService_DeletePermUser_FullMethodName = "/RbacService/DeletePermUser" - RbacService_PagingPermUser_FullMethodName = "/RbacService/PagingPermUser" - RbacService_SavePermRole_FullMethodName = "/RbacService/SavePermRole" - RbacService_UpdateRoleResource_FullMethodName = "/RbacService/UpdateRoleResource" - RbacService_GetPermRole_FullMethodName = "/RbacService/GetPermRole" - RbacService_QueryPermRoleList_FullMethodName = "/RbacService/QueryPermRoleList" - RbacService_DeletePermRole_FullMethodName = "/RbacService/DeletePermRole" - RbacService_PagingPermRole_FullMethodName = "/RbacService/PagingPermRole" - RbacService_SavePermRes_FullMethodName = "/RbacService/SavePermRes" - RbacService_GetPermRes_FullMethodName = "/RbacService/GetPermRes" - RbacService_DeletePermRes_FullMethodName = "/RbacService/DeletePermRes" -) - // RbacServiceClient is the client API for RbacService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -121,7 +90,7 @@ func NewRbacServiceClient(cc grpc.ClientConnInterface) RbacServiceClient { func (c *rbacServiceClient) UserLogin(ctx context.Context, in *RbacLoginRequest, opts ...grpc.CallOption) (*RbacLoginResponse, error) { out := new(RbacLoginResponse) - err := c.cc.Invoke(ctx, RbacService_UserLogin_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/UserLogin", in, out, opts...) if err != nil { return nil, err } @@ -130,7 +99,7 @@ func (c *rbacServiceClient) UserLogin(ctx context.Context, in *RbacLoginRequest, func (c *rbacServiceClient) CheckRBACToken(ctx context.Context, in *CheckRBACTokenRequest, opts ...grpc.CallOption) (*CheckRBACTokenResponse, error) { out := new(CheckRBACTokenResponse) - err := c.cc.Invoke(ctx, RbacService_CheckRBACToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/CheckRBACToken", in, out, opts...) if err != nil { return nil, err } @@ -139,7 +108,7 @@ func (c *rbacServiceClient) CheckRBACToken(ctx context.Context, in *CheckRBACTok func (c *rbacServiceClient) GetJwtToken(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, RbacService_GetJwtToken_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetJwtToken", in, out, opts...) if err != nil { return nil, err } @@ -148,7 +117,7 @@ func (c *rbacServiceClient) GetJwtToken(ctx context.Context, in *Empty, opts ... func (c *rbacServiceClient) GetUserResource(ctx context.Context, in *GetUserResRequest, opts ...grpc.CallOption) (*RbacUserResourceResponse, error) { out := new(RbacUserResourceResponse) - err := c.cc.Invoke(ctx, RbacService_GetUserResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetUserResource", in, out, opts...) if err != nil { return nil, err } @@ -157,7 +126,7 @@ func (c *rbacServiceClient) GetUserResource(ctx context.Context, in *GetUserResR func (c *rbacServiceClient) QueryResList(ctx context.Context, in *QueryPermResRequest, opts ...grpc.CallOption) (*QueryPermResResponse, error) { out := new(QueryPermResResponse) - err := c.cc.Invoke(ctx, RbacService_QueryResList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/QueryResList", in, out, opts...) if err != nil { return nil, err } @@ -166,7 +135,7 @@ func (c *rbacServiceClient) QueryResList(ctx context.Context, in *QueryPermResRe func (c *rbacServiceClient) MoveResOrdinal(ctx context.Context, in *MoveResOrdinalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_MoveResOrdinal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/MoveResOrdinal", in, out, opts...) if err != nil { return nil, err } @@ -175,7 +144,7 @@ func (c *rbacServiceClient) MoveResOrdinal(ctx context.Context, in *MoveResOrdin func (c *rbacServiceClient) DepartTree(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*RbacTree, error) { out := new(RbacTree) - err := c.cc.Invoke(ctx, RbacService_DepartTree_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DepartTree", in, out, opts...) if err != nil { return nil, err } @@ -184,7 +153,7 @@ func (c *rbacServiceClient) DepartTree(ctx context.Context, in *Empty, opts ...g func (c *rbacServiceClient) SavePermDept(ctx context.Context, in *SavePermDeptRequest, opts ...grpc.CallOption) (*SavePermDeptResponse, error) { out := new(SavePermDeptResponse) - err := c.cc.Invoke(ctx, RbacService_SavePermDept_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/SavePermDept", in, out, opts...) if err != nil { return nil, err } @@ -193,7 +162,7 @@ func (c *rbacServiceClient) SavePermDept(ctx context.Context, in *SavePermDeptRe func (c *rbacServiceClient) GetPermDept(ctx context.Context, in *PermDeptId, opts ...grpc.CallOption) (*SPermDept, error) { out := new(SPermDept) - err := c.cc.Invoke(ctx, RbacService_GetPermDept_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetPermDept", in, out, opts...) if err != nil { return nil, err } @@ -202,7 +171,7 @@ func (c *rbacServiceClient) GetPermDept(ctx context.Context, in *PermDeptId, opt func (c *rbacServiceClient) DeletePermDept(ctx context.Context, in *PermDeptId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_DeletePermDept_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DeletePermDept", in, out, opts...) if err != nil { return nil, err } @@ -211,7 +180,7 @@ func (c *rbacServiceClient) DeletePermDept(ctx context.Context, in *PermDeptId, func (c *rbacServiceClient) SavePermJob(ctx context.Context, in *SavePermJobRequest, opts ...grpc.CallOption) (*SavePermJobResponse, error) { out := new(SavePermJobResponse) - err := c.cc.Invoke(ctx, RbacService_SavePermJob_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/SavePermJob", in, out, opts...) if err != nil { return nil, err } @@ -220,7 +189,7 @@ func (c *rbacServiceClient) SavePermJob(ctx context.Context, in *SavePermJobRequ func (c *rbacServiceClient) GetPermJob(ctx context.Context, in *PermJobId, opts ...grpc.CallOption) (*SPermJob, error) { out := new(SPermJob) - err := c.cc.Invoke(ctx, RbacService_GetPermJob_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetPermJob", in, out, opts...) if err != nil { return nil, err } @@ -229,7 +198,7 @@ func (c *rbacServiceClient) GetPermJob(ctx context.Context, in *PermJobId, opts func (c *rbacServiceClient) QueryPermJobList(ctx context.Context, in *QueryPermJobRequest, opts ...grpc.CallOption) (*QueryPermJobResponse, error) { out := new(QueryPermJobResponse) - err := c.cc.Invoke(ctx, RbacService_QueryPermJobList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/QueryPermJobList", in, out, opts...) if err != nil { return nil, err } @@ -238,7 +207,7 @@ func (c *rbacServiceClient) QueryPermJobList(ctx context.Context, in *QueryPermJ func (c *rbacServiceClient) DeletePermJob(ctx context.Context, in *PermJobId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_DeletePermJob_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DeletePermJob", in, out, opts...) if err != nil { return nil, err } @@ -247,7 +216,7 @@ func (c *rbacServiceClient) DeletePermJob(ctx context.Context, in *PermJobId, op func (c *rbacServiceClient) PagingPermJob(ctx context.Context, in *PermJobPagingRequest, opts ...grpc.CallOption) (*PermJobPagingResponse, error) { out := new(PermJobPagingResponse) - err := c.cc.Invoke(ctx, RbacService_PagingPermJob_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/PagingPermJob", in, out, opts...) if err != nil { return nil, err } @@ -256,7 +225,7 @@ func (c *rbacServiceClient) PagingPermJob(ctx context.Context, in *PermJobPaging func (c *rbacServiceClient) SavePermUser(ctx context.Context, in *SavePermUserRequest, opts ...grpc.CallOption) (*SavePermUserResponse, error) { out := new(SavePermUserResponse) - err := c.cc.Invoke(ctx, RbacService_SavePermUser_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/SavePermUser", in, out, opts...) if err != nil { return nil, err } @@ -265,7 +234,7 @@ func (c *rbacServiceClient) SavePermUser(ctx context.Context, in *SavePermUserRe func (c *rbacServiceClient) GetPermUser(ctx context.Context, in *PermUserId, opts ...grpc.CallOption) (*SPermUser, error) { out := new(SPermUser) - err := c.cc.Invoke(ctx, RbacService_GetPermUser_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetPermUser", in, out, opts...) if err != nil { return nil, err } @@ -274,7 +243,7 @@ func (c *rbacServiceClient) GetPermUser(ctx context.Context, in *PermUserId, opt func (c *rbacServiceClient) DeletePermUser(ctx context.Context, in *PermUserId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_DeletePermUser_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DeletePermUser", in, out, opts...) if err != nil { return nil, err } @@ -283,7 +252,7 @@ func (c *rbacServiceClient) DeletePermUser(ctx context.Context, in *PermUserId, func (c *rbacServiceClient) PagingPermUser(ctx context.Context, in *PermUserPagingRequest, opts ...grpc.CallOption) (*PermUserPagingResponse, error) { out := new(PermUserPagingResponse) - err := c.cc.Invoke(ctx, RbacService_PagingPermUser_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/PagingPermUser", in, out, opts...) if err != nil { return nil, err } @@ -292,7 +261,7 @@ func (c *rbacServiceClient) PagingPermUser(ctx context.Context, in *PermUserPagi func (c *rbacServiceClient) SavePermRole(ctx context.Context, in *SavePermRoleRequest, opts ...grpc.CallOption) (*SavePermRoleResponse, error) { out := new(SavePermRoleResponse) - err := c.cc.Invoke(ctx, RbacService_SavePermRole_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/SavePermRole", in, out, opts...) if err != nil { return nil, err } @@ -301,7 +270,7 @@ func (c *rbacServiceClient) SavePermRole(ctx context.Context, in *SavePermRoleRe func (c *rbacServiceClient) UpdateRoleResource(ctx context.Context, in *UpdateRoleResRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_UpdateRoleResource_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/UpdateRoleResource", in, out, opts...) if err != nil { return nil, err } @@ -310,7 +279,7 @@ func (c *rbacServiceClient) UpdateRoleResource(ctx context.Context, in *UpdateRo func (c *rbacServiceClient) GetPermRole(ctx context.Context, in *PermRoleId, opts ...grpc.CallOption) (*SPermRole, error) { out := new(SPermRole) - err := c.cc.Invoke(ctx, RbacService_GetPermRole_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetPermRole", in, out, opts...) if err != nil { return nil, err } @@ -319,7 +288,7 @@ func (c *rbacServiceClient) GetPermRole(ctx context.Context, in *PermRoleId, opt func (c *rbacServiceClient) QueryPermRoleList(ctx context.Context, in *QueryPermRoleRequest, opts ...grpc.CallOption) (*QueryPermRoleResponse, error) { out := new(QueryPermRoleResponse) - err := c.cc.Invoke(ctx, RbacService_QueryPermRoleList_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/QueryPermRoleList", in, out, opts...) if err != nil { return nil, err } @@ -328,7 +297,7 @@ func (c *rbacServiceClient) QueryPermRoleList(ctx context.Context, in *QueryPerm func (c *rbacServiceClient) DeletePermRole(ctx context.Context, in *PermRoleId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_DeletePermRole_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DeletePermRole", in, out, opts...) if err != nil { return nil, err } @@ -337,7 +306,7 @@ func (c *rbacServiceClient) DeletePermRole(ctx context.Context, in *PermRoleId, func (c *rbacServiceClient) PagingPermRole(ctx context.Context, in *PermRolePagingRequest, opts ...grpc.CallOption) (*PermRolePagingResponse, error) { out := new(PermRolePagingResponse) - err := c.cc.Invoke(ctx, RbacService_PagingPermRole_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/PagingPermRole", in, out, opts...) if err != nil { return nil, err } @@ -346,7 +315,7 @@ func (c *rbacServiceClient) PagingPermRole(ctx context.Context, in *PermRolePagi func (c *rbacServiceClient) SavePermRes(ctx context.Context, in *SavePermResRequest, opts ...grpc.CallOption) (*SavePermResResponse, error) { out := new(SavePermResResponse) - err := c.cc.Invoke(ctx, RbacService_SavePermRes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/SavePermRes", in, out, opts...) if err != nil { return nil, err } @@ -355,7 +324,7 @@ func (c *rbacServiceClient) SavePermRes(ctx context.Context, in *SavePermResRequ func (c *rbacServiceClient) GetPermRes(ctx context.Context, in *PermResId, opts ...grpc.CallOption) (*SPermRes, error) { out := new(SPermRes) - err := c.cc.Invoke(ctx, RbacService_GetPermRes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/GetPermRes", in, out, opts...) if err != nil { return nil, err } @@ -364,7 +333,7 @@ func (c *rbacServiceClient) GetPermRes(ctx context.Context, in *PermResId, opts func (c *rbacServiceClient) DeletePermRes(ctx context.Context, in *PermResId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RbacService_DeletePermRes_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RbacService/DeletePermRes", in, out, opts...) if err != nil { return nil, err } @@ -545,7 +514,7 @@ func _RbacService_UserLogin_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_UserLogin_FullMethodName, + FullMethod: "/RbacService/UserLogin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).UserLogin(ctx, req.(*RbacLoginRequest)) @@ -563,7 +532,7 @@ func _RbacService_CheckRBACToken_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_CheckRBACToken_FullMethodName, + FullMethod: "/RbacService/CheckRBACToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).CheckRBACToken(ctx, req.(*CheckRBACTokenRequest)) @@ -581,7 +550,7 @@ func _RbacService_GetJwtToken_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetJwtToken_FullMethodName, + FullMethod: "/RbacService/GetJwtToken", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetJwtToken(ctx, req.(*Empty)) @@ -599,7 +568,7 @@ func _RbacService_GetUserResource_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetUserResource_FullMethodName, + FullMethod: "/RbacService/GetUserResource", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetUserResource(ctx, req.(*GetUserResRequest)) @@ -617,7 +586,7 @@ func _RbacService_QueryResList_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_QueryResList_FullMethodName, + FullMethod: "/RbacService/QueryResList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryResList(ctx, req.(*QueryPermResRequest)) @@ -635,7 +604,7 @@ func _RbacService_MoveResOrdinal_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_MoveResOrdinal_FullMethodName, + FullMethod: "/RbacService/MoveResOrdinal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).MoveResOrdinal(ctx, req.(*MoveResOrdinalRequest)) @@ -653,7 +622,7 @@ func _RbacService_DepartTree_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DepartTree_FullMethodName, + FullMethod: "/RbacService/DepartTree", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DepartTree(ctx, req.(*Empty)) @@ -671,7 +640,7 @@ func _RbacService_SavePermDept_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_SavePermDept_FullMethodName, + FullMethod: "/RbacService/SavePermDept", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermDept(ctx, req.(*SavePermDeptRequest)) @@ -689,7 +658,7 @@ func _RbacService_GetPermDept_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetPermDept_FullMethodName, + FullMethod: "/RbacService/GetPermDept", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermDept(ctx, req.(*PermDeptId)) @@ -707,7 +676,7 @@ func _RbacService_DeletePermDept_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DeletePermDept_FullMethodName, + FullMethod: "/RbacService/DeletePermDept", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermDept(ctx, req.(*PermDeptId)) @@ -725,7 +694,7 @@ func _RbacService_SavePermJob_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_SavePermJob_FullMethodName, + FullMethod: "/RbacService/SavePermJob", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermJob(ctx, req.(*SavePermJobRequest)) @@ -743,7 +712,7 @@ func _RbacService_GetPermJob_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetPermJob_FullMethodName, + FullMethod: "/RbacService/GetPermJob", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermJob(ctx, req.(*PermJobId)) @@ -761,7 +730,7 @@ func _RbacService_QueryPermJobList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_QueryPermJobList_FullMethodName, + FullMethod: "/RbacService/QueryPermJobList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryPermJobList(ctx, req.(*QueryPermJobRequest)) @@ -779,7 +748,7 @@ func _RbacService_DeletePermJob_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DeletePermJob_FullMethodName, + FullMethod: "/RbacService/DeletePermJob", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermJob(ctx, req.(*PermJobId)) @@ -797,7 +766,7 @@ func _RbacService_PagingPermJob_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_PagingPermJob_FullMethodName, + FullMethod: "/RbacService/PagingPermJob", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermJob(ctx, req.(*PermJobPagingRequest)) @@ -815,7 +784,7 @@ func _RbacService_SavePermUser_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_SavePermUser_FullMethodName, + FullMethod: "/RbacService/SavePermUser", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermUser(ctx, req.(*SavePermUserRequest)) @@ -833,7 +802,7 @@ func _RbacService_GetPermUser_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetPermUser_FullMethodName, + FullMethod: "/RbacService/GetPermUser", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermUser(ctx, req.(*PermUserId)) @@ -851,7 +820,7 @@ func _RbacService_DeletePermUser_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DeletePermUser_FullMethodName, + FullMethod: "/RbacService/DeletePermUser", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermUser(ctx, req.(*PermUserId)) @@ -869,7 +838,7 @@ func _RbacService_PagingPermUser_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_PagingPermUser_FullMethodName, + FullMethod: "/RbacService/PagingPermUser", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermUser(ctx, req.(*PermUserPagingRequest)) @@ -887,7 +856,7 @@ func _RbacService_SavePermRole_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_SavePermRole_FullMethodName, + FullMethod: "/RbacService/SavePermRole", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermRole(ctx, req.(*SavePermRoleRequest)) @@ -905,7 +874,7 @@ func _RbacService_UpdateRoleResource_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_UpdateRoleResource_FullMethodName, + FullMethod: "/RbacService/UpdateRoleResource", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).UpdateRoleResource(ctx, req.(*UpdateRoleResRequest)) @@ -923,7 +892,7 @@ func _RbacService_GetPermRole_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetPermRole_FullMethodName, + FullMethod: "/RbacService/GetPermRole", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermRole(ctx, req.(*PermRoleId)) @@ -941,7 +910,7 @@ func _RbacService_QueryPermRoleList_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_QueryPermRoleList_FullMethodName, + FullMethod: "/RbacService/QueryPermRoleList", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryPermRoleList(ctx, req.(*QueryPermRoleRequest)) @@ -959,7 +928,7 @@ func _RbacService_DeletePermRole_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DeletePermRole_FullMethodName, + FullMethod: "/RbacService/DeletePermRole", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermRole(ctx, req.(*PermRoleId)) @@ -977,7 +946,7 @@ func _RbacService_PagingPermRole_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_PagingPermRole_FullMethodName, + FullMethod: "/RbacService/PagingPermRole", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermRole(ctx, req.(*PermRolePagingRequest)) @@ -995,7 +964,7 @@ func _RbacService_SavePermRes_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_SavePermRes_FullMethodName, + FullMethod: "/RbacService/SavePermRes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermRes(ctx, req.(*SavePermResRequest)) @@ -1013,7 +982,7 @@ func _RbacService_GetPermRes_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_GetPermRes_FullMethodName, + FullMethod: "/RbacService/GetPermRes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermRes(ctx, req.(*PermResId)) @@ -1031,7 +1000,7 @@ func _RbacService_DeletePermRes_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RbacService_DeletePermRes_FullMethodName, + FullMethod: "/RbacService/DeletePermRes", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermRes(ctx, req.(*PermResId)) diff --git a/core/service/proto/registry_service.pb.go b/core/service/proto/registry_service.pb.go index f0bdbfbaa..df4f58956 100644 --- a/core/service/proto/registry_service.pb.go +++ b/core/service/proto/registry_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: registry_service.proto package proto diff --git a/core/service/proto/registry_service_grpc.pb.go b/core/service/proto/registry_service_grpc.pb.go index 8ade408f5..40b6d849d 100644 --- a/core/service/proto/registry_service_grpc.pb.go +++ b/core/service/proto/registry_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: registry_service.proto package proto @@ -18,19 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - RegistryService_GetGroups_FullMethodName = "/RegistryService/GetGroups" - RegistryService_GetRegistry_FullMethodName = "/RegistryService/GetRegistry" - RegistryService_GetValue_FullMethodName = "/RegistryService/GetValue" - RegistryService_UpdateValue_FullMethodName = "/RegistryService/UpdateValue" - RegistryService_GetValues_FullMethodName = "/RegistryService/GetValues" - RegistryService_UpdateValues_FullMethodName = "/RegistryService/UpdateValues" - RegistryService_Search_FullMethodName = "/RegistryService/Search" - RegistryService_FindRegistries_FullMethodName = "/RegistryService/FindRegistries" - RegistryService_SearchRegistry_FullMethodName = "/RegistryService/SearchRegistry" - RegistryService_CreateRegistry_FullMethodName = "/RegistryService/CreateRegistry" -) - // RegistryServiceClient is the client API for RegistryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -67,7 +54,7 @@ func NewRegistryServiceClient(cc grpc.ClientConnInterface) RegistryServiceClient func (c *registryServiceClient) GetGroups(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*RegistryGroupResponse, error) { out := new(RegistryGroupResponse) - err := c.cc.Invoke(ctx, RegistryService_GetGroups_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/GetGroups", in, out, opts...) if err != nil { return nil, err } @@ -76,7 +63,7 @@ func (c *registryServiceClient) GetGroups(ctx context.Context, in *Empty, opts . func (c *registryServiceClient) GetRegistry(ctx context.Context, in *String, opts ...grpc.CallOption) (*SRegistry, error) { out := new(SRegistry) - err := c.cc.Invoke(ctx, RegistryService_GetRegistry_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/GetRegistry", in, out, opts...) if err != nil { return nil, err } @@ -85,7 +72,7 @@ func (c *registryServiceClient) GetRegistry(ctx context.Context, in *String, opt func (c *registryServiceClient) GetValue(ctx context.Context, in *String, opts ...grpc.CallOption) (*RegistryValueResponse, error) { out := new(RegistryValueResponse) - err := c.cc.Invoke(ctx, RegistryService_GetValue_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/GetValue", in, out, opts...) if err != nil { return nil, err } @@ -94,7 +81,7 @@ func (c *registryServiceClient) GetValue(ctx context.Context, in *String, opts . func (c *registryServiceClient) UpdateValue(ctx context.Context, in *RegistryPair, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RegistryService_UpdateValue_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/UpdateValue", in, out, opts...) if err != nil { return nil, err } @@ -103,7 +90,7 @@ func (c *registryServiceClient) UpdateValue(ctx context.Context, in *RegistryPai func (c *registryServiceClient) GetValues(ctx context.Context, in *StringArray, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, RegistryService_GetValues_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/GetValues", in, out, opts...) if err != nil { return nil, err } @@ -112,7 +99,7 @@ func (c *registryServiceClient) GetValues(ctx context.Context, in *StringArray, func (c *registryServiceClient) UpdateValues(ctx context.Context, in *StringMap, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RegistryService_UpdateValues_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/UpdateValues", in, out, opts...) if err != nil { return nil, err } @@ -121,7 +108,7 @@ func (c *registryServiceClient) UpdateValues(ctx context.Context, in *StringMap, func (c *registryServiceClient) Search(ctx context.Context, in *RegistrySearchRequest, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, RegistryService_Search_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/Search", in, out, opts...) if err != nil { return nil, err } @@ -130,7 +117,7 @@ func (c *registryServiceClient) Search(ctx context.Context, in *RegistrySearchRe func (c *registryServiceClient) FindRegistries(ctx context.Context, in *String, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, RegistryService_FindRegistries_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/FindRegistries", in, out, opts...) if err != nil { return nil, err } @@ -139,7 +126,7 @@ func (c *registryServiceClient) FindRegistries(ctx context.Context, in *String, func (c *registryServiceClient) SearchRegistry(ctx context.Context, in *String, opts ...grpc.CallOption) (*RegistriesResponse, error) { out := new(RegistriesResponse) - err := c.cc.Invoke(ctx, RegistryService_SearchRegistry_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/SearchRegistry", in, out, opts...) if err != nil { return nil, err } @@ -148,7 +135,7 @@ func (c *registryServiceClient) SearchRegistry(ctx context.Context, in *String, func (c *registryServiceClient) CreateRegistry(ctx context.Context, in *RegistryCreateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, RegistryService_CreateRegistry_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/RegistryService/CreateRegistry", in, out, opts...) if err != nil { return nil, err } @@ -239,7 +226,7 @@ func _RegistryService_GetGroups_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_GetGroups_FullMethodName, + FullMethod: "/RegistryService/GetGroups", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetGroups(ctx, req.(*Empty)) @@ -257,7 +244,7 @@ func _RegistryService_GetRegistry_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_GetRegistry_FullMethodName, + FullMethod: "/RegistryService/GetRegistry", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetRegistry(ctx, req.(*String)) @@ -275,7 +262,7 @@ func _RegistryService_GetValue_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_GetValue_FullMethodName, + FullMethod: "/RegistryService/GetValue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetValue(ctx, req.(*String)) @@ -293,7 +280,7 @@ func _RegistryService_UpdateValue_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_UpdateValue_FullMethodName, + FullMethod: "/RegistryService/UpdateValue", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).UpdateValue(ctx, req.(*RegistryPair)) @@ -311,7 +298,7 @@ func _RegistryService_GetValues_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_GetValues_FullMethodName, + FullMethod: "/RegistryService/GetValues", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetValues(ctx, req.(*StringArray)) @@ -329,7 +316,7 @@ func _RegistryService_UpdateValues_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_UpdateValues_FullMethodName, + FullMethod: "/RegistryService/UpdateValues", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).UpdateValues(ctx, req.(*StringMap)) @@ -347,7 +334,7 @@ func _RegistryService_Search_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_Search_FullMethodName, + FullMethod: "/RegistryService/Search", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).Search(ctx, req.(*RegistrySearchRequest)) @@ -365,7 +352,7 @@ func _RegistryService_FindRegistries_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_FindRegistries_FullMethodName, + FullMethod: "/RegistryService/FindRegistries", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).FindRegistries(ctx, req.(*String)) @@ -383,7 +370,7 @@ func _RegistryService_SearchRegistry_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_SearchRegistry_FullMethodName, + FullMethod: "/RegistryService/SearchRegistry", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).SearchRegistry(ctx, req.(*String)) @@ -401,7 +388,7 @@ func _RegistryService_CreateRegistry_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: RegistryService_CreateRegistry_FullMethodName, + FullMethod: "/RegistryService/CreateRegistry", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).CreateRegistry(ctx, req.(*RegistryCreateRequest)) diff --git a/core/service/proto/shipment_dto.pb.go b/core/service/proto/shipment_dto.pb.go index 98e8b9d20..8678fd4a6 100644 --- a/core/service/proto/shipment_dto.pb.go +++ b/core/service/proto/shipment_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/shipment_dto.proto package proto diff --git a/core/service/proto/shipment_service.pb.go b/core/service/proto/shipment_service.pb.go index 84c1daa01..822726103 100644 --- a/core/service/proto/shipment_service.pb.go +++ b/core/service/proto/shipment_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: shipment_service.proto package proto diff --git a/core/service/proto/shipment_service_grpc.pb.go b/core/service/proto/shipment_service_grpc.pb.go index 3d3afba11..1d759a5e2 100644 --- a/core/service/proto/shipment_service_grpc.pb.go +++ b/core/service/proto/shipment_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: shipment_service.proto package proto @@ -18,13 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ShipmentService_CreateCoverageArea__FullMethodName = "/ShipmentService/CreateCoverageArea_" - ShipmentService_GetOrderShipments_FullMethodName = "/ShipmentService/GetOrderShipments" - ShipmentService_GetLogisticFlowTrack_FullMethodName = "/ShipmentService/GetLogisticFlowTrack" - ShipmentService_ShipOrderLogisticTrack_FullMethodName = "/ShipmentService/ShipOrderLogisticTrack" -) - // ShipmentServiceClient is the client API for ShipmentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -49,7 +42,7 @@ func NewShipmentServiceClient(cc grpc.ClientConnInterface) ShipmentServiceClient func (c *shipmentServiceClient) CreateCoverageArea_(ctx context.Context, in *SCoverageValue, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ShipmentService_CreateCoverageArea__FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShipmentService/CreateCoverageArea_", in, out, opts...) if err != nil { return nil, err } @@ -58,7 +51,7 @@ func (c *shipmentServiceClient) CreateCoverageArea_(ctx context.Context, in *SCo func (c *shipmentServiceClient) GetOrderShipments(ctx context.Context, in *OrderId, opts ...grpc.CallOption) (*ShipmentOrderListResponse, error) { out := new(ShipmentOrderListResponse) - err := c.cc.Invoke(ctx, ShipmentService_GetOrderShipments_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShipmentService/GetOrderShipments", in, out, opts...) if err != nil { return nil, err } @@ -67,7 +60,7 @@ func (c *shipmentServiceClient) GetOrderShipments(ctx context.Context, in *Order func (c *shipmentServiceClient) GetLogisticFlowTrack(ctx context.Context, in *LogisticFlowTrackRequest, opts ...grpc.CallOption) (*SShipOrderTrack, error) { out := new(SShipOrderTrack) - err := c.cc.Invoke(ctx, ShipmentService_GetLogisticFlowTrack_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShipmentService/GetLogisticFlowTrack", in, out, opts...) if err != nil { return nil, err } @@ -76,7 +69,7 @@ func (c *shipmentServiceClient) GetLogisticFlowTrack(ctx context.Context, in *Lo func (c *shipmentServiceClient) ShipOrderLogisticTrack(ctx context.Context, in *OrderLogisticTrackRequest, opts ...grpc.CallOption) (*SShipOrderTrack, error) { out := new(SShipOrderTrack) - err := c.cc.Invoke(ctx, ShipmentService_ShipOrderLogisticTrack_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShipmentService/ShipOrderLogisticTrack", in, out, opts...) if err != nil { return nil, err } @@ -137,7 +130,7 @@ func _ShipmentService_CreateCoverageArea__Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShipmentService_CreateCoverageArea__FullMethodName, + FullMethod: "/ShipmentService/CreateCoverageArea_", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).CreateCoverageArea_(ctx, req.(*SCoverageValue)) @@ -155,7 +148,7 @@ func _ShipmentService_GetOrderShipments_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShipmentService_GetOrderShipments_FullMethodName, + FullMethod: "/ShipmentService/GetOrderShipments", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).GetOrderShipments(ctx, req.(*OrderId)) @@ -173,7 +166,7 @@ func _ShipmentService_GetLogisticFlowTrack_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShipmentService_GetLogisticFlowTrack_FullMethodName, + FullMethod: "/ShipmentService/GetLogisticFlowTrack", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).GetLogisticFlowTrack(ctx, req.(*LogisticFlowTrackRequest)) @@ -191,7 +184,7 @@ func _ShipmentService_ShipOrderLogisticTrack_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShipmentService_ShipOrderLogisticTrack_FullMethodName, + FullMethod: "/ShipmentService/ShipOrderLogisticTrack", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).ShipOrderLogisticTrack(ctx, req.(*OrderLogisticTrackRequest)) diff --git a/core/service/proto/shop_service.pb.go b/core/service/proto/shop_service.pb.go index 34d6cbf87..2f6bd75af 100644 --- a/core/service/proto/shop_service.pb.go +++ b/core/service/proto/shop_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: shop_service.proto package proto diff --git a/core/service/proto/shop_service_grpc.pb.go b/core/service/proto/shop_service_grpc.pb.go index ac0f2a96f..64c5270d0 100644 --- a/core/service/proto/shop_service_grpc.pb.go +++ b/core/service/proto/shop_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: shop_service.proto package proto @@ -18,19 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - ShopService_GetShop_FullMethodName = "/ShopService/GetShop" - ShopService_GetSelfSupportShops_FullMethodName = "/ShopService/GetSelfSupportShops" - ShopService_QueryShopId_FullMethodName = "/ShopService/QueryShopId" - ShopService_CheckMerchantShopState_FullMethodName = "/ShopService/CheckMerchantShopState" - ShopService_GetStore_FullMethodName = "/ShopService/GetStore" - ShopService_QueryShopByHost_FullMethodName = "/ShopService/QueryShopByHost" - ShopService_TurnShop_FullMethodName = "/ShopService/TurnShop" - ShopService_SaveShop_FullMethodName = "/ShopService/SaveShop" - ShopService_SaveOfflineShop_FullMethodName = "/ShopService/SaveOfflineShop" - ShopService_DeleteStore_FullMethodName = "/ShopService/DeleteStore" -) - // ShopServiceClient is the client API for ShopService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -70,7 +57,7 @@ func NewShopServiceClient(cc grpc.ClientConnInterface) ShopServiceClient { func (c *shopServiceClient) GetShop(ctx context.Context, in *GetShopIdRequest, opts ...grpc.CallOption) (*SShop, error) { out := new(SShop) - err := c.cc.Invoke(ctx, ShopService_GetShop_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/GetShop", in, out, opts...) if err != nil { return nil, err } @@ -79,7 +66,7 @@ func (c *shopServiceClient) GetShop(ctx context.Context, in *GetShopIdRequest, o func (c *shopServiceClient) GetSelfSupportShops(ctx context.Context, in *SelfSupportShopRequest, opts ...grpc.CallOption) (*ShopListResponse, error) { out := new(ShopListResponse) - err := c.cc.Invoke(ctx, ShopService_GetSelfSupportShops_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/GetSelfSupportShops", in, out, opts...) if err != nil { return nil, err } @@ -88,7 +75,7 @@ func (c *shopServiceClient) GetSelfSupportShops(ctx context.Context, in *SelfSup func (c *shopServiceClient) QueryShopId(ctx context.Context, in *ShopAliasRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, ShopService_QueryShopId_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/QueryShopId", in, out, opts...) if err != nil { return nil, err } @@ -97,7 +84,7 @@ func (c *shopServiceClient) QueryShopId(ctx context.Context, in *ShopAliasReques func (c *shopServiceClient) CheckMerchantShopState(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*CheckShopResponse, error) { out := new(CheckShopResponse) - err := c.cc.Invoke(ctx, ShopService_CheckMerchantShopState_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/CheckMerchantShopState", in, out, opts...) if err != nil { return nil, err } @@ -106,7 +93,7 @@ func (c *shopServiceClient) CheckMerchantShopState(ctx context.Context, in *Merc func (c *shopServiceClient) GetStore(ctx context.Context, in *StoreId, opts ...grpc.CallOption) (*SStore, error) { out := new(SStore) - err := c.cc.Invoke(ctx, ShopService_GetStore_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/GetStore", in, out, opts...) if err != nil { return nil, err } @@ -115,7 +102,7 @@ func (c *shopServiceClient) GetStore(ctx context.Context, in *StoreId, opts ...g func (c *shopServiceClient) QueryShopByHost(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, ShopService_QueryShopByHost_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/QueryShopByHost", in, out, opts...) if err != nil { return nil, err } @@ -124,7 +111,7 @@ func (c *shopServiceClient) QueryShopByHost(ctx context.Context, in *String, opt func (c *shopServiceClient) TurnShop(ctx context.Context, in *TurnShopRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ShopService_TurnShop_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/TurnShop", in, out, opts...) if err != nil { return nil, err } @@ -133,7 +120,7 @@ func (c *shopServiceClient) TurnShop(ctx context.Context, in *TurnShopRequest, o func (c *shopServiceClient) SaveShop(ctx context.Context, in *SShop, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ShopService_SaveShop_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/SaveShop", in, out, opts...) if err != nil { return nil, err } @@ -142,7 +129,7 @@ func (c *shopServiceClient) SaveShop(ctx context.Context, in *SShop, opts ...grp func (c *shopServiceClient) SaveOfflineShop(ctx context.Context, in *SStore, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ShopService_SaveOfflineShop_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/SaveOfflineShop", in, out, opts...) if err != nil { return nil, err } @@ -151,7 +138,7 @@ func (c *shopServiceClient) SaveOfflineShop(ctx context.Context, in *SStore, opt func (c *shopServiceClient) DeleteStore(ctx context.Context, in *StoreId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, ShopService_DeleteStore_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/ShopService/DeleteStore", in, out, opts...) if err != nil { return nil, err } @@ -245,7 +232,7 @@ func _ShopService_GetShop_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_GetShop_FullMethodName, + FullMethod: "/ShopService/GetShop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetShop(ctx, req.(*GetShopIdRequest)) @@ -263,7 +250,7 @@ func _ShopService_GetSelfSupportShops_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_GetSelfSupportShops_FullMethodName, + FullMethod: "/ShopService/GetSelfSupportShops", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetSelfSupportShops(ctx, req.(*SelfSupportShopRequest)) @@ -281,7 +268,7 @@ func _ShopService_QueryShopId_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_QueryShopId_FullMethodName, + FullMethod: "/ShopService/QueryShopId", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).QueryShopId(ctx, req.(*ShopAliasRequest)) @@ -299,7 +286,7 @@ func _ShopService_CheckMerchantShopState_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_CheckMerchantShopState_FullMethodName, + FullMethod: "/ShopService/CheckMerchantShopState", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).CheckMerchantShopState(ctx, req.(*MerchantId)) @@ -317,7 +304,7 @@ func _ShopService_GetStore_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_GetStore_FullMethodName, + FullMethod: "/ShopService/GetStore", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetStore(ctx, req.(*StoreId)) @@ -335,7 +322,7 @@ func _ShopService_QueryShopByHost_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_QueryShopByHost_FullMethodName, + FullMethod: "/ShopService/QueryShopByHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).QueryShopByHost(ctx, req.(*String)) @@ -353,7 +340,7 @@ func _ShopService_TurnShop_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_TurnShop_FullMethodName, + FullMethod: "/ShopService/TurnShop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).TurnShop(ctx, req.(*TurnShopRequest)) @@ -371,7 +358,7 @@ func _ShopService_SaveShop_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_SaveShop_FullMethodName, + FullMethod: "/ShopService/SaveShop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).SaveShop(ctx, req.(*SShop)) @@ -389,7 +376,7 @@ func _ShopService_SaveOfflineShop_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_SaveOfflineShop_FullMethodName, + FullMethod: "/ShopService/SaveOfflineShop", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).SaveOfflineShop(ctx, req.(*SStore)) @@ -407,7 +394,7 @@ func _ShopService_DeleteStore_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ShopService_DeleteStore_FullMethodName, + FullMethod: "/ShopService/DeleteStore", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).DeleteStore(ctx, req.(*StoreId)) diff --git a/core/service/proto/status_service.pb.go b/core/service/proto/status_service.pb.go index 471261e84..77fe2b311 100644 --- a/core/service/proto/status_service.pb.go +++ b/core/service/proto/status_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: status_service.proto package proto diff --git a/core/service/proto/status_service_grpc.pb.go b/core/service/proto/status_service_grpc.pb.go index a828d53cf..11f1419c2 100644 --- a/core/service/proto/status_service_grpc.pb.go +++ b/core/service/proto/status_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: status_service.proto package proto @@ -18,10 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - StatusService_Ping_FullMethodName = "/StatusService/Ping" -) - // StatusServiceClient is the client API for StatusService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -40,7 +36,7 @@ func NewStatusServiceClient(cc grpc.ClientConnInterface) StatusServiceClient { func (c *statusServiceClient) Ping(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, StatusService_Ping_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/StatusService/Ping", in, out, opts...) if err != nil { return nil, err } @@ -86,7 +82,7 @@ func _StatusService_Ping_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: StatusService_Ping_FullMethodName, + FullMethod: "/StatusService/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(StatusServiceServer).Ping(ctx, req.(*Empty)) diff --git a/core/service/proto/test.pb.go b/core/service/proto/test.pb.go index d0aae8dfe..4967385d7 100644 --- a/core/service/proto/test.pb.go +++ b/core/service/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: test.proto package proto diff --git a/core/service/proto/test_grpc.pb.go b/core/service/proto/test_grpc.pb.go index ab2a91427..ae30afae9 100644 --- a/core/service/proto/test_grpc.pb.go +++ b/core/service/proto/test_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: test.proto package proto @@ -18,10 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - GreeterService_Hello_FullMethodName = "/GreeterService/Hello" -) - // GreeterServiceClient is the client API for GreeterService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -39,7 +35,7 @@ func NewGreeterServiceClient(cc grpc.ClientConnInterface) GreeterServiceClient { func (c *greeterServiceClient) Hello(ctx context.Context, in *User1, opts ...grpc.CallOption) (*UserResponse, error) { out := new(UserResponse) - err := c.cc.Invoke(ctx, GreeterService_Hello_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/GreeterService/Hello", in, out, opts...) if err != nil { return nil, err } @@ -84,7 +80,7 @@ func _GreeterService_Hello_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: GreeterService_Hello_FullMethodName, + FullMethod: "/GreeterService/Hello", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(GreeterServiceServer).Hello(ctx, req.(*User1)) diff --git a/core/service/proto/wallet_dto.pb.go b/core/service/proto/wallet_dto.pb.go index 70fc85c5e..0333ebc93 100644 --- a/core/service/proto/wallet_dto.pb.go +++ b/core/service/proto/wallet_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: message/wallet_dto.proto package proto diff --git a/core/service/proto/wallet_service.pb.go b/core/service/proto/wallet_service.pb.go index 4494d247f..3fdb0a8e9 100644 --- a/core/service/proto/wallet_service.pb.go +++ b/core/service/proto/wallet_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.21.12 // source: wallet_service.proto package proto diff --git a/core/service/proto/wallet_service_grpc.pb.go b/core/service/proto/wallet_service_grpc.pb.go index 856f3da7d..9907c1ed0 100644 --- a/core/service/proto/wallet_service_grpc.pb.go +++ b/core/service/proto/wallet_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.12 // source: wallet_service.proto package proto @@ -18,24 +18,6 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -const ( - WalletService_CreateWallet_FullMethodName = "/WalletService/CreateWallet" - WalletService_GetWalletId_FullMethodName = "/WalletService/GetWalletId" - WalletService_GetWallet_FullMethodName = "/WalletService/GetWallet" - WalletService_GetWalletByCode_FullMethodName = "/WalletService/GetWalletByCode" - WalletService_GetWalletLog_FullMethodName = "/WalletService/GetWalletLog" - WalletService_Adjust_FullMethodName = "/WalletService/Adjust" - WalletService_Discount_FullMethodName = "/WalletService/Discount" - WalletService_Freeze_FullMethodName = "/WalletService/Freeze" - WalletService_Unfreeze_FullMethodName = "/WalletService/Unfreeze" - WalletService_Charge_FullMethodName = "/WalletService/Charge" - WalletService_Transfer_FullMethodName = "/WalletService/Transfer" - WalletService_RequestWithdrawal_FullMethodName = "/WalletService/RequestWithdrawal" - WalletService_ReviewTakeOut_FullMethodName = "/WalletService/ReviewTakeOut" - WalletService_FinishWithdrawal_FullMethodName = "/WalletService/FinishWithdrawal" - WalletService_PagingWalletLog_FullMethodName = "/WalletService/PagingWalletLog" -) - // WalletServiceClient is the client API for WalletService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -82,7 +64,7 @@ func NewWalletServiceClient(cc grpc.ClientConnInterface) WalletServiceClient { func (c *walletServiceClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_CreateWallet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/CreateWallet", in, out, opts...) if err != nil { return nil, err } @@ -91,7 +73,7 @@ func (c *walletServiceClient) CreateWallet(ctx context.Context, in *CreateWallet func (c *walletServiceClient) GetWalletId(ctx context.Context, in *GetWalletRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, WalletService_GetWalletId_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/GetWalletId", in, out, opts...) if err != nil { return nil, err } @@ -100,7 +82,7 @@ func (c *walletServiceClient) GetWalletId(ctx context.Context, in *GetWalletRequ func (c *walletServiceClient) GetWallet(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SWallet, error) { out := new(SWallet) - err := c.cc.Invoke(ctx, WalletService_GetWallet_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/GetWallet", in, out, opts...) if err != nil { return nil, err } @@ -109,7 +91,7 @@ func (c *walletServiceClient) GetWallet(ctx context.Context, in *Int64, opts ... func (c *walletServiceClient) GetWalletByCode(ctx context.Context, in *String, opts ...grpc.CallOption) (*SWallet, error) { out := new(SWallet) - err := c.cc.Invoke(ctx, WalletService_GetWalletByCode_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/GetWalletByCode", in, out, opts...) if err != nil { return nil, err } @@ -118,7 +100,7 @@ func (c *walletServiceClient) GetWalletByCode(ctx context.Context, in *String, o func (c *walletServiceClient) GetWalletLog(ctx context.Context, in *WalletLogIDRequest, opts ...grpc.CallOption) (*SWalletLog, error) { out := new(SWalletLog) - err := c.cc.Invoke(ctx, WalletService_GetWalletLog_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/GetWalletLog", in, out, opts...) if err != nil { return nil, err } @@ -127,7 +109,7 @@ func (c *walletServiceClient) GetWalletLog(ctx context.Context, in *WalletLogIDR func (c *walletServiceClient) Adjust(ctx context.Context, in *AdjustRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_Adjust_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Adjust", in, out, opts...) if err != nil { return nil, err } @@ -136,7 +118,7 @@ func (c *walletServiceClient) Adjust(ctx context.Context, in *AdjustRequest, opt func (c *walletServiceClient) Discount(ctx context.Context, in *DiscountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_Discount_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Discount", in, out, opts...) if err != nil { return nil, err } @@ -145,7 +127,7 @@ func (c *walletServiceClient) Discount(ctx context.Context, in *DiscountRequest, func (c *walletServiceClient) Freeze(ctx context.Context, in *FreezeRequest, opts ...grpc.CallOption) (*FreezeResponse, error) { out := new(FreezeResponse) - err := c.cc.Invoke(ctx, WalletService_Freeze_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Freeze", in, out, opts...) if err != nil { return nil, err } @@ -154,7 +136,7 @@ func (c *walletServiceClient) Freeze(ctx context.Context, in *FreezeRequest, opt func (c *walletServiceClient) Unfreeze(ctx context.Context, in *UnfreezeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_Unfreeze_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Unfreeze", in, out, opts...) if err != nil { return nil, err } @@ -163,7 +145,7 @@ func (c *walletServiceClient) Unfreeze(ctx context.Context, in *UnfreezeRequest, func (c *walletServiceClient) Charge(ctx context.Context, in *ChargeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_Charge_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Charge", in, out, opts...) if err != nil { return nil, err } @@ -172,7 +154,7 @@ func (c *walletServiceClient) Charge(ctx context.Context, in *ChargeRequest, opt func (c *walletServiceClient) Transfer(ctx context.Context, in *TransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_Transfer_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/Transfer", in, out, opts...) if err != nil { return nil, err } @@ -181,7 +163,7 @@ func (c *walletServiceClient) Transfer(ctx context.Context, in *TransferRequest, func (c *walletServiceClient) RequestWithdrawal(ctx context.Context, in *RequestWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_RequestWithdrawal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/RequestWithdrawal", in, out, opts...) if err != nil { return nil, err } @@ -190,7 +172,7 @@ func (c *walletServiceClient) RequestWithdrawal(ctx context.Context, in *Request func (c *walletServiceClient) ReviewTakeOut(ctx context.Context, in *ReviewTakeOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_ReviewTakeOut_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/ReviewTakeOut", in, out, opts...) if err != nil { return nil, err } @@ -199,7 +181,7 @@ func (c *walletServiceClient) ReviewTakeOut(ctx context.Context, in *ReviewTakeO func (c *walletServiceClient) FinishWithdrawal(ctx context.Context, in *FinishTakeOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, WalletService_FinishWithdrawal_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/FinishWithdrawal", in, out, opts...) if err != nil { return nil, err } @@ -208,7 +190,7 @@ func (c *walletServiceClient) FinishWithdrawal(ctx context.Context, in *FinishTa func (c *walletServiceClient) PagingWalletLog(ctx context.Context, in *PagingWalletLogRequest, opts ...grpc.CallOption) (*SPagingResult, error) { out := new(SPagingResult) - err := c.cc.Invoke(ctx, WalletService_PagingWalletLog_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, "/WalletService/PagingWalletLog", in, out, opts...) if err != nil { return nil, err } @@ -324,7 +306,7 @@ func _WalletService_CreateWallet_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_CreateWallet_FullMethodName, + FullMethod: "/WalletService/CreateWallet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).CreateWallet(ctx, req.(*CreateWalletRequest)) @@ -342,7 +324,7 @@ func _WalletService_GetWalletId_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_GetWalletId_FullMethodName, + FullMethod: "/WalletService/GetWalletId", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletId(ctx, req.(*GetWalletRequest)) @@ -360,7 +342,7 @@ func _WalletService_GetWallet_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_GetWallet_FullMethodName, + FullMethod: "/WalletService/GetWallet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWallet(ctx, req.(*Int64)) @@ -378,7 +360,7 @@ func _WalletService_GetWalletByCode_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_GetWalletByCode_FullMethodName, + FullMethod: "/WalletService/GetWalletByCode", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletByCode(ctx, req.(*String)) @@ -396,7 +378,7 @@ func _WalletService_GetWalletLog_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_GetWalletLog_FullMethodName, + FullMethod: "/WalletService/GetWalletLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletLog(ctx, req.(*WalletLogIDRequest)) @@ -414,7 +396,7 @@ func _WalletService_Adjust_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Adjust_FullMethodName, + FullMethod: "/WalletService/Adjust", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Adjust(ctx, req.(*AdjustRequest)) @@ -432,7 +414,7 @@ func _WalletService_Discount_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Discount_FullMethodName, + FullMethod: "/WalletService/Discount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Discount(ctx, req.(*DiscountRequest)) @@ -450,7 +432,7 @@ func _WalletService_Freeze_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Freeze_FullMethodName, + FullMethod: "/WalletService/Freeze", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Freeze(ctx, req.(*FreezeRequest)) @@ -468,7 +450,7 @@ func _WalletService_Unfreeze_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Unfreeze_FullMethodName, + FullMethod: "/WalletService/Unfreeze", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Unfreeze(ctx, req.(*UnfreezeRequest)) @@ -486,7 +468,7 @@ func _WalletService_Charge_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Charge_FullMethodName, + FullMethod: "/WalletService/Charge", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Charge(ctx, req.(*ChargeRequest)) @@ -504,7 +486,7 @@ func _WalletService_Transfer_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_Transfer_FullMethodName, + FullMethod: "/WalletService/Transfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Transfer(ctx, req.(*TransferRequest)) @@ -522,7 +504,7 @@ func _WalletService_RequestWithdrawal_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_RequestWithdrawal_FullMethodName, + FullMethod: "/WalletService/RequestWithdrawal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).RequestWithdrawal(ctx, req.(*RequestWithdrawalRequest)) @@ -540,7 +522,7 @@ func _WalletService_ReviewTakeOut_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_ReviewTakeOut_FullMethodName, + FullMethod: "/WalletService/ReviewTakeOut", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).ReviewTakeOut(ctx, req.(*ReviewTakeOutRequest)) @@ -558,7 +540,7 @@ func _WalletService_FinishWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_FinishWithdrawal_FullMethodName, + FullMethod: "/WalletService/FinishWithdrawal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).FinishWithdrawal(ctx, req.(*FinishTakeOutRequest)) @@ -576,7 +558,7 @@ func _WalletService_PagingWalletLog_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: WalletService_PagingWalletLog_FullMethodName, + FullMethod: "/WalletService/PagingWalletLog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).PagingWalletLog(ctx, req.(*PagingWalletLogRequest)) From f8c1cfc9e01627ac93be139b3007200b18a9a497 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 19 Mar 2023 21:37:10 +0800 Subject: [PATCH 03/25] fix: order dto --- app/daemon/daemon.go | 6 +- core/service/idl/message/order_dto.proto | 9 +- core/service/parser/parser.go | 2 - core/service/proto/order_dto.pb.go | 672 +++++++++++------------ 4 files changed, 331 insertions(+), 358 deletions(-) diff --git a/app/daemon/daemon.go b/app/daemon/daemon.go index 6e9916363..799f13f6f 100755 --- a/app/daemon/daemon.go +++ b/app/daemon/daemon.go @@ -273,9 +273,9 @@ func (d *defaultService) PaymentOrderObs(order *proto.SPaymentOrder) bool { // 测试是否为子订单,并返回编号 func (d *defaultService) testSubId(o *proto.SSingleOrder) (string, bool) { - if o.ParentOrderId <= 0 { - return o.OrderNo, true - } + // if o.ParentOrderId <= 0 { + // return o.OrderNo, true + // } return o.OrderNo, false } diff --git a/core/service/idl/message/order_dto.proto b/core/service/idl/message/order_dto.proto index 2f066f13e..0f981e2aa 100644 --- a/core/service/idl/message/order_dto.proto +++ b/core/service/idl/message/order_dto.proto @@ -157,18 +157,15 @@ message SSubOrder{ message SSingleOrder { // 订单编号 int64 orderId = 1; - // 父订单编号 - int64 parentOrderId = 2; + // 订单类型 + int32 orderType = 2; // 订单号 string orderNo = 3; - // 订单类型 - int32 orderType = 4; // 买家编号 int64 buyerId = 5; // 卖家编号 int64 sellerId = 6; - // 店铺编号 - int64 shopId = 7; + //int64 SubOrderId = 2; // 订单标题 string subject = 8; diff --git a/core/service/parser/parser.go b/core/service/parser/parser.go index 6f7ce1592..2ee189347 100755 --- a/core/service/parser/parser.go +++ b/core/service/parser/parser.go @@ -253,12 +253,10 @@ func OrderDto(src *order.ComplexOrder) *proto.SSingleOrder { d := src.Details[0] o := &proto.SSingleOrder{ OrderId: d.Id, - ParentOrderId: src.OrderId, OrderType: src.OrderType, OrderNo: d.OrderNo, BuyerId: src.BuyerId, //SellerId: src.VendorId, - ShopId: d.ShopId, Subject: src.Subject, ItemAmount: src.ItemAmount, DiscountAmount: src.DiscountAmount, diff --git a/core/service/proto/order_dto.pb.go b/core/service/proto/order_dto.pb.go index e65efd2a7..32a26dca0 100644 --- a/core/service/proto/order_dto.pb.go +++ b/core/service/proto/order_dto.pb.go @@ -684,18 +684,14 @@ type SSingleOrder struct { // 订单编号 OrderId int64 `protobuf:"varint,1,opt,name=orderId,proto3" json:"orderId"` - // 父订单编号 - ParentOrderId int64 `protobuf:"varint,2,opt,name=parentOrderId,proto3" json:"parentOrderId"` + // 订单类型 + OrderType int32 `protobuf:"varint,2,opt,name=orderType,proto3" json:"orderType"` // 订单号 OrderNo string `protobuf:"bytes,3,opt,name=orderNo,proto3" json:"orderNo"` - // 订单类型 - OrderType int32 `protobuf:"varint,4,opt,name=orderType,proto3" json:"orderType"` // 买家编号 BuyerId int64 `protobuf:"varint,5,opt,name=buyerId,proto3" json:"buyerId"` // 卖家编号 SellerId int64 `protobuf:"varint,6,opt,name=sellerId,proto3" json:"sellerId"` - // 店铺编号 - ShopId int64 `protobuf:"varint,7,opt,name=shopId,proto3" json:"shopId"` // int64 SubOrderId = 2; // 订单标题 Subject string `protobuf:"bytes,8,opt,name=subject,proto3" json:"subject"` @@ -778,9 +774,9 @@ func (x *SSingleOrder) GetOrderId() int64 { return 0 } -func (x *SSingleOrder) GetParentOrderId() int64 { +func (x *SSingleOrder) GetOrderType() int32 { if x != nil { - return x.ParentOrderId + return x.OrderType } return 0 } @@ -792,13 +788,6 @@ func (x *SSingleOrder) GetOrderNo() string { return "" } -func (x *SSingleOrder) GetOrderType() int32 { - if x != nil { - return x.OrderType - } - return 0 -} - func (x *SSingleOrder) GetBuyerId() int64 { if x != nil { return x.BuyerId @@ -813,13 +802,6 @@ func (x *SSingleOrder) GetSellerId() int64 { return 0 } -func (x *SSingleOrder) GetShopId() int64 { - if x != nil { - return x.ShopId - } - return 0 -} - func (x *SSingleOrder) GetSubject() string { if x != nil { return x.Subject @@ -3064,336 +3046,332 @@ var file_message_order_dto_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x65, 0x78, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x65, 0x78, 0x74, 0x22, - 0xc8, 0x07, 0x0a, 0x0c, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x8a, 0x07, 0x0a, 0x0c, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 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, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, - 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, - 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, - 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, - 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, - 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0e, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, - 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, - 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, - 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, - 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, - 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, - 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x69, - 0x67, 0x6e, 0x65, 0x65, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x75, 0x79, - 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x50, - 0x61, 0x69, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x50, 0x61, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, - 0x11, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, - 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0a, 0x73, - 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x26, 0x0a, 0x0e, - 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x19, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, - 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x1a, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, - 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0e, 0x53, - 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, - 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, - 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, - 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, - 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x65, 0x0a, 0x19, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 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, 0x10, 0x0a, 0x03, - 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x1c, - 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x22, 0xb4, 0x03, 0x0a, - 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, - 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, - 0x43, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, - 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6c, - 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, - 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, - 0x75, 0x63, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x09, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x54, 0x72, 0x61, - 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, - 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, - 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, - 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x22, 0x9a, 0x02, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4e, 0x6f, 0x72, 0x6d, 0x61, - 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, - 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, - 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, - 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, - 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, - 0x75, 0x63, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, - 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, - 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, - 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xe1, 0x01, - 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 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, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x12, 0x18, 0x0a, - 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, - 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, - 0x6f, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x03, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 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, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, + 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, + 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, + 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, + 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, + 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, + 0x65, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, + 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, + 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, + 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, + 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, + 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, + 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, + 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x63, 0x6f, 0x6e, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x13, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, + 0x75, 0x79, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, + 0x73, 0x50, 0x61, 0x69, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x50, + 0x61, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x16, 0x20, + 0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, + 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x12, 0x52, + 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x26, + 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, + 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, + 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x1a, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, + 0x0e, 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, + 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, + 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x28, 0x0a, + 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x65, 0x0a, 0x19, 0x43, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, - 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x52, 0x0a, 0x17, 0x54, 0x72, - 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, - 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x22, 0x49, - 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, - 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x22, 0x21, 0x0a, 0x09, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x4f, 0x72, 0x4e, 0x6f, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 0x7e, 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x63, - 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, - 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, - 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 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, 0x10, 0x0a, 0x03, 0x73, - 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x1e, 0x0a, - 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, - 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, - 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, - 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0xed, - 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, - 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, - 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, - 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, - 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0xe8, - 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x10, + 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, + 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x22, 0xb4, + 0x03, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, + 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, + 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, + 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, + 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, + 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, + 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x62, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, + 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, + 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x09, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x64, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x54, + 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, 0x37, 0x0a, 0x09, + 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, + 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x74, 0x6f, + 0x72, 0x65, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x9a, 0x02, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4e, 0x6f, 0x72, + 0x6d, 0x61, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, + 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, + 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, + 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, + 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, + 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, + 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, + 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x22, + 0xe1, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, - 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, - 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x07, 0x73, - 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, - 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, 0x6f, 0x6e, - 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, - 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, - 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, - 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, - 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, - 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, - 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, - 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, - 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, - 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0f, - 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, - 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, - 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, - 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x75, 0x79, 0x65, 0x72, - 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, 0x62, 0x75, - 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x12, 0x53, 0x50, - 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x73, 0x68, - 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, - 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x11, 0x53, - 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, - 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, - 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x12, 0x14, - 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x70, - 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x70, - 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, - 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x11, 0x52, 0x08, - 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, - 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, - 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x72, 0x61, - 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, - 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, - 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, - 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, - 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, - 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, - 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, - 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x74, 0x65, 0x6d, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x74, 0x65, 0x6d, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xa9, 0x02, 0x0a, 0x0c, 0x45, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02, 0x5f, 0x33, - 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, - 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x53, - 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, - 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, - 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x10, 0x03, 0x12, 0x18, 0x0a, 0x14, - 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x68, 0x69, 0x70, - 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x61, - 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, - 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, - 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, 0x65, 0x63, 0x6c, 0x69, 0x6e, 0x65, - 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x66, 0x75, 0x6e, - 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, - 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x53, - 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, - 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x53, - 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x08, 0x12, 0x15, - 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x66, 0x75, 0x6e, - 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, - 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 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, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x12, + 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, + 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, + 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, + 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x4e, 0x6f, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x52, 0x0a, 0x17, + 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, + 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, + 0x22, 0x49, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 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, 0x10, 0x0a, 0x03, + 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x22, 0x21, + 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x22, 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x4f, 0x72, 0x4e, 0x6f, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 0x7e, 0x0a, 0x12, 0x43, 0x61, + 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 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, 0x10, 0x0a, 0x03, 0x73, 0x75, + 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x0d, + 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, + 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 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, 0x10, 0x0a, + 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, + 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x22, 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, + 0x6b, 0x75, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, + 0x22, 0xed, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, + 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, + 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, + 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, + 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, + 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, + 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, + 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x73, 0x65, 0x6c, + 0x6c, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x53, 0x50, 0x72, + 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, + 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, + 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, + 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, + 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, + 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, + 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, + 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, + 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, + 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, + 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0c, 0x62, 0x75, 0x79, + 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x75, 0x79, + 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, + 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x12, + 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, + 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xbb, 0x01, 0x0a, + 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, + 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, + 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x11, + 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, + 0x2e, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, + 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, + 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, + 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x0b, 0x53, 0x52, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x74, 0x65, + 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x74, + 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, + 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, + 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xa9, 0x02, 0x0a, 0x0c, + 0x45, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02, + 0x5f, 0x33, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x17, 0x0a, + 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, + 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x10, 0x03, 0x12, 0x18, + 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x68, + 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, 0x16, 0x0a, 0x12, 0x53, + 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, 0x65, 0x63, 0x6c, 0x69, + 0x6e, 0x65, 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x74, 0x69, + 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x05, 0x12, 0x0f, 0x0a, + 0x0b, 0x53, 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0d, + 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, 0x07, 0x12, 0x11, 0x0a, + 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x08, + 0x12, 0x15, 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, + 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From 49bc928dda989f16a8aaefd7a69ecdaf0aa6747a Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 19 Mar 2023 22:24:01 +0800 Subject: [PATCH 04/25] fix: order dto --- app/daemon/daemon.go | 54 +- core/domain/interface/order/complex_order.go | 2 + core/dto/order.go | 12 +- core/query/order_query.go | 4 +- core/service/idl/message/order_dto.proto | 94 +- core/service/idl/query_service.proto | 12 +- core/service/parser/parser.go | 50 +- core/service/proto/order_dto.pb.go | 1210 ++++++++++-------- core/service/proto/query_service.pb.go | 36 +- 9 files changed, 828 insertions(+), 646 deletions(-) diff --git a/app/daemon/daemon.go b/app/daemon/daemon.go index 799f13f6f..0ca96e600 100755 --- a/app/daemon/daemon.go +++ b/app/daemon/daemon.go @@ -291,20 +291,20 @@ func (d *defaultService) batchDelKeys(conn redis.Conn, key string) { // 设置订单过期时间 func (d *defaultService) updateOrderExpires(conn redis.Conn, o *proto.SSingleOrder) { - //订单刚创建时,设置过期时间 - if o.Status == order.StatAwaitingPayment { - trans, cli, _ := service.FoundationServiceClient() - defer trans.Close() - ss, _ := cli.GetGlobMchSaleConf_(context.TODO(), &proto.Empty{}) - unix := o.UpdateTime + int64(ss.OrderTimeOutMinute)*60 - t := time.Unix(unix, 0) - tk := getTick(t) - orderNo, sub := d.testSubId(o) - prefix := types.StringCond(sub, "sub!", "") - key := fmt.Sprintf("%s:%s%s:%s", variable.KvOrderExpiresTime, prefix, orderNo, tk) - //log.Println(" [Daemon][Exprire][ Key]:", key) - conn.Do("SET", key, unix) - } + // //订单刚创建时,设置过期时间 + // if o.Status == order.StatAwaitingPayment { + // trans, cli, _ := service.FoundationServiceClient() + // defer trans.Close() + // ss, _ := cli.GetGlobMchSaleConf_(context.TODO(), &proto.Empty{}) + // unix := o.UpdateTime + int64(ss.OrderTimeOutMinute)*60 + // t := time.Unix(unix, 0) + // tk := getTick(t) + // orderNo, sub := d.testSubId(o) + // prefix := types.StringCond(sub, "sub!", "") + // key := fmt.Sprintf("%s:%s%s:%s", variable.KvOrderExpiresTime, prefix, orderNo, tk) + // //log.Println(" [Daemon][Exprire][ Key]:", key) + // conn.Do("SET", key, unix) + // } } // 取消订单过期时间 @@ -332,19 +332,19 @@ func (d *defaultService) orderAutoConfirm(conn redis.Conn, o *proto.SSingleOrder // 订单自动收货 func (d *defaultService) orderAutoReceive(conn redis.Conn, o *proto.SSingleOrder) { - if o.Status == order.StatShipped { - trans, cli, _ := service.FoundationServiceClient() - defer trans.Close() - ss, _ := cli.GetGlobMchSaleConf_(context.TODO(), &proto.Empty{}) - unix := o.UpdateTime + int64(ss.OrderTimeOutReceiveHour)*60*60 - t := time.Unix(unix, 0) - tk := getTick(t) - orderNo, sub := d.testSubId(o) - prefix := types.StringCond(sub, "sub!", "") - key := fmt.Sprintf("%s:%s%s:%s", variable.KvOrderAutoReceive, prefix, orderNo, tk) - //log.Println(" [Daemon][AutoReceive][ Key]:", key) - conn.Do("SET", key, unix) - } + // if o.Status == order.StatShipped { + // trans, cli, _ := service.FoundationServiceClient() + // defer trans.Close() + // ss, _ := cli.GetGlobMchSaleConf_(context.TODO(), &proto.Empty{}) + // unix := o.UpdateTime + int64(ss.OrderTimeOutReceiveHour)*60*60 + // t := time.Unix(unix, 0) + // tk := getTick(t) + // orderNo, sub := d.testSubId(o) + // prefix := types.StringCond(sub, "sub!", "") + // key := fmt.Sprintf("%s:%s%s:%s", variable.KvOrderAutoReceive, prefix, orderNo, tk) + // //log.Println(" [Daemon][AutoReceive][ Key]:", key) + // conn.Do("SET", key, unix) + // } } // 完成订单自动收货 diff --git a/core/domain/interface/order/complex_order.go b/core/domain/interface/order/complex_order.go index cb2528155..da0abe3d2 100644 --- a/core/domain/interface/order/complex_order.go +++ b/core/domain/interface/order/complex_order.go @@ -21,6 +21,8 @@ type ( OrderNo string // 购买人编号 BuyerId int64 + // 卖家编号- + SellerId int64 // 买家用户名 BuyerUser string // 订单标题 diff --git a/core/dto/order.go b/core/dto/order.go index f00044486..5f864e74c 100755 --- a/core/dto/order.go +++ b/core/dto/order.go @@ -33,17 +33,17 @@ type ( // 商品数量 ItemCount int `json:"itemCount"` // 商品总金额 - ItemAmount int64 `json:"itemAmount"` + ItemAmount int32 `json:"itemAmount"` // 抵扣金额 - DiscountAmount int64 `json:"discountAmount"` + DiscountAmount int32 `json:"discountAmount"` // 优惠金额 - DeductAmount int64 `json:"deductAmount"` + DeductAmount int32 `json:"deductAmount"` // 快递费 - ExpressFee int64 `json:"expressFee"` + ExpressFee int32 `json:"expressFee"` // 包装费 - PackageFee int64 `json:"packageFee"` + PackageFee int32 `json:"packageFee"` // 最终金额 - FinalAmount int64 `json:"finalAmount"` + FinalAmount int32 `json:"finalAmount"` // 是否支付 IsPaid int32 `json:"isPaid"` // 状态 diff --git a/core/query/order_query.go b/core/query/order_query.go index 9d3882e1a..396bd66ce 100755 --- a/core/query/order_query.go +++ b/core/query/order_query.go @@ -409,7 +409,7 @@ func (o *OrderQuery) PagingTradeOrderOfBuyer(memberId, begin, size int64, pagina } // 查询分页的订单 - err := d.Query(fmt.Sprintf(`SELECT o.id,o.order_no,vendor_id,ot.subject, + err := d.Query(fmt.Sprintf(`SELECT o.id,o.order_no,vendor_id, ot.order_amount,ot.discount_amount, ot.final_amount,ot.cash_pay,ot.ticket_image, o.status,o.create_time FROM order_list o INNER JOIN order_trade_order ot ON ot.order_id = o.id @@ -420,7 +420,7 @@ func (o *OrderQuery) PagingTradeOrderOfBuyer(memberId, begin, size int64, pagina var ticket string for rs.Next() { e := &proto.SSingleOrder{} - rs.Scan(&e.OrderId, &e.OrderNo, &e.SellerId, &e.Subject, + rs.Scan(&e.OrderId, &e.OrderNo, &e.SellerId, &e.ItemAmount, &e.DiscountAmount, &e.FinalAmount, &cashPay, &ticket, &e.Status, &e.SubmitTime) e.Data = map[string]string{ diff --git a/core/service/idl/message/order_dto.proto b/core/service/idl/message/order_dto.proto index 0f981e2aa..e131f88c5 100644 --- a/core/service/idl/message/order_dto.proto +++ b/core/service/idl/message/order_dto.proto @@ -162,53 +162,56 @@ message SSingleOrder { // 订单号 string orderNo = 3; // 买家编号 - int64 buyerId = 5; + int64 buyerId = 4; // 卖家编号 - int64 sellerId = 6; - - //int64 SubOrderId = 2; - // 订单标题 - string subject = 8; + int64 sellerId = 5; + // 卖家名称 + string sellerName = 6; + // 订单商品项 + repeated SOrderItem items = 7; // 商品总金额 - int64 itemAmount = 9; + sint32 itemAmount = 8; // 优惠金额 - int64 discountAmount = 10; - // 抵扣金额 - int32 deductAmount = 11; - // 调整金额 - int32 adjustAmount = 12; + sint32 discountAmount = 9; // 配送费 - int64 expressFee = 13; + sint32 expressFee = 10; // 包装费 - int64 packageFee = 14; - // 手续费 - int32 procedureFee = 15; + sint32 packageFee = 11; // 订单总金额 - int32 totalAmount = 16; - // 最终金额 - int64 finalAmount = 17; + sint32 totalAmount = 12; + // 抵扣金额 + sint32 deductAmount = 13; + // 手续费 + sint32 procedureFee = 14; + // 调整金额 + int32 adjustAmount = 15; + // 最终金额(订单总金额-抵扣金额+手续费+调整金额) + sint32 finalAmount = 16; + // 买家留言 + string buyerComment = 17; // 收货人 SConsigneeInfo consignee = 18; - // 收货地址是否已修改 - bool consigneeModified = 19; - // 买家留言 - string buyerComment = 20; - // 是否支付 - bool isPaid = 21; - //sint32 IsBreak = 18; - sint32 status = 22; // 下单时间 - sint64 submitTime = 23; - // 商品详情 - repeated SOrderItem items = 24; - // 支付交易号 - string paymentTradeNo = 25; + sint64 submitTime = 19; + // 订单状态 + sint32 status = 20; + // 订单状态描述 + string stateDesc = 21; + + // 过期时间 + sint64 expiresTime = 22; + // 支付时间 + sint64 payTime = 23; + // 支付方式 + repeated SOrderPayChanData tradeData = 24; + // 发货时间 + sint64 shipTime = 25; + // 快递单号 + string shipLogisticCode = 26; + // 快递名称 + string shipExpressName = 27; // 扩展信息 - map data = 26; - // 更新时间 - int64 updateTime = 27; - // 是否为子订单 - //bool SubOrder = 27; + map data = 28; } // 收货人信息 @@ -219,6 +222,23 @@ message SConsigneeInfo { string consigneePhone = 2; // 配送地址 string shippingAddress = 3; + // 收货人是否已更改 + bool isModified = 4; +} + + +/** 交易方式数据 */ +message SOrderPayChanData { + /** 支付途径 */ + sint32 chanId = 1; + // 方式描述 + string chanName = 2; + /** 交易代码 */ + string chanCode = 3; + /** 支付金额 */ + int64 amount = 4; + /** 外部交易单号 */ + string outTradeNo = 5; } // 更改订单收货人请求 diff --git a/core/service/idl/query_service.proto b/core/service/idl/query_service.proto index bacc85f02..06ac1f03a 100644 --- a/core/service/idl/query_service.proto +++ b/core/service/idl/query_service.proto @@ -130,17 +130,17 @@ message SMemberPagingOrder { // 商品 int64 itemCount = 6; // 商品总金额 - int64 itemAmount = 7; + sint32 itemAmount = 7; // 抵扣金额 - int64 discountAmount = 8; + sint32 discountAmount = 8; // 优惠金额 - int64 deductAmount = 9; + sint32 deductAmount = 9; // 快递费 - int64 expressFee = 10; + sint32 expressFee = 10; // 包装费 - int64 packageFee = 11; + sint32 packageFee = 11; // 最终金额 - int64 finalAmount = 12; + sint32 finalAmount = 12; // 商品列表 repeated SOrderItem items = 13; // 状态 diff --git a/core/service/parser/parser.go b/core/service/parser/parser.go index 2ee189347..491c5ce79 100755 --- a/core/service/parser/parser.go +++ b/core/service/parser/parser.go @@ -252,28 +252,34 @@ func OrderItemDto(src *order.ComplexItem) *proto.SOrderItem { func OrderDto(src *order.ComplexOrder) *proto.SSingleOrder { d := src.Details[0] o := &proto.SSingleOrder{ - OrderId: d.Id, - OrderType: src.OrderType, - OrderNo: d.OrderNo, - BuyerId: src.BuyerId, - //SellerId: src.VendorId, - Subject: src.Subject, - ItemAmount: src.ItemAmount, - DiscountAmount: src.DiscountAmount, - ExpressFee: src.ExpressFee, - PackageFee: src.PackageFee, - FinalAmount: src.FinalAmount, - Consignee: &proto.SConsigneeInfo{ - ConsigneeName: src.Consignee.ConsigneeName, - ConsigneePhone: src.Consignee.ConsigneePhone, - ShippingAddress: src.Consignee.ShippingAddress, - }, - ConsigneeModified: src.ConsigneeModified == 1, - BuyerComment: d.BuyerComment, - SubmitTime: src.CreateTime, - Status: int32(d.Status), - Items: make([]*proto.SOrderItem, len(d.Items)), - Data: src.Data, + OrderId: d.Id, + OrderType: src.OrderType, + OrderNo: d.OrderNo, + BuyerId: src.BuyerId, + SellerId: src.SellerId, + SellerName: "", + Items: make([]*proto.SOrderItem, len(d.Items)), + ItemAmount: int32(src.ItemAmount), + DiscountAmount: int32(src.DiscountAmount), + ExpressFee: int32(src.ExpressFee), + PackageFee: int32(src.PackageFee), + TotalAmount: 0, + DeductAmount: 0, + ProcedureFee: 0, + AdjustAmount: 0, + FinalAmount: int32(src.FinalAmount), + BuyerComment: d.BuyerComment, + Consignee: &proto.SConsigneeInfo{ConsigneeName: src.Consignee.ConsigneeName, ConsigneePhone: src.Consignee.ConsigneePhone, ShippingAddress: src.Consignee.ShippingAddress, IsModified: src.ConsigneeModified == 1}, + SubmitTime: src.CreateTime, + Status: int32(d.Status), + StateDesc: "", + ExpiresTime: 0, + PayTime: 0, + TradeData: []*proto.SOrderPayChanData{}, + ShipTime: 0, + ShipLogisticCode: "", + ShipExpressName: "", + Data: src.Data, } if d.Items != nil { for i, v := range d.Items { diff --git a/core/service/proto/order_dto.pb.go b/core/service/proto/order_dto.pb.go index 32a26dca0..6850bcbe1 100644 --- a/core/service/proto/order_dto.pb.go +++ b/core/service/proto/order_dto.pb.go @@ -689,50 +689,55 @@ type SSingleOrder struct { // 订单号 OrderNo string `protobuf:"bytes,3,opt,name=orderNo,proto3" json:"orderNo"` // 买家编号 - BuyerId int64 `protobuf:"varint,5,opt,name=buyerId,proto3" json:"buyerId"` + BuyerId int64 `protobuf:"varint,4,opt,name=buyerId,proto3" json:"buyerId"` // 卖家编号 - SellerId int64 `protobuf:"varint,6,opt,name=sellerId,proto3" json:"sellerId"` - // int64 SubOrderId = 2; - // 订单标题 - Subject string `protobuf:"bytes,8,opt,name=subject,proto3" json:"subject"` + SellerId int64 `protobuf:"varint,5,opt,name=sellerId,proto3" json:"sellerId"` + // 卖家名称 + SellerName string `protobuf:"bytes,6,opt,name=sellerName,proto3" json:"sellerName"` + // 订单商品项 + Items []*SOrderItem `protobuf:"bytes,7,rep,name=items,proto3" json:"items"` // 商品总金额 - ItemAmount int64 `protobuf:"varint,9,opt,name=itemAmount,proto3" json:"itemAmount"` + ItemAmount int32 `protobuf:"zigzag32,8,opt,name=itemAmount,proto3" json:"itemAmount"` // 优惠金额 - DiscountAmount int64 `protobuf:"varint,10,opt,name=discountAmount,proto3" json:"discountAmount"` - // 抵扣金额 - DeductAmount int32 `protobuf:"varint,11,opt,name=deductAmount,proto3" json:"deductAmount"` - // 调整金额 - AdjustAmount int32 `protobuf:"varint,12,opt,name=adjustAmount,proto3" json:"adjustAmount"` + DiscountAmount int32 `protobuf:"zigzag32,9,opt,name=discountAmount,proto3" json:"discountAmount"` // 配送费 - ExpressFee int64 `protobuf:"varint,13,opt,name=expressFee,proto3" json:"expressFee"` + ExpressFee int32 `protobuf:"zigzag32,10,opt,name=expressFee,proto3" json:"expressFee"` // 包装费 - PackageFee int64 `protobuf:"varint,14,opt,name=packageFee,proto3" json:"packageFee"` - // 手续费 - ProcedureFee int32 `protobuf:"varint,15,opt,name=procedureFee,proto3" json:"procedureFee"` + PackageFee int32 `protobuf:"zigzag32,11,opt,name=packageFee,proto3" json:"packageFee"` // 订单总金额 - TotalAmount int32 `protobuf:"varint,16,opt,name=totalAmount,proto3" json:"totalAmount"` - // 最终金额 - FinalAmount int64 `protobuf:"varint,17,opt,name=finalAmount,proto3" json:"finalAmount"` + TotalAmount int32 `protobuf:"zigzag32,12,opt,name=totalAmount,proto3" json:"totalAmount"` + // 抵扣金额 + DeductAmount int32 `protobuf:"zigzag32,13,opt,name=deductAmount,proto3" json:"deductAmount"` + // 手续费 + ProcedureFee int32 `protobuf:"zigzag32,14,opt,name=procedureFee,proto3" json:"procedureFee"` + // 调整金额 + AdjustAmount int32 `protobuf:"varint,15,opt,name=adjustAmount,proto3" json:"adjustAmount"` + // 最终金额(订单总金额-抵扣金额+手续费+调整金额) + FinalAmount int32 `protobuf:"zigzag32,16,opt,name=finalAmount,proto3" json:"finalAmount"` + // 买家留言 + BuyerComment string `protobuf:"bytes,17,opt,name=buyerComment,proto3" json:"buyerComment"` // 收货人 Consignee *SConsigneeInfo `protobuf:"bytes,18,opt,name=consignee,proto3" json:"consignee"` - // 收货地址是否已修改 - ConsigneeModified bool `protobuf:"varint,19,opt,name=consigneeModified,proto3" json:"consigneeModified"` - // 买家留言 - BuyerComment string `protobuf:"bytes,20,opt,name=buyerComment,proto3" json:"buyerComment"` - // 是否支付 - IsPaid bool `protobuf:"varint,21,opt,name=isPaid,proto3" json:"isPaid"` - // sint32 IsBreak = 18; - Status int32 `protobuf:"zigzag32,22,opt,name=status,proto3" json:"status"` // 下单时间 - SubmitTime int64 `protobuf:"zigzag64,23,opt,name=submitTime,proto3" json:"submitTime"` - // 商品详情 - Items []*SOrderItem `protobuf:"bytes,24,rep,name=items,proto3" json:"items"` - // 支付交易号 - PaymentTradeNo string `protobuf:"bytes,25,opt,name=paymentTradeNo,proto3" json:"paymentTradeNo"` + SubmitTime int64 `protobuf:"zigzag64,19,opt,name=submitTime,proto3" json:"submitTime"` + // 订单状态 + Status int32 `protobuf:"zigzag32,20,opt,name=status,proto3" json:"status"` + // 订单状态描述 + StateDesc string `protobuf:"bytes,21,opt,name=stateDesc,proto3" json:"stateDesc"` + // 过期时间 + ExpiresTime int64 `protobuf:"zigzag64,22,opt,name=expiresTime,proto3" json:"expiresTime"` + // 支付时间 + PayTime int64 `protobuf:"zigzag64,23,opt,name=payTime,proto3" json:"payTime"` + // 支付方式 + TradeData []*SOrderPayChanData `protobuf:"bytes,24,rep,name=tradeData,proto3" json:"tradeData"` + // 发货时间 + ShipTime int64 `protobuf:"zigzag64,25,opt,name=shipTime,proto3" json:"shipTime"` + // 快递单号 + ShipLogisticCode string `protobuf:"bytes,26,opt,name=shipLogisticCode,proto3" json:"shipLogisticCode"` + // 快递名称 + ShipExpressName string `protobuf:"bytes,27,opt,name=shipExpressName,proto3" json:"shipExpressName"` // 扩展信息 - Data map[string]string `protobuf:"bytes,26,rep,name=data,proto3" json:"data" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // 更新时间 - UpdateTime int64 `protobuf:"varint,27,opt,name=updateTime,proto3" json:"updateTime"` + Data map[string]string `protobuf:"bytes,28,rep,name=data,proto3" json:"data" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *SSingleOrder) Reset() { @@ -802,51 +807,58 @@ func (x *SSingleOrder) GetSellerId() int64 { return 0 } -func (x *SSingleOrder) GetSubject() string { +func (x *SSingleOrder) GetSellerName() string { if x != nil { - return x.Subject + return x.SellerName } return "" } -func (x *SSingleOrder) GetItemAmount() int64 { +func (x *SSingleOrder) GetItems() []*SOrderItem { + if x != nil { + return x.Items + } + return nil +} + +func (x *SSingleOrder) GetItemAmount() int32 { if x != nil { return x.ItemAmount } return 0 } -func (x *SSingleOrder) GetDiscountAmount() int64 { +func (x *SSingleOrder) GetDiscountAmount() int32 { if x != nil { return x.DiscountAmount } return 0 } -func (x *SSingleOrder) GetDeductAmount() int32 { +func (x *SSingleOrder) GetExpressFee() int32 { if x != nil { - return x.DeductAmount + return x.ExpressFee } return 0 } -func (x *SSingleOrder) GetAdjustAmount() int32 { +func (x *SSingleOrder) GetPackageFee() int32 { if x != nil { - return x.AdjustAmount + return x.PackageFee } return 0 } -func (x *SSingleOrder) GetExpressFee() int64 { +func (x *SSingleOrder) GetTotalAmount() int32 { if x != nil { - return x.ExpressFee + return x.TotalAmount } return 0 } -func (x *SSingleOrder) GetPackageFee() int64 { +func (x *SSingleOrder) GetDeductAmount() int32 { if x != nil { - return x.PackageFee + return x.DeductAmount } return 0 } @@ -858,20 +870,27 @@ func (x *SSingleOrder) GetProcedureFee() int32 { return 0 } -func (x *SSingleOrder) GetTotalAmount() int32 { +func (x *SSingleOrder) GetAdjustAmount() int32 { if x != nil { - return x.TotalAmount + return x.AdjustAmount } return 0 } -func (x *SSingleOrder) GetFinalAmount() int64 { +func (x *SSingleOrder) GetFinalAmount() int32 { if x != nil { return x.FinalAmount } return 0 } +func (x *SSingleOrder) GetBuyerComment() string { + if x != nil { + return x.BuyerComment + } + return "" +} + func (x *SSingleOrder) GetConsignee() *SConsigneeInfo { if x != nil { return x.Consignee @@ -879,67 +898,74 @@ func (x *SSingleOrder) GetConsignee() *SConsigneeInfo { return nil } -func (x *SSingleOrder) GetConsigneeModified() bool { +func (x *SSingleOrder) GetSubmitTime() int64 { if x != nil { - return x.ConsigneeModified + return x.SubmitTime } - return false + return 0 } -func (x *SSingleOrder) GetBuyerComment() string { +func (x *SSingleOrder) GetStatus() int32 { if x != nil { - return x.BuyerComment + return x.Status } - return "" + return 0 } -func (x *SSingleOrder) GetIsPaid() bool { +func (x *SSingleOrder) GetStateDesc() string { if x != nil { - return x.IsPaid + return x.StateDesc } - return false + return "" } -func (x *SSingleOrder) GetStatus() int32 { +func (x *SSingleOrder) GetExpiresTime() int64 { if x != nil { - return x.Status + return x.ExpiresTime } return 0 } -func (x *SSingleOrder) GetSubmitTime() int64 { +func (x *SSingleOrder) GetPayTime() int64 { if x != nil { - return x.SubmitTime + return x.PayTime } return 0 } -func (x *SSingleOrder) GetItems() []*SOrderItem { +func (x *SSingleOrder) GetTradeData() []*SOrderPayChanData { if x != nil { - return x.Items + return x.TradeData } return nil } -func (x *SSingleOrder) GetPaymentTradeNo() string { +func (x *SSingleOrder) GetShipTime() int64 { if x != nil { - return x.PaymentTradeNo + return x.ShipTime + } + return 0 +} + +func (x *SSingleOrder) GetShipLogisticCode() string { + if x != nil { + return x.ShipLogisticCode } return "" } -func (x *SSingleOrder) GetData() map[string]string { +func (x *SSingleOrder) GetShipExpressName() string { if x != nil { - return x.Data + return x.ShipExpressName } - return nil + return "" } -func (x *SSingleOrder) GetUpdateTime() int64 { +func (x *SSingleOrder) GetData() map[string]string { if x != nil { - return x.UpdateTime + return x.Data } - return 0 + return nil } // 收货人信息 @@ -954,6 +980,8 @@ type SConsigneeInfo struct { ConsigneePhone string `protobuf:"bytes,2,opt,name=consigneePhone,proto3" json:"consigneePhone"` // 配送地址 ShippingAddress string `protobuf:"bytes,3,opt,name=shippingAddress,proto3" json:"shippingAddress"` + // 收货人是否已更改 + IsModified bool `protobuf:"varint,4,opt,name=isModified,proto3" json:"isModified"` } func (x *SConsigneeInfo) Reset() { @@ -1009,6 +1037,98 @@ func (x *SConsigneeInfo) GetShippingAddress() string { return "" } +func (x *SConsigneeInfo) GetIsModified() bool { + if x != nil { + return x.IsModified + } + return false +} + +// * 交易方式数据 +type SOrderPayChanData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // * 支付途径 + ChanId int32 `protobuf:"zigzag32,1,opt,name=chanId,proto3" json:"chanId"` + // 方式描述 + ChanName string `protobuf:"bytes,2,opt,name=chanName,proto3" json:"chanName"` + // * 交易代码 + ChanCode string `protobuf:"bytes,3,opt,name=chanCode,proto3" json:"chanCode"` + // * 支付金额 + Amount int64 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount"` + // * 外部交易单号 + OutTradeNo string `protobuf:"bytes,5,opt,name=outTradeNo,proto3" json:"outTradeNo"` +} + +func (x *SOrderPayChanData) Reset() { + *x = SOrderPayChanData{} + if protoimpl.UnsafeEnabled { + mi := &file_message_order_dto_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SOrderPayChanData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SOrderPayChanData) ProtoMessage() {} + +func (x *SOrderPayChanData) ProtoReflect() protoreflect.Message { + mi := &file_message_order_dto_proto_msgTypes[5] + 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 SOrderPayChanData.ProtoReflect.Descriptor instead. +func (*SOrderPayChanData) Descriptor() ([]byte, []int) { + return file_message_order_dto_proto_rawDescGZIP(), []int{5} +} + +func (x *SOrderPayChanData) GetChanId() int32 { + if x != nil { + return x.ChanId + } + return 0 +} + +func (x *SOrderPayChanData) GetChanName() string { + if x != nil { + return x.ChanName + } + return "" +} + +func (x *SOrderPayChanData) GetChanCode() string { + if x != nil { + return x.ChanCode + } + return "" +} + +func (x *SOrderPayChanData) GetAmount() int64 { + if x != nil { + return x.Amount + } + return 0 +} + +func (x *SOrderPayChanData) GetOutTradeNo() string { + if x != nil { + return x.OutTradeNo + } + return "" +} + // 更改订单收货人请求 type ChangeOrderAddressRequest struct { state protoimpl.MessageState @@ -1026,7 +1146,7 @@ type ChangeOrderAddressRequest struct { func (x *ChangeOrderAddressRequest) Reset() { *x = ChangeOrderAddressRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[5] + mi := &file_message_order_dto_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1039,7 +1159,7 @@ func (x *ChangeOrderAddressRequest) String() string { func (*ChangeOrderAddressRequest) ProtoMessage() {} func (x *ChangeOrderAddressRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[5] + mi := &file_message_order_dto_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1052,7 +1172,7 @@ func (x *ChangeOrderAddressRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ChangeOrderAddressRequest.ProtoReflect.Descriptor instead. func (*ChangeOrderAddressRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{5} + return file_message_order_dto_proto_rawDescGZIP(), []int{6} } func (x *ChangeOrderAddressRequest) GetOrderNo() string { @@ -1107,7 +1227,7 @@ type SubmitOrderRequest struct { func (x *SubmitOrderRequest) Reset() { *x = SubmitOrderRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[6] + mi := &file_message_order_dto_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1120,7 +1240,7 @@ func (x *SubmitOrderRequest) String() string { func (*SubmitOrderRequest) ProtoMessage() {} func (x *SubmitOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[6] + mi := &file_message_order_dto_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1133,7 +1253,7 @@ func (x *SubmitOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SubmitOrderRequest.ProtoReflect.Descriptor instead. func (*SubmitOrderRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{6} + return file_message_order_dto_proto_rawDescGZIP(), []int{7} } func (x *SubmitOrderRequest) GetOrderType() int32 { @@ -1223,7 +1343,7 @@ type TradeOrderRequest struct { func (x *TradeOrderRequest) Reset() { *x = TradeOrderRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[7] + mi := &file_message_order_dto_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1236,7 +1356,7 @@ func (x *TradeOrderRequest) String() string { func (*TradeOrderRequest) ProtoMessage() {} func (x *TradeOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[7] + mi := &file_message_order_dto_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1249,7 +1369,7 @@ func (x *TradeOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use TradeOrderRequest.ProtoReflect.Descriptor instead. func (*TradeOrderRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{7} + return file_message_order_dto_proto_rawDescGZIP(), []int{8} } func (x *TradeOrderRequest) GetStoreId() int64 { @@ -1300,7 +1420,7 @@ type SubmitNormalOrderV2Request struct { func (x *SubmitNormalOrderV2Request) Reset() { *x = SubmitNormalOrderV2Request{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[8] + mi := &file_message_order_dto_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1313,7 +1433,7 @@ func (x *SubmitNormalOrderV2Request) String() string { func (*SubmitNormalOrderV2Request) ProtoMessage() {} func (x *SubmitNormalOrderV2Request) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[8] + mi := &file_message_order_dto_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1326,7 +1446,7 @@ func (x *SubmitNormalOrderV2Request) ProtoReflect() protoreflect.Message { // Deprecated: Use SubmitNormalOrderV2Request.ProtoReflect.Descriptor instead. func (*SubmitNormalOrderV2Request) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{8} + return file_message_order_dto_proto_rawDescGZIP(), []int{9} } func (x *SubmitNormalOrderV2Request) GetBuyerId() int64 { @@ -1410,7 +1530,7 @@ type OrderSubmitResponse struct { func (x *OrderSubmitResponse) Reset() { *x = OrderSubmitResponse{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[9] + mi := &file_message_order_dto_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1423,7 +1543,7 @@ func (x *OrderSubmitResponse) String() string { func (*OrderSubmitResponse) ProtoMessage() {} func (x *OrderSubmitResponse) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[9] + mi := &file_message_order_dto_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1436,7 +1556,7 @@ func (x *OrderSubmitResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderSubmitResponse.ProtoReflect.Descriptor instead. func (*OrderSubmitResponse) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{9} + return file_message_order_dto_proto_rawDescGZIP(), []int{10} } func (x *OrderSubmitResponse) GetErrCode() int32 { @@ -1503,7 +1623,7 @@ type GetOrderRequest struct { func (x *GetOrderRequest) Reset() { *x = GetOrderRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[10] + mi := &file_message_order_dto_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1516,7 +1636,7 @@ func (x *GetOrderRequest) String() string { func (*GetOrderRequest) ProtoMessage() {} func (x *GetOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[10] + mi := &file_message_order_dto_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1529,7 +1649,7 @@ func (x *GetOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetOrderRequest.ProtoReflect.Descriptor instead. func (*GetOrderRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{10} + return file_message_order_dto_proto_rawDescGZIP(), []int{11} } func (x *GetOrderRequest) GetOrderNo() string { @@ -1561,7 +1681,7 @@ type TradeOrderSubmitRequest struct { func (x *TradeOrderSubmitRequest) Reset() { *x = TradeOrderSubmitRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[11] + mi := &file_message_order_dto_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1574,7 +1694,7 @@ func (x *TradeOrderSubmitRequest) String() string { func (*TradeOrderSubmitRequest) ProtoMessage() {} func (x *TradeOrderSubmitRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[11] + mi := &file_message_order_dto_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1587,7 +1707,7 @@ func (x *TradeOrderSubmitRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use TradeOrderSubmitRequest.ProtoReflect.Descriptor instead. func (*TradeOrderSubmitRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{11} + return file_message_order_dto_proto_rawDescGZIP(), []int{12} } func (x *TradeOrderSubmitRequest) GetOrder() *SSingleOrder { @@ -1617,7 +1737,7 @@ type TradeOrderTicketRequest struct { func (x *TradeOrderTicketRequest) Reset() { *x = TradeOrderTicketRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[12] + mi := &file_message_order_dto_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1630,7 +1750,7 @@ func (x *TradeOrderTicketRequest) String() string { func (*TradeOrderTicketRequest) ProtoMessage() {} func (x *TradeOrderTicketRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[12] + mi := &file_message_order_dto_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1643,7 +1763,7 @@ func (x *TradeOrderTicketRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use TradeOrderTicketRequest.ProtoReflect.Descriptor instead. func (*TradeOrderTicketRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{12} + return file_message_order_dto_proto_rawDescGZIP(), []int{13} } func (x *TradeOrderTicketRequest) GetOrderId() int64 { @@ -1671,7 +1791,7 @@ type ComplexItemsResponse struct { func (x *ComplexItemsResponse) Reset() { *x = ComplexItemsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[13] + mi := &file_message_order_dto_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1684,7 +1804,7 @@ func (x *ComplexItemsResponse) String() string { func (*ComplexItemsResponse) ProtoMessage() {} func (x *ComplexItemsResponse) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[13] + mi := &file_message_order_dto_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1697,7 +1817,7 @@ func (x *ComplexItemsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ComplexItemsResponse.ProtoReflect.Descriptor instead. func (*ComplexItemsResponse) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{13} + return file_message_order_dto_proto_rawDescGZIP(), []int{14} } func (x *ComplexItemsResponse) GetValue() []*SOrderItem { @@ -1719,7 +1839,7 @@ type OrderId struct { func (x *OrderId) Reset() { *x = OrderId{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[14] + mi := &file_message_order_dto_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1732,7 +1852,7 @@ func (x *OrderId) String() string { func (*OrderId) ProtoMessage() {} func (x *OrderId) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[14] + mi := &file_message_order_dto_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1745,7 +1865,7 @@ func (x *OrderId) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderId.ProtoReflect.Descriptor instead. func (*OrderId) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{14} + return file_message_order_dto_proto_rawDescGZIP(), []int{15} } func (x *OrderId) GetValue() int64 { @@ -1770,7 +1890,7 @@ type OrderNo struct { func (x *OrderNo) Reset() { *x = OrderNo{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[15] + mi := &file_message_order_dto_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1783,7 +1903,7 @@ func (x *OrderNo) String() string { func (*OrderNo) ProtoMessage() {} func (x *OrderNo) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[15] + mi := &file_message_order_dto_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1796,7 +1916,7 @@ func (x *OrderNo) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderNo.ProtoReflect.Descriptor instead. func (*OrderNo) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{15} + return file_message_order_dto_proto_rawDescGZIP(), []int{16} } func (x *OrderNo) GetOrderNo() string { @@ -1825,7 +1945,7 @@ type OrderNoV2 struct { func (x *OrderNoV2) Reset() { *x = OrderNoV2{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[16] + mi := &file_message_order_dto_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1838,7 +1958,7 @@ func (x *OrderNoV2) String() string { func (*OrderNoV2) ProtoMessage() {} func (x *OrderNoV2) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[16] + mi := &file_message_order_dto_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1851,7 +1971,7 @@ func (x *OrderNoV2) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderNoV2.ProtoReflect.Descriptor instead. func (*OrderNoV2) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{16} + return file_message_order_dto_proto_rawDescGZIP(), []int{17} } func (x *OrderNoV2) GetValue() string { @@ -1875,7 +1995,7 @@ type OrderIdOrNo struct { func (x *OrderIdOrNo) Reset() { *x = OrderIdOrNo{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[17] + mi := &file_message_order_dto_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1888,7 +2008,7 @@ func (x *OrderIdOrNo) String() string { func (*OrderIdOrNo) ProtoMessage() {} func (x *OrderIdOrNo) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[17] + mi := &file_message_order_dto_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1901,7 +2021,7 @@ func (x *OrderIdOrNo) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderIdOrNo.ProtoReflect.Descriptor instead. func (*OrderIdOrNo) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{17} + return file_message_order_dto_proto_rawDescGZIP(), []int{18} } func (x *OrderIdOrNo) GetId() int64 { @@ -1936,7 +2056,7 @@ type CancelOrderRequest struct { func (x *CancelOrderRequest) Reset() { *x = CancelOrderRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[18] + mi := &file_message_order_dto_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1949,7 +2069,7 @@ func (x *CancelOrderRequest) String() string { func (*CancelOrderRequest) ProtoMessage() {} func (x *CancelOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[18] + mi := &file_message_order_dto_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1962,7 +2082,7 @@ func (x *CancelOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CancelOrderRequest.ProtoReflect.Descriptor instead. func (*CancelOrderRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{18} + return file_message_order_dto_proto_rawDescGZIP(), []int{19} } func (x *CancelOrderRequest) GetOrderNo() string { @@ -2011,7 +2131,7 @@ type OrderShipmentRequest struct { func (x *OrderShipmentRequest) Reset() { *x = OrderShipmentRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[19] + mi := &file_message_order_dto_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2024,7 +2144,7 @@ func (x *OrderShipmentRequest) String() string { func (*OrderShipmentRequest) ProtoMessage() {} func (x *OrderShipmentRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[19] + mi := &file_message_order_dto_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2037,7 +2157,7 @@ func (x *OrderShipmentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderShipmentRequest.ProtoReflect.Descriptor instead. func (*OrderShipmentRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{19} + return file_message_order_dto_proto_rawDescGZIP(), []int{20} } func (x *OrderShipmentRequest) GetOrderNo() string { @@ -2085,7 +2205,7 @@ type RPrepareOrderItem struct { func (x *RPrepareOrderItem) Reset() { *x = RPrepareOrderItem{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[20] + mi := &file_message_order_dto_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2098,7 +2218,7 @@ func (x *RPrepareOrderItem) String() string { func (*RPrepareOrderItem) ProtoMessage() {} func (x *RPrepareOrderItem) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[20] + mi := &file_message_order_dto_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2111,7 +2231,7 @@ func (x *RPrepareOrderItem) ProtoReflect() protoreflect.Message { // Deprecated: Use RPrepareOrderItem.ProtoReflect.Descriptor instead. func (*RPrepareOrderItem) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{20} + return file_message_order_dto_proto_rawDescGZIP(), []int{21} } func (x *RPrepareOrderItem) GetItemId() int64 { @@ -2160,7 +2280,7 @@ type PrepareOrderRequest struct { func (x *PrepareOrderRequest) Reset() { *x = PrepareOrderRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[21] + mi := &file_message_order_dto_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2173,7 +2293,7 @@ func (x *PrepareOrderRequest) String() string { func (*PrepareOrderRequest) ProtoMessage() {} func (x *PrepareOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[21] + mi := &file_message_order_dto_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2186,7 +2306,7 @@ func (x *PrepareOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use PrepareOrderRequest.ProtoReflect.Descriptor instead. func (*PrepareOrderRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{21} + return file_message_order_dto_proto_rawDescGZIP(), []int{22} } func (x *PrepareOrderRequest) GetBuyerId() int64 { @@ -2283,7 +2403,7 @@ type PrepareOrderResponse struct { func (x *PrepareOrderResponse) Reset() { *x = PrepareOrderResponse{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[22] + mi := &file_message_order_dto_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2296,7 +2416,7 @@ func (x *PrepareOrderResponse) String() string { func (*PrepareOrderResponse) ProtoMessage() {} func (x *PrepareOrderResponse) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[22] + mi := &file_message_order_dto_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2309,7 +2429,7 @@ func (x *PrepareOrderResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use PrepareOrderResponse.ProtoReflect.Descriptor instead. func (*PrepareOrderResponse) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{22} + return file_message_order_dto_proto_rawDescGZIP(), []int{23} } func (x *PrepareOrderResponse) GetErrCode() int32 { @@ -2450,7 +2570,7 @@ type SPrepareOrderGroup struct { func (x *SPrepareOrderGroup) Reset() { *x = SPrepareOrderGroup{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[23] + mi := &file_message_order_dto_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2463,7 +2583,7 @@ func (x *SPrepareOrderGroup) String() string { func (*SPrepareOrderGroup) ProtoMessage() {} func (x *SPrepareOrderGroup) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[23] + mi := &file_message_order_dto_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2476,7 +2596,7 @@ func (x *SPrepareOrderGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use SPrepareOrderGroup.ProtoReflect.Descriptor instead. func (*SPrepareOrderGroup) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{23} + return file_message_order_dto_proto_rawDescGZIP(), []int{24} } func (x *SPrepareOrderGroup) GetSellerId() int64 { @@ -2532,7 +2652,7 @@ type SPrepareOrderItem struct { func (x *SPrepareOrderItem) Reset() { *x = SPrepareOrderItem{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[24] + mi := &file_message_order_dto_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2545,7 +2665,7 @@ func (x *SPrepareOrderItem) String() string { func (*SPrepareOrderItem) ProtoMessage() {} func (x *SPrepareOrderItem) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[24] + mi := &file_message_order_dto_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2558,7 +2678,7 @@ func (x *SPrepareOrderItem) ProtoReflect() protoreflect.Message { // Deprecated: Use SPrepareOrderItem.ProtoReflect.Descriptor instead. func (*SPrepareOrderItem) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{24} + return file_message_order_dto_proto_rawDescGZIP(), []int{25} } func (x *SPrepareOrderItem) GetItemId() int64 { @@ -2620,7 +2740,7 @@ type QueryRebateListRequest struct { func (x *QueryRebateListRequest) Reset() { *x = QueryRebateListRequest{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[25] + mi := &file_message_order_dto_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2633,7 +2753,7 @@ func (x *QueryRebateListRequest) String() string { func (*QueryRebateListRequest) ProtoMessage() {} func (x *QueryRebateListRequest) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[25] + mi := &file_message_order_dto_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2646,7 +2766,7 @@ func (x *QueryRebateListRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRebateListRequest.ProtoReflect.Descriptor instead. func (*QueryRebateListRequest) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{25} + return file_message_order_dto_proto_rawDescGZIP(), []int{26} } // * 查询订单返利响应 @@ -2661,7 +2781,7 @@ type QueryRebateListResponse struct { func (x *QueryRebateListResponse) Reset() { *x = QueryRebateListResponse{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[26] + mi := &file_message_order_dto_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2674,7 +2794,7 @@ func (x *QueryRebateListResponse) String() string { func (*QueryRebateListResponse) ProtoMessage() {} func (x *QueryRebateListResponse) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[26] + mi := &file_message_order_dto_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2687,7 +2807,7 @@ func (x *QueryRebateListResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryRebateListResponse.ProtoReflect.Descriptor instead. func (*QueryRebateListResponse) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{26} + return file_message_order_dto_proto_rawDescGZIP(), []int{27} } func (x *QueryRebateListResponse) GetValue() []*SRebateList { @@ -2730,7 +2850,7 @@ type SRebateList struct { func (x *SRebateList) Reset() { *x = SRebateList{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[27] + mi := &file_message_order_dto_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2743,7 +2863,7 @@ func (x *SRebateList) String() string { func (*SRebateList) ProtoMessage() {} func (x *SRebateList) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[27] + mi := &file_message_order_dto_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2756,7 +2876,7 @@ func (x *SRebateList) ProtoReflect() protoreflect.Message { // Deprecated: Use SRebateList.ProtoReflect.Descriptor instead. func (*SRebateList) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{27} + return file_message_order_dto_proto_rawDescGZIP(), []int{28} } func (x *SRebateList) GetId() int64 { @@ -2861,7 +2981,7 @@ type SRebateItem struct { func (x *SRebateItem) Reset() { *x = SRebateItem{} if protoimpl.UnsafeEnabled { - mi := &file_message_order_dto_proto_msgTypes[28] + mi := &file_message_order_dto_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2874,7 +2994,7 @@ func (x *SRebateItem) String() string { func (*SRebateItem) ProtoMessage() {} func (x *SRebateItem) ProtoReflect() protoreflect.Message { - mi := &file_message_order_dto_proto_msgTypes[28] + mi := &file_message_order_dto_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2887,7 +3007,7 @@ func (x *SRebateItem) ProtoReflect() protoreflect.Message { // Deprecated: Use SRebateItem.ProtoReflect.Descriptor instead. func (*SRebateItem) Descriptor() ([]byte, []int) { - return file_message_order_dto_proto_rawDescGZIP(), []int{28} + return file_message_order_dto_proto_rawDescGZIP(), []int{29} } func (x *SRebateItem) GetId() int32 { @@ -3046,332 +3166,352 @@ var file_message_order_dto_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x65, 0x78, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x65, 0x78, 0x74, 0x22, - 0x8a, 0x07, 0x0a, 0x0c, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x80, 0x08, 0x0a, 0x0c, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 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, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, + 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, - 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, - 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, - 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, - 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, - 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, - 0x65, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, - 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, - 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, - 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, - 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, - 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, - 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x63, 0x6f, 0x6e, - 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x13, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, - 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, - 0x75, 0x79, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, - 0x73, 0x50, 0x61, 0x69, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x50, - 0x61, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x16, 0x20, - 0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, - 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x12, 0x52, - 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x26, - 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, - 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x54, - 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x1a, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x88, 0x01, 0x0a, - 0x0e, 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, - 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, - 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, - 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x28, 0x0a, - 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, - 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x65, 0x0a, 0x19, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 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, 0x10, - 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, - 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x22, 0xb4, - 0x03, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, - 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, - 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, - 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, - 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, - 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, - 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, - 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x62, - 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, - 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x09, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x64, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x54, - 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, 0x37, 0x0a, 0x09, - 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, - 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x74, 0x6f, - 0x72, 0x65, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x22, 0x9a, 0x02, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4e, 0x6f, 0x72, - 0x6d, 0x61, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, - 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, - 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, - 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x6c, + 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, + 0x6c, 0x6c, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x69, + 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x11, 0x52, + 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, + 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x11, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, + 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, + 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0c, 0x64, 0x65, 0x64, + 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x11, 0x52, + 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, + 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0f, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x10, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x69, + 0x67, 0x6e, 0x65, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, 0x6f, + 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, 0x6e, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, + 0x54, 0x69, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0a, 0x73, 0x75, 0x62, 0x6d, + 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x18, 0x14, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, + 0x0a, 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x63, 0x18, 0x15, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x44, 0x65, 0x73, 0x63, 0x12, 0x20, 0x0a, 0x0b, + 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, + 0x12, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x12, 0x52, + 0x07, 0x70, 0x61, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x64, + 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x50, 0x61, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, + 0x69, 0x70, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x68, + 0x69, 0x70, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x73, 0x68, 0x69, 0x70, 0x4c, 0x6f, + 0x67, 0x69, 0x73, 0x74, 0x69, 0x63, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x10, 0x73, 0x68, 0x69, 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x73, 0x74, 0x69, 0x63, 0x43, 0x6f, + 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x68, 0x69, 0x70, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, + 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x68, 0x69, + 0x70, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x1c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x53, 0x53, 0x69, + 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, + 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0xa8, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, + 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, + 0x65, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, + 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, + 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x50, 0x68, + 0x6f, 0x6e, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x73, 0x68, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x73, 0x68, + 0x69, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, + 0x0a, 0x69, 0x73, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x0a, 0x69, 0x73, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x22, 0x9b, 0x01, + 0x0a, 0x11, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x61, 0x79, 0x43, 0x68, 0x61, 0x6e, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x11, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, + 0x68, 0x61, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, + 0x68, 0x61, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x43, + 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x43, + 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, + 0x75, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x6f, 0x75, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x22, 0x65, 0x0a, 0x19, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x03, 0x73, 0x75, 0x62, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x49, 0x64, 0x22, 0xb4, 0x03, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, + 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, + 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, + 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, + 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, - 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, - 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, - 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x22, - 0xe1, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, - 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 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, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x12, - 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, - 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, - 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, - 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x4e, 0x6f, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x77, 0x61, 0x6c, + 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x44, 0x61, 0x74, + 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x0a, + 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x12, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6b, 0x0a, 0x11, 0x54, 0x72, 0x61, + 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x07, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, + 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, + 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x69, + 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x64, 0x69, + 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x9a, 0x02, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6d, 0x69, + 0x74, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x56, 0x32, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, + 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x44, 0x65, + 0x64, 0x75, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x62, 0x61, 0x6c, 0x61, + 0x6e, 0x63, 0x65, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x61, 0x6c, + 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, + 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, + 0x6f, 0x64, 0x65, 0x22, 0xe1, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, + 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, + 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 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, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, + 0x50, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, + 0x50, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x20, 0x0a, + 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x26, 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x22, 0x52, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, + 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, + 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, + 0x72, 0x61, 0x74, 0x65, 0x22, 0x49, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, + 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x39, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, + 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 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, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x52, 0x0a, 0x17, - 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, - 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, - 0x22, 0x49, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, - 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 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, 0x10, 0x0a, 0x03, - 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x22, 0x21, - 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x4f, 0x72, 0x4e, 0x6f, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 0x7e, 0x0a, 0x12, 0x43, 0x61, - 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 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, 0x10, 0x0a, 0x03, 0x73, 0x75, - 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x0d, - 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, - 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 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, 0x10, 0x0a, - 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, - 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, - 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, - 0x6f, 0x22, 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, + 0x75, 0x62, 0x22, 0x21, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, + 0x4f, 0x72, 0x4e, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x02, 0x69, 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, 0x7e, + 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 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, 0x10, + 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, + 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, + 0x01, 0x0a, 0x14, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, + 0x73, 0x75, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, + 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, + 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, + 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, + 0x74, 0x69, 0x74, 0x79, 0x22, 0xed, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, + 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, + 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, + 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, + 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, + 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, + 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, + 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, + 0x69, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, + 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, + 0x69, 0x74, 0x65, 0x6d, 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, + 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, + 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, + 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, + 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x52, 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, + 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0f, 0x2e, 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, + 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, + 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, + 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, + 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, + 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, + 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, + 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, + 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, + 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, + 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, + 0x0b, 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, + 0x28, 0x12, 0x52, 0x0b, 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, + 0x8e, 0x01, 0x0a, 0x12, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x12, 0x52, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, + 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, + 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x22, 0xbb, 0x01, 0x0a, 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, - 0x6b, 0x75, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x22, 0xed, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, - 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, - 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, - 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, - 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, - 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, - 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, - 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x73, 0x65, 0x6c, - 0x6c, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x53, 0x50, 0x72, - 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, - 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, - 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, - 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, - 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, - 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, - 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, - 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, - 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, - 0x18, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, - 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, - 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0c, 0x62, 0x75, 0x79, - 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x75, 0x79, - 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, - 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x12, - 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, - 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, - 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, - 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xbb, 0x01, 0x0a, - 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, - 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, - 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, - 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x11, - 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, - 0x2e, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, - 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, - 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, - 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, - 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, - 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x0b, 0x53, 0x52, - 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x74, 0x65, - 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x74, - 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, - 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, - 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, - 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xa9, 0x02, 0x0a, 0x0c, - 0x45, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02, - 0x5f, 0x33, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, - 0x74, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x17, 0x0a, - 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, - 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x10, 0x03, 0x12, 0x18, - 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x68, - 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, 0x16, 0x0a, 0x12, 0x53, - 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, - 0x6c, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, 0x65, 0x63, 0x6c, 0x69, - 0x6e, 0x65, 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x66, - 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x74, 0x69, - 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x05, 0x12, 0x0f, 0x0a, - 0x0b, 0x53, 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0d, - 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, 0x07, 0x12, 0x11, 0x0a, - 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x08, - 0x12, 0x15, 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x66, - 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, - 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x75, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, + 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x11, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, + 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x74, 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, + 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, + 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, + 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, + 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, + 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, + 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, + 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, + 0x09, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, + 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, + 0xa9, 0x02, 0x0a, 0x0c, 0x45, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x12, 0x06, 0x0a, 0x02, 0x5f, 0x33, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, + 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, + 0x01, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, + 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, + 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, + 0x10, 0x03, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, + 0x6e, 0x67, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, + 0x53, 0x74, 0x61, 0x74, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, + 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, + 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, + 0x65, 0x63, 0x6c, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, + 0x74, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, + 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, + 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, + 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, + 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, + 0x65, 0x64, 0x10, 0x08, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, + 0x73, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, + 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, + 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -3387,7 +3527,7 @@ func file_message_order_dto_proto_rawDescGZIP() []byte { } var file_message_order_dto_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_message_order_dto_proto_msgTypes = make([]protoimpl.MessageInfo, 32) +var file_message_order_dto_proto_msgTypes = make([]protoimpl.MessageInfo, 33) var file_message_order_dto_proto_goTypes = []interface{}{ (EOrderStatus)(0), // 0: EOrderStatus (*SOrderItem)(nil), // 1: SOrderItem @@ -3395,56 +3535,58 @@ var file_message_order_dto_proto_goTypes = []interface{}{ (*SSubOrder)(nil), // 3: SSubOrder (*SSingleOrder)(nil), // 4: SSingleOrder (*SConsigneeInfo)(nil), // 5: SConsigneeInfo - (*ChangeOrderAddressRequest)(nil), // 6: ChangeOrderAddressRequest - (*SubmitOrderRequest)(nil), // 7: SubmitOrderRequest - (*TradeOrderRequest)(nil), // 8: TradeOrderRequest - (*SubmitNormalOrderV2Request)(nil), // 9: SubmitNormalOrderV2Request - (*OrderSubmitResponse)(nil), // 10: OrderSubmitResponse - (*GetOrderRequest)(nil), // 11: GetOrderRequest - (*TradeOrderSubmitRequest)(nil), // 12: TradeOrderSubmitRequest - (*TradeOrderTicketRequest)(nil), // 13: TradeOrderTicketRequest - (*ComplexItemsResponse)(nil), // 14: ComplexItemsResponse - (*OrderId)(nil), // 15: OrderId - (*OrderNo)(nil), // 16: OrderNo - (*OrderNoV2)(nil), // 17: OrderNoV2 - (*OrderIdOrNo)(nil), // 18: OrderIdOrNo - (*CancelOrderRequest)(nil), // 19: CancelOrderRequest - (*OrderShipmentRequest)(nil), // 20: OrderShipmentRequest - (*RPrepareOrderItem)(nil), // 21: RPrepareOrderItem - (*PrepareOrderRequest)(nil), // 22: PrepareOrderRequest - (*PrepareOrderResponse)(nil), // 23: PrepareOrderResponse - (*SPrepareOrderGroup)(nil), // 24: SPrepareOrderGroup - (*SPrepareOrderItem)(nil), // 25: SPrepareOrderItem - (*QueryRebateListRequest)(nil), // 26: QueryRebateListRequest - (*QueryRebateListResponse)(nil), // 27: QueryRebateListResponse - (*SRebateList)(nil), // 28: SRebateList - (*SRebateItem)(nil), // 29: SRebateItem - nil, // 30: SOrderItem.DataEntry - nil, // 31: SSingleOrder.DataEntry - nil, // 32: SubmitOrderRequest.DataEntry + (*SOrderPayChanData)(nil), // 6: SOrderPayChanData + (*ChangeOrderAddressRequest)(nil), // 7: ChangeOrderAddressRequest + (*SubmitOrderRequest)(nil), // 8: SubmitOrderRequest + (*TradeOrderRequest)(nil), // 9: TradeOrderRequest + (*SubmitNormalOrderV2Request)(nil), // 10: SubmitNormalOrderV2Request + (*OrderSubmitResponse)(nil), // 11: OrderSubmitResponse + (*GetOrderRequest)(nil), // 12: GetOrderRequest + (*TradeOrderSubmitRequest)(nil), // 13: TradeOrderSubmitRequest + (*TradeOrderTicketRequest)(nil), // 14: TradeOrderTicketRequest + (*ComplexItemsResponse)(nil), // 15: ComplexItemsResponse + (*OrderId)(nil), // 16: OrderId + (*OrderNo)(nil), // 17: OrderNo + (*OrderNoV2)(nil), // 18: OrderNoV2 + (*OrderIdOrNo)(nil), // 19: OrderIdOrNo + (*CancelOrderRequest)(nil), // 20: CancelOrderRequest + (*OrderShipmentRequest)(nil), // 21: OrderShipmentRequest + (*RPrepareOrderItem)(nil), // 22: RPrepareOrderItem + (*PrepareOrderRequest)(nil), // 23: PrepareOrderRequest + (*PrepareOrderResponse)(nil), // 24: PrepareOrderResponse + (*SPrepareOrderGroup)(nil), // 25: SPrepareOrderGroup + (*SPrepareOrderItem)(nil), // 26: SPrepareOrderItem + (*QueryRebateListRequest)(nil), // 27: QueryRebateListRequest + (*QueryRebateListResponse)(nil), // 28: QueryRebateListResponse + (*SRebateList)(nil), // 29: SRebateList + (*SRebateItem)(nil), // 30: SRebateItem + nil, // 31: SOrderItem.DataEntry + nil, // 32: SSingleOrder.DataEntry + nil, // 33: SubmitOrderRequest.DataEntry } var file_message_order_dto_proto_depIdxs = []int32{ - 30, // 0: SOrderItem.data:type_name -> SOrderItem.DataEntry + 31, // 0: SOrderItem.data:type_name -> SOrderItem.DataEntry 5, // 1: SParentOrder.consignee:type_name -> SConsigneeInfo 3, // 2: SParentOrder.subOrders:type_name -> SSubOrder 1, // 3: SSubOrder.items:type_name -> SOrderItem - 5, // 4: SSingleOrder.consignee:type_name -> SConsigneeInfo - 1, // 5: SSingleOrder.items:type_name -> SOrderItem - 31, // 6: SSingleOrder.data:type_name -> SSingleOrder.DataEntry - 32, // 7: SubmitOrderRequest.data:type_name -> SubmitOrderRequest.DataEntry - 8, // 8: SubmitOrderRequest.tradeOrder:type_name -> TradeOrderRequest - 4, // 9: TradeOrderSubmitRequest.order:type_name -> SSingleOrder - 1, // 10: ComplexItemsResponse.value:type_name -> SOrderItem - 21, // 11: PrepareOrderRequest.item:type_name -> RPrepareOrderItem - 24, // 12: PrepareOrderResponse.sellers:type_name -> SPrepareOrderGroup - 5, // 13: PrepareOrderResponse.consignee:type_name -> SConsigneeInfo - 25, // 14: SPrepareOrderGroup.items:type_name -> SPrepareOrderItem - 28, // 15: QueryRebateListResponse.value:type_name -> SRebateList - 16, // [16:16] is the sub-list for method output_type - 16, // [16:16] is the sub-list for method input_type - 16, // [16:16] is the sub-list for extension type_name - 16, // [16:16] is the sub-list for extension extendee - 0, // [0:16] is the sub-list for field type_name + 1, // 4: SSingleOrder.items:type_name -> SOrderItem + 5, // 5: SSingleOrder.consignee:type_name -> SConsigneeInfo + 6, // 6: SSingleOrder.tradeData:type_name -> SOrderPayChanData + 32, // 7: SSingleOrder.data:type_name -> SSingleOrder.DataEntry + 33, // 8: SubmitOrderRequest.data:type_name -> SubmitOrderRequest.DataEntry + 9, // 9: SubmitOrderRequest.tradeOrder:type_name -> TradeOrderRequest + 4, // 10: TradeOrderSubmitRequest.order:type_name -> SSingleOrder + 1, // 11: ComplexItemsResponse.value:type_name -> SOrderItem + 22, // 12: PrepareOrderRequest.item:type_name -> RPrepareOrderItem + 25, // 13: PrepareOrderResponse.sellers:type_name -> SPrepareOrderGroup + 5, // 14: PrepareOrderResponse.consignee:type_name -> SConsigneeInfo + 26, // 15: SPrepareOrderGroup.items:type_name -> SPrepareOrderItem + 29, // 16: QueryRebateListResponse.value:type_name -> SRebateList + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_message_order_dto_proto_init() } @@ -3514,7 +3656,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChangeOrderAddressRequest); i { + switch v := v.(*SOrderPayChanData); i { case 0: return &v.state case 1: @@ -3526,7 +3668,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SubmitOrderRequest); i { + switch v := v.(*ChangeOrderAddressRequest); i { case 0: return &v.state case 1: @@ -3538,7 +3680,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TradeOrderRequest); i { + switch v := v.(*SubmitOrderRequest); i { case 0: return &v.state case 1: @@ -3550,7 +3692,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SubmitNormalOrderV2Request); i { + switch v := v.(*TradeOrderRequest); i { case 0: return &v.state case 1: @@ -3562,7 +3704,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderSubmitResponse); i { + switch v := v.(*SubmitNormalOrderV2Request); i { case 0: return &v.state case 1: @@ -3574,7 +3716,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetOrderRequest); i { + switch v := v.(*OrderSubmitResponse); i { case 0: return &v.state case 1: @@ -3586,7 +3728,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TradeOrderSubmitRequest); i { + switch v := v.(*GetOrderRequest); i { case 0: return &v.state case 1: @@ -3598,7 +3740,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TradeOrderTicketRequest); i { + switch v := v.(*TradeOrderSubmitRequest); i { case 0: return &v.state case 1: @@ -3610,7 +3752,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComplexItemsResponse); i { + switch v := v.(*TradeOrderTicketRequest); i { case 0: return &v.state case 1: @@ -3622,7 +3764,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderId); i { + switch v := v.(*ComplexItemsResponse); i { case 0: return &v.state case 1: @@ -3634,7 +3776,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderNo); i { + switch v := v.(*OrderId); i { case 0: return &v.state case 1: @@ -3646,7 +3788,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderNoV2); i { + switch v := v.(*OrderNo); i { case 0: return &v.state case 1: @@ -3658,7 +3800,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderIdOrNo); i { + switch v := v.(*OrderNoV2); i { case 0: return &v.state case 1: @@ -3670,7 +3812,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CancelOrderRequest); i { + switch v := v.(*OrderIdOrNo); i { case 0: return &v.state case 1: @@ -3682,7 +3824,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrderShipmentRequest); i { + switch v := v.(*CancelOrderRequest); i { case 0: return &v.state case 1: @@ -3694,7 +3836,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RPrepareOrderItem); i { + switch v := v.(*OrderShipmentRequest); i { case 0: return &v.state case 1: @@ -3706,7 +3848,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrepareOrderRequest); i { + switch v := v.(*RPrepareOrderItem); i { case 0: return &v.state case 1: @@ -3718,7 +3860,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PrepareOrderResponse); i { + switch v := v.(*PrepareOrderRequest); i { case 0: return &v.state case 1: @@ -3730,7 +3872,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SPrepareOrderGroup); i { + switch v := v.(*PrepareOrderResponse); i { case 0: return &v.state case 1: @@ -3742,7 +3884,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SPrepareOrderItem); i { + switch v := v.(*SPrepareOrderGroup); i { case 0: return &v.state case 1: @@ -3754,7 +3896,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryRebateListRequest); i { + switch v := v.(*SPrepareOrderItem); i { case 0: return &v.state case 1: @@ -3766,7 +3908,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryRebateListResponse); i { + switch v := v.(*QueryRebateListRequest); i { case 0: return &v.state case 1: @@ -3778,7 +3920,7 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SRebateList); i { + switch v := v.(*QueryRebateListResponse); i { case 0: return &v.state case 1: @@ -3790,6 +3932,18 @@ func file_message_order_dto_proto_init() { } } file_message_order_dto_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SRebateList); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_message_order_dto_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SRebateItem); i { case 0: return &v.state @@ -3808,7 +3962,7 @@ func file_message_order_dto_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_message_order_dto_proto_rawDesc, NumEnums: 1, - NumMessages: 32, + NumMessages: 33, NumExtensions: 0, NumServices: 0, }, diff --git a/core/service/proto/query_service.pb.go b/core/service/proto/query_service.pb.go index db012b2ab..96d73e3e6 100644 --- a/core/service/proto/query_service.pb.go +++ b/core/service/proto/query_service.pb.go @@ -711,17 +711,17 @@ type SMemberPagingOrder struct { // 商品 ItemCount int64 `protobuf:"varint,6,opt,name=itemCount,proto3" json:"itemCount"` // 商品总金额 - ItemAmount int64 `protobuf:"varint,7,opt,name=itemAmount,proto3" json:"itemAmount"` + ItemAmount int32 `protobuf:"zigzag32,7,opt,name=itemAmount,proto3" json:"itemAmount"` // 抵扣金额 - DiscountAmount int64 `protobuf:"varint,8,opt,name=discountAmount,proto3" json:"discountAmount"` + DiscountAmount int32 `protobuf:"zigzag32,8,opt,name=discountAmount,proto3" json:"discountAmount"` // 优惠金额 - DeductAmount int64 `protobuf:"varint,9,opt,name=deductAmount,proto3" json:"deductAmount"` + DeductAmount int32 `protobuf:"zigzag32,9,opt,name=deductAmount,proto3" json:"deductAmount"` // 快递费 - ExpressFee int64 `protobuf:"varint,10,opt,name=expressFee,proto3" json:"expressFee"` + ExpressFee int32 `protobuf:"zigzag32,10,opt,name=expressFee,proto3" json:"expressFee"` // 包装费 - PackageFee int64 `protobuf:"varint,11,opt,name=packageFee,proto3" json:"packageFee"` + PackageFee int32 `protobuf:"zigzag32,11,opt,name=packageFee,proto3" json:"packageFee"` // 最终金额 - FinalAmount int64 `protobuf:"varint,12,opt,name=finalAmount,proto3" json:"finalAmount"` + FinalAmount int32 `protobuf:"zigzag32,12,opt,name=finalAmount,proto3" json:"finalAmount"` // 商品列表 Items []*SOrderItem `protobuf:"bytes,13,rep,name=items,proto3" json:"items"` // 状态 @@ -806,42 +806,42 @@ func (x *SMemberPagingOrder) GetItemCount() int64 { return 0 } -func (x *SMemberPagingOrder) GetItemAmount() int64 { +func (x *SMemberPagingOrder) GetItemAmount() int32 { if x != nil { return x.ItemAmount } return 0 } -func (x *SMemberPagingOrder) GetDiscountAmount() int64 { +func (x *SMemberPagingOrder) GetDiscountAmount() int32 { if x != nil { return x.DiscountAmount } return 0 } -func (x *SMemberPagingOrder) GetDeductAmount() int64 { +func (x *SMemberPagingOrder) GetDeductAmount() int32 { if x != nil { return x.DeductAmount } return 0 } -func (x *SMemberPagingOrder) GetExpressFee() int64 { +func (x *SMemberPagingOrder) GetExpressFee() int32 { if x != nil { return x.ExpressFee } return 0 } -func (x *SMemberPagingOrder) GetPackageFee() int64 { +func (x *SMemberPagingOrder) GetPackageFee() int32 { if x != nil { return x.PackageFee } return 0 } -func (x *SMemberPagingOrder) GetFinalAmount() int64 { +func (x *SMemberPagingOrder) GetFinalAmount() int32 { if x != nil { return x.FinalAmount } @@ -2148,18 +2148,18 @@ var file_query_service_proto_rawDesc = []byte{ 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x69, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, + 0x09, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, - 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, - 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, + 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, + 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, From e08eeb9ca85fa578a72b25dda86c96fed21e3aaf Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 19 Mar 2023 22:42:07 +0800 Subject: [PATCH 05/25] fix: order service --- app/daemon/supervise.go | 4 +- core/service/idl/order_service.proto | 10 +- core/service/impl/2.order_service.go | 6 +- core/service/proto/order_service.pb.go | 301 +++++++++++++------- core/service/proto/order_service_grpc.pb.go | 12 +- 5 files changed, 217 insertions(+), 116 deletions(-) diff --git a/app/daemon/supervise.go b/app/daemon/supervise.go index 50625e98a..5521ffe39 100755 --- a/app/daemon/supervise.go +++ b/app/daemon/supervise.go @@ -36,8 +36,8 @@ func superviseOrder(ss []Service) { // OrderNo: orderNo, // SubOrder: sub, //}) - o, _ := cli.GetOrder(context.TODO(), &proto.OrderNoV2{ - Value: orderNo, + o, _ := cli.GetOrder(context.TODO(), &proto.OrderRequest{ + OrderNo: orderNo, }) trans.Close() if o != nil { diff --git a/core/service/idl/order_service.proto b/core/service/idl/order_service.proto index f760214ee..f87068f05 100755 --- a/core/service/idl/order_service.proto +++ b/core/service/idl/order_service.proto @@ -20,7 +20,7 @@ service OrderService { rpc GetParentOrder (OrderNoV2) returns (SParentOrder) { } // 获取子订单,orderId - rpc GetOrder (OrderNoV2) returns (SSingleOrder) { + rpc GetOrder (OrderRequest) returns (SSingleOrder) { } // 交易单现金支付,orderId rpc TradeOrderCashPay (Int64) returns (Result) { @@ -57,3 +57,11 @@ service OrderService { rpc QueryRebateListList (QueryRebateListRequest) returns (QueryRebateListResponse) { } } + +// 获取订单请求 +message OrderRequest{ + // 订单号 + string orderNo = 1; + // 是否返回详细信息 + bool withDetail = 2; +} \ No newline at end of file diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 1cf3e431a..94f46ac57 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -313,11 +313,11 @@ func (s *orderServiceImpl) GetParentOrder(c context.Context, req *proto.OrderNoV } // GetOrder 获取订单和商品项信息 -func (s *orderServiceImpl) GetOrder(_ context.Context, orderNo *proto.OrderNoV2) (*proto.SSingleOrder, error) { - if len(orderNo.Value) == 0 { +func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (*proto.SSingleOrder, error) { + if len(r.OrderNo) == 0 { return nil, order.ErrNoSuchOrder } - c := s.manager.Unified(orderNo.Value, true).Complex() + c := s.manager.Unified(r.OrderNo, true).Complex() if c != nil { return parser.OrderDto(c), nil } diff --git a/core/service/proto/order_service.pb.go b/core/service/proto/order_service.pb.go index 1d71bc7d7..84256505f 100644 --- a/core/service/proto/order_service.pb.go +++ b/core/service/proto/order_service.pb.go @@ -10,6 +10,7 @@ import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" + sync "sync" ) const ( @@ -19,120 +20,197 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// 获取订单请求 +type OrderRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // 订单号 + OrderNo string `protobuf:"bytes,1,opt,name=orderNo,proto3" json:"orderNo"` + // 是否返回详细信息 + WithDetail bool `protobuf:"varint,2,opt,name=withDetail,proto3" json:"withDetail"` +} + +func (x *OrderRequest) Reset() { + *x = OrderRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_order_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *OrderRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*OrderRequest) ProtoMessage() {} + +func (x *OrderRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_service_proto_msgTypes[0] + 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 OrderRequest.ProtoReflect.Descriptor instead. +func (*OrderRequest) Descriptor() ([]byte, []int) { + return file_order_service_proto_rawDescGZIP(), []int{0} +} + +func (x *OrderRequest) GetOrderNo() string { + if x != nil { + return x.OrderNo + } + return "" +} + +func (x *OrderRequest) GetWithDetail() bool { + if x != nil { + return x.WithDetail + } + return false +} + var File_order_service_proto protoreflect.FileDescriptor var file_order_service_proto_rawDesc = []byte{ 0x0a, 0x13, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2f, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x64, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x96, 0x06, 0x0a, - 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3a, 0x0a, - 0x0b, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x53, - 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x14, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, 0x50, 0x72, 0x65, - 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, - 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x15, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x1a, 0x0d, 0x2e, 0x53, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x27, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x1a, - 0x0d, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, - 0x12, 0x26, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x61, - 0x73, 0x68, 0x50, 0x61, 0x79, 0x12, 0x06, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, 0x07, 0x2e, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x64, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x12, 0x18, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, - 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, - 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x70, 0x6f, - 0x6e, 0x5f, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x4d, 0x61, 0x70, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x23, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, - 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, 0x43, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x12, 0x1a, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x50, 0x69, - 0x63, 0x6b, 0x55, 0x70, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, - 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, 0x68, 0x69, - 0x70, 0x12, 0x15, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x00, 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, - 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, 0x6f, 0x72, - 0x62, 0x69, 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x42, - 0x79, 0x74, 0x65, 0x73, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, - 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x17, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, - 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x5f, 0x64, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x48, 0x0a, 0x0c, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1e, 0x0a, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x44, 0x65, + 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x32, 0x99, 0x06, 0x0a, 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x6d, 0x69, + 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x50, 0x72, 0x65, 0x70, + 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, + 0x1a, 0x0d, 0x2e, 0x53, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, + 0x00, 0x12, 0x2a, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0d, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x53, + 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x26, 0x0a, + 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x61, 0x73, 0x68, 0x50, + 0x61, 0x79, 0x12, 0x06, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, + 0x18, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, + 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x5f, 0x12, + 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, + 0x70, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x12, 0x13, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x22, 0x00, 0x12, 0x23, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x12, 0x1a, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x50, 0x69, 0x63, 0x6b, 0x55, + 0x70, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, 0x68, 0x69, 0x70, 0x12, 0x15, + 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, + 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x62, 0x69, 0x64, + 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x42, 0x79, 0x74, 0x65, + 0x73, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x53, 0x74, + 0x72, 0x69, 0x6e, 0x67, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x17, 0x2e, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, + 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_order_service_proto_rawDescOnce sync.Once + file_order_service_proto_rawDescData = file_order_service_proto_rawDesc +) + +func file_order_service_proto_rawDescGZIP() []byte { + file_order_service_proto_rawDescOnce.Do(func() { + file_order_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_order_service_proto_rawDescData) + }) + return file_order_service_proto_rawDescData } +var file_order_service_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_order_service_proto_goTypes = []interface{}{ - (*SubmitOrderRequest)(nil), // 0: SubmitOrderRequest - (*PrepareOrderRequest)(nil), // 1: PrepareOrderRequest - (*OrderNoV2)(nil), // 2: OrderNoV2 - (*Int64)(nil), // 3: Int64 - (*TradeOrderTicketRequest)(nil), // 4: TradeOrderTicketRequest - (*CancelOrderRequest)(nil), // 5: CancelOrderRequest - (*OrderNo)(nil), // 6: OrderNo - (*ChangeOrderAddressRequest)(nil), // 7: ChangeOrderAddressRequest - (*OrderShipmentRequest)(nil), // 8: OrderShipmentRequest - (*QueryRebateListRequest)(nil), // 9: QueryRebateListRequest - (*OrderSubmitResponse)(nil), // 10: OrderSubmitResponse - (*PrepareOrderResponse)(nil), // 11: PrepareOrderResponse - (*SParentOrder)(nil), // 12: SParentOrder - (*SSingleOrder)(nil), // 13: SSingleOrder - (*Result)(nil), // 14: Result - (*StringMap)(nil), // 15: StringMap - (*String)(nil), // 16: String - (*QueryRebateListResponse)(nil), // 17: QueryRebateListResponse + (*OrderRequest)(nil), // 0: OrderRequest + (*SubmitOrderRequest)(nil), // 1: SubmitOrderRequest + (*PrepareOrderRequest)(nil), // 2: PrepareOrderRequest + (*OrderNoV2)(nil), // 3: OrderNoV2 + (*Int64)(nil), // 4: Int64 + (*TradeOrderTicketRequest)(nil), // 5: TradeOrderTicketRequest + (*CancelOrderRequest)(nil), // 6: CancelOrderRequest + (*OrderNo)(nil), // 7: OrderNo + (*ChangeOrderAddressRequest)(nil), // 8: ChangeOrderAddressRequest + (*OrderShipmentRequest)(nil), // 9: OrderShipmentRequest + (*QueryRebateListRequest)(nil), // 10: QueryRebateListRequest + (*OrderSubmitResponse)(nil), // 11: OrderSubmitResponse + (*PrepareOrderResponse)(nil), // 12: PrepareOrderResponse + (*SParentOrder)(nil), // 13: SParentOrder + (*SSingleOrder)(nil), // 14: SSingleOrder + (*Result)(nil), // 15: Result + (*StringMap)(nil), // 16: StringMap + (*String)(nil), // 17: String + (*QueryRebateListResponse)(nil), // 18: QueryRebateListResponse } var file_order_service_proto_depIdxs = []int32{ - 0, // 0: OrderService.SubmitOrder:input_type -> SubmitOrderRequest - 1, // 1: OrderService.PrepareOrder:input_type -> PrepareOrderRequest - 2, // 2: OrderService.GetParentOrder:input_type -> OrderNoV2 - 2, // 3: OrderService.GetOrder:input_type -> OrderNoV2 - 3, // 4: OrderService.TradeOrderCashPay:input_type -> Int64 - 4, // 5: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest - 1, // 6: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest - 5, // 7: OrderService.CancelOrder:input_type -> CancelOrderRequest - 6, // 8: OrderService.ConfirmOrder:input_type -> OrderNo - 7, // 9: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest - 6, // 10: OrderService.PickUp:input_type -> OrderNo - 8, // 11: OrderService.Ship:input_type -> OrderShipmentRequest - 6, // 12: OrderService.BuyerReceived:input_type -> OrderNo - 6, // 13: OrderService.forbid:input_type -> OrderNo - 6, // 14: OrderService.LogBytes:input_type -> OrderNo - 9, // 15: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest - 10, // 16: OrderService.SubmitOrder:output_type -> OrderSubmitResponse - 11, // 17: OrderService.PrepareOrder:output_type -> PrepareOrderResponse - 12, // 18: OrderService.GetParentOrder:output_type -> SParentOrder - 13, // 19: OrderService.GetOrder:output_type -> SSingleOrder - 14, // 20: OrderService.TradeOrderCashPay:output_type -> Result - 14, // 21: OrderService.TradeOrderUpdateTicket:output_type -> Result - 15, // 22: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap - 14, // 23: OrderService.CancelOrder:output_type -> Result - 14, // 24: OrderService.ConfirmOrder:output_type -> Result - 14, // 25: OrderService.ChangeShipmentAddress:output_type -> Result - 14, // 26: OrderService.PickUp:output_type -> Result - 14, // 27: OrderService.Ship:output_type -> Result - 14, // 28: OrderService.BuyerReceived:output_type -> Result - 14, // 29: OrderService.forbid:output_type -> Result - 16, // 30: OrderService.LogBytes:output_type -> String - 17, // 31: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse + 1, // 0: OrderService.SubmitOrder:input_type -> SubmitOrderRequest + 2, // 1: OrderService.PrepareOrder:input_type -> PrepareOrderRequest + 3, // 2: OrderService.GetParentOrder:input_type -> OrderNoV2 + 0, // 3: OrderService.GetOrder:input_type -> OrderRequest + 4, // 4: OrderService.TradeOrderCashPay:input_type -> Int64 + 5, // 5: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest + 2, // 6: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest + 6, // 7: OrderService.CancelOrder:input_type -> CancelOrderRequest + 7, // 8: OrderService.ConfirmOrder:input_type -> OrderNo + 8, // 9: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest + 7, // 10: OrderService.PickUp:input_type -> OrderNo + 9, // 11: OrderService.Ship:input_type -> OrderShipmentRequest + 7, // 12: OrderService.BuyerReceived:input_type -> OrderNo + 7, // 13: OrderService.forbid:input_type -> OrderNo + 7, // 14: OrderService.LogBytes:input_type -> OrderNo + 10, // 15: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest + 11, // 16: OrderService.SubmitOrder:output_type -> OrderSubmitResponse + 12, // 17: OrderService.PrepareOrder:output_type -> PrepareOrderResponse + 13, // 18: OrderService.GetParentOrder:output_type -> SParentOrder + 14, // 19: OrderService.GetOrder:output_type -> SSingleOrder + 15, // 20: OrderService.TradeOrderCashPay:output_type -> Result + 15, // 21: OrderService.TradeOrderUpdateTicket:output_type -> Result + 16, // 22: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap + 15, // 23: OrderService.CancelOrder:output_type -> Result + 15, // 24: OrderService.ConfirmOrder:output_type -> Result + 15, // 25: OrderService.ChangeShipmentAddress:output_type -> Result + 15, // 26: OrderService.PickUp:output_type -> Result + 15, // 27: OrderService.Ship:output_type -> Result + 15, // 28: OrderService.BuyerReceived:output_type -> Result + 15, // 29: OrderService.forbid:output_type -> Result + 17, // 30: OrderService.LogBytes:output_type -> String + 18, // 31: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse 16, // [16:32] is the sub-list for method output_type 0, // [0:16] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -147,18 +225,33 @@ func file_order_service_proto_init() { } file_global_proto_init() file_message_order_dto_proto_init() + if !protoimpl.UnsafeEnabled { + file_order_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*OrderRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_order_service_proto_rawDesc, NumEnums: 0, - NumMessages: 0, + NumMessages: 1, NumExtensions: 0, NumServices: 1, }, GoTypes: file_order_service_proto_goTypes, DependencyIndexes: file_order_service_proto_depIdxs, + MessageInfos: file_order_service_proto_msgTypes, }.Build() File_order_service_proto = out.File file_order_service_proto_rawDesc = nil diff --git a/core/service/proto/order_service_grpc.pb.go b/core/service/proto/order_service_grpc.pb.go index ba9c099a3..0bb06b95a 100644 --- a/core/service/proto/order_service_grpc.pb.go +++ b/core/service/proto/order_service_grpc.pb.go @@ -29,7 +29,7 @@ type OrderServiceClient interface { // 获取订单信息 GetParentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SParentOrder, error) // 获取子订单,orderId - GetOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SSingleOrder, error) + GetOrder(ctx context.Context, in *OrderRequest, opts ...grpc.CallOption) (*SSingleOrder, error) // 交易单现金支付,orderId TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) // 上传交易单发票 @@ -91,7 +91,7 @@ func (c *orderServiceClient) GetParentOrder(ctx context.Context, in *OrderNoV2, return out, nil } -func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SSingleOrder, error) { +func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderRequest, opts ...grpc.CallOption) (*SSingleOrder, error) { out := new(SSingleOrder) err := c.cc.Invoke(ctx, "/OrderService/GetOrder", in, out, opts...) if err != nil { @@ -219,7 +219,7 @@ type OrderServiceServer interface { // 获取订单信息 GetParentOrder(context.Context, *OrderNoV2) (*SParentOrder, error) // 获取子订单,orderId - GetOrder(context.Context, *OrderNoV2) (*SSingleOrder, error) + GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) // 交易单现金支付,orderId TradeOrderCashPay(context.Context, *Int64) (*Result, error) // 上传交易单发票 @@ -260,7 +260,7 @@ func (UnimplementedOrderServiceServer) PrepareOrder(context.Context, *PrepareOrd func (UnimplementedOrderServiceServer) GetParentOrder(context.Context, *OrderNoV2) (*SParentOrder, error) { return nil, status.Errorf(codes.Unimplemented, "method GetParentOrder not implemented") } -func (UnimplementedOrderServiceServer) GetOrder(context.Context, *OrderNoV2) (*SSingleOrder, error) { +func (UnimplementedOrderServiceServer) GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) { return nil, status.Errorf(codes.Unimplemented, "method GetOrder not implemented") } func (UnimplementedOrderServiceServer) TradeOrderCashPay(context.Context, *Int64) (*Result, error) { @@ -367,7 +367,7 @@ func _OrderService_GetParentOrder_Handler(srv interface{}, ctx context.Context, } func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OrderNoV2) + in := new(OrderRequest) if err := dec(in); err != nil { return nil, err } @@ -379,7 +379,7 @@ func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/OrderService/GetOrder", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServiceServer).GetOrder(ctx, req.(*OrderNoV2)) + return srv.(OrderServiceServer).GetOrder(ctx, req.(*OrderRequest)) } return interceptor(ctx, in, info, handler) } From 59737cbeeec290cecacea4d69b0b4bb0d2413e2f Mon Sep 17 00:00:00 2001 From: jarrysix Date: Mon, 20 Mar 2023 08:05:50 +0800 Subject: [PATCH 06/25] fix: order service --- core/service/impl/2.order_service.go | 68 ++++++++++++++++++++++++---- core/service/impl/services.go | 3 +- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 94f46ac57..a07f2ce8f 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -15,6 +15,7 @@ import ( "errors" "github.com/ixre/go2o/core/domain/interface/cart" + "github.com/ixre/go2o/core/domain/interface/express" "github.com/ixre/go2o/core/domain/interface/item" "github.com/ixre/go2o/core/domain/interface/member" "github.com/ixre/go2o/core/domain/interface/merchant" @@ -22,6 +23,7 @@ import ( "github.com/ixre/go2o/core/domain/interface/order" "github.com/ixre/go2o/core/domain/interface/payment" "github.com/ixre/go2o/core/domain/interface/product" + "github.com/ixre/go2o/core/domain/interface/shipment" "github.com/ixre/go2o/core/infrastructure/domain" "github.com/ixre/go2o/core/query" "github.com/ixre/go2o/core/service/parser" @@ -32,15 +34,18 @@ import ( var _ proto.OrderServiceServer = new(orderServiceImpl) type orderServiceImpl struct { - repo order.IOrderRepo - prodRepo product.IProductRepo - itemRepo item.IItemRepo - cartRepo cart.ICartRepo - mchRepo merchant.IMerchantRepo - shopRepo shop.IShopRepo - manager order.IOrderManager - memberRepo member.IMemberRepo - orderQuery *query.OrderQuery + repo order.IOrderRepo + prodRepo product.IProductRepo + itemRepo item.IItemRepo + cartRepo cart.ICartRepo + mchRepo merchant.IMerchantRepo + shopRepo shop.IShopRepo + manager order.IOrderManager + memberRepo member.IMemberRepo + payRepo payment.IPaymentRepo + shipRepo shipment.IShipmentRepo + expressRepo express.IExpressRepo + orderQuery *query.OrderQuery serviceUtil proto.UnimplementedOrderServiceServer } @@ -49,6 +54,8 @@ func NewShoppingService(r order.IOrderRepo, cartRepo cart.ICartRepo, memberRepo member.IMemberRepo, prodRepo product.IProductRepo, goodsRepo item.IItemRepo, mchRepo merchant.IMerchantRepo, shopRepo shop.IShopRepo, + payRepo payment.IPaymentRepo, shipRepo shipment.IShipmentRepo, + expressRepo express.IExpressRepo, orderQuery *query.OrderQuery) *orderServiceImpl { return &orderServiceImpl{ repo: r, @@ -58,6 +65,7 @@ func NewShoppingService(r order.IOrderRepo, itemRepo: goodsRepo, mchRepo: mchRepo, shopRepo: shopRepo, + payRepo: payRepo, manager: r.Manager(), orderQuery: orderQuery, } @@ -319,11 +327,51 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* } c := s.manager.Unified(r.OrderNo, true).Complex() if c != nil { - return parser.OrderDto(c), nil + ret := parser.OrderDto(c) + if r.WithDetail { + // 获取支付单信息 + po := s.payRepo.GetPaymentOrder(r.OrderNo) + if po != nil { + pv := po.Get() + ret.DeductAmount = int32(pv.DeductAmount) + ret.FinalAmount = int32(pv.FinalAmount) + ret.ExpiresTime = pv.ExpiresTime + ret.PayTime = pv.PaidTime + for _, t := range po.TradeMethods() { + pm := s.parseTradeMethodDataDto(t) + pm.ChanName = po.ChanName(t.Method) + if len(pm.ChanName) == 0 { + pm.ChanName = pv.OutTradeSp + } + ret.TradeData = append(ret.TradeData, pm) + } + } + // 获取发货单信息 + list := s.shipRepo.GetShipOrders(c.OrderId, true) + for _, v := range list { + // 绑定快递名称 + ex := s.expressRepo.GetExpressProvider(int32(v.Value().SpId)) + if ex != nil { + ret.ShipExpressName = ex.Name + } + ret.ShipLogisticCode = v.Value().SpOrder + break + } + } + return ret, nil } return nil, order.ErrNoSuchOrder } +func (s *orderServiceImpl) parseTradeMethodDataDto(src *payment.TradeMethodData) *proto.SOrderPayChanData { + return &proto.SOrderPayChanData{ + ChanId: int32(src.Method), + Amount: src.Amount, + ChanCode: src.Code, + OutTradeNo: src.OutTradeNo, + } +} + // TradeOrderCashPay 交易单现金支付 func (s *orderServiceImpl) TradeOrderCashPay(_ context.Context, orderId *proto.Int64) (ro *proto.Result, err error) { o := s.manager.GetOrderById(orderId.Value) diff --git a/core/service/impl/services.go b/core/service/impl/services.go index 7ce55c505..fc47f0388 100755 --- a/core/service/impl/services.go +++ b/core/service/impl/services.go @@ -180,7 +180,8 @@ func initService(ctx gof.App, db db.Connector, orm orm.Orm, sto storage.Interfac FoundationService = NewFoundationService(valueRepo, registryRepo, sto, notifyRepo) PromService = NewPromotionService(promRepo) OrderService = NewShoppingService(orderRepo, cartRepo, memberRepo, - productRepo, itemRepo, mchRepo, shopRepo, orderQuery) + productRepo, itemRepo, mchRepo, shopRepo, + paymentRepo, shipRepo, expressRepo, orderQuery) CartService = NewCartService(cartRepo, itemRepo, mchRepo, shopRepo) AfterSalesService = NewAfterSalesService(asRepo, afterSalesQuery, orderRepo) MerchantService = NewMerchantService(mchRepo, memberRepo, mchQuery, orderQuery) From 29048716fe4d5010da5e6b4fee9bd81d9df20e7a Mon Sep 17 00:00:00 2001 From: jarrysix Date: Tue, 21 Mar 2023 18:10:37 +0800 Subject: [PATCH 07/25] fix: get order --- core/service/impl/2.order_service.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index a07f2ce8f..8c3228b4a 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -347,15 +347,17 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* } } // 获取发货单信息 - list := s.shipRepo.GetShipOrders(c.OrderId, true) - for _, v := range list { - // 绑定快递名称 - ex := s.expressRepo.GetExpressProvider(int32(v.Value().SpId)) - if ex != nil { - ret.ShipExpressName = ex.Name + if c.Status >= order.StatShipped { + list := s.shipRepo.GetShipOrders(c.OrderId, true) + for _, v := range list { + // 绑定快递名称 + ex := s.expressRepo.GetExpressProvider(int32(v.Value().SpId)) + if ex != nil { + ret.ShipExpressName = ex.Name + } + ret.ShipLogisticCode = v.Value().SpOrder + break } - ret.ShipLogisticCode = v.Value().SpOrder - break } } return ret, nil From fa1fa752adcbc07cbb15108a1b2b88a535c33258 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Tue, 21 Mar 2023 18:21:42 +0800 Subject: [PATCH 08/25] fix: get order --- core/service/impl/2.order_service.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 8c3228b4a..58d74dcc3 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -13,6 +13,7 @@ import ( "bytes" "context" "errors" + "log" "github.com/ixre/go2o/core/domain/interface/cart" "github.com/ixre/go2o/core/domain/interface/express" @@ -348,6 +349,7 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* } // 获取发货单信息 if c.Status >= order.StatShipped { + log.Println("---", s.shipRepo == nil, c == nil) list := s.shipRepo.GetShipOrders(c.OrderId, true) for _, v := range list { // 绑定快递名称 From a93ffef46cdd20ab0893f1546f62a14c65e7a717 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Tue, 21 Mar 2023 18:24:56 +0800 Subject: [PATCH 09/25] fix: get order --- core/service/impl/2.order_service.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 58d74dcc3..223ac1c7a 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -13,7 +13,6 @@ import ( "bytes" "context" "errors" - "log" "github.com/ixre/go2o/core/domain/interface/cart" "github.com/ixre/go2o/core/domain/interface/express" @@ -67,6 +66,7 @@ func NewShoppingService(r order.IOrderRepo, mchRepo: mchRepo, shopRepo: shopRepo, payRepo: payRepo, + shipRepo: shipRepo, manager: r.Manager(), orderQuery: orderQuery, } @@ -348,8 +348,7 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* } } // 获取发货单信息 - if c.Status >= order.StatShipped { - log.Println("---", s.shipRepo == nil, c == nil) + if c.Status >= order.StatShipped && c.Status <= order.StatCompleted { list := s.shipRepo.GetShipOrders(c.OrderId, true) for _, v := range list { // 绑定快递名称 @@ -358,7 +357,6 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* ret.ShipExpressName = ex.Name } ret.ShipLogisticCode = v.Value().SpOrder - break } } } From 35a23011b7a4106cb54a59ba748d1da44dec5b55 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Wed, 22 Mar 2023 11:16:42 +0800 Subject: [PATCH 10/25] fix: order details include total amount --- core/service/impl/2.order_service.go | 1 + core/service/parser/parser.go | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 223ac1c7a..e0dfaf2b4 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -337,6 +337,7 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* ret.DeductAmount = int32(pv.DeductAmount) ret.FinalAmount = int32(pv.FinalAmount) ret.ExpiresTime = pv.ExpiresTime + ret.TotalAmount = int32(pv.TotalAmount) ret.PayTime = pv.PaidTime for _, t := range po.TradeMethods() { pm := s.parseTradeMethodDataDto(t) diff --git a/core/service/parser/parser.go b/core/service/parser/parser.go index 491c5ce79..78de5c780 100755 --- a/core/service/parser/parser.go +++ b/core/service/parser/parser.go @@ -263,10 +263,6 @@ func OrderDto(src *order.ComplexOrder) *proto.SSingleOrder { DiscountAmount: int32(src.DiscountAmount), ExpressFee: int32(src.ExpressFee), PackageFee: int32(src.PackageFee), - TotalAmount: 0, - DeductAmount: 0, - ProcedureFee: 0, - AdjustAmount: 0, FinalAmount: int32(src.FinalAmount), BuyerComment: d.BuyerComment, Consignee: &proto.SConsigneeInfo{ConsigneeName: src.Consignee.ConsigneeName, ConsigneePhone: src.Consignee.ConsigneePhone, ShippingAddress: src.Consignee.ShippingAddress, IsModified: src.ConsigneeModified == 1}, From 7b2ed629369670bb801bd356b07d3ac1f478febd Mon Sep 17 00:00:00 2001 From: jarrysix Date: Wed, 22 Mar 2023 16:38:26 +0800 Subject: [PATCH 11/25] fix: sub order item query no result --- core/domain/order/normal_order.go | 26 ++++---------------- core/dto/order.go | 2 ++ core/query/order_query.go | 41 ++++++++++++++++--------------- tests/query/order_query_test.go | 3 ++- 4 files changed, 30 insertions(+), 42 deletions(-) diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index d9d8cd8d0..584a246ac 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -707,23 +707,6 @@ func (o *normalOrderImpl) getBalanceDeductFee(acc member.IAccount) int64 { return acv.Balance } -// 获取Json格式的商品数据 -func (o *normalOrderImpl) getJsonItems() []byte { - //todo:??? 订单商品JSON表示 - return []byte("{}") - //var goods []*order.OrderGoods = make([]*order.OrderGoods, len(c.value.Items)) - //for i, v := range c.cart.Items { - // goods[i] = &order.OrderGoods{ - // GoodsId: v.SkuId, - // GoodsImage: v.Sku.Image, - // Quantity: v.Quantity, - // Name: v.Sku.Title, - // } - //} - //d, _ := json.Marshal(goods) - //return d -} - // 释放购物车并销毁 func (o *normalOrderImpl) destroyCart() error { if o.cart.Release(nil) { @@ -846,12 +829,13 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { "订单编号:%d,订单号:%s,vendor len:%d", parentOrderId, o.OrderNo(), len(o.vendorItemsMap)) } - + // requireCart后已创建商品与买家的映射 l := len(o.vendorItemsMap) list := make([]order.ISubOrder, l) i := 0 + orderId := o.GetAggregateRootId() + // 生成一个用于支付的子订单 - orderId := 0 if l > 1 { iso, err := o.createPaymentSubOrder() if err != nil { @@ -859,12 +843,12 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { return nil, err } list = append(list, iso) - orderId = int(iso.GetDomainId()) + //orderId = int(iso.GetDomainId()) } buyerId := o.buyer.GetAggregateRootId() for vendorId, v := range o.vendorItemsMap { - // 绑定商品项的订单编号到支付单 + // 绑定商品项的订单编号到父订单 //支付单 for _, it := range v { it.OrderId = int64(orderId) } diff --git a/core/dto/order.go b/core/dto/order.go index 5f864e74c..43a10a950 100755 --- a/core/dto/order.go +++ b/core/dto/order.go @@ -91,6 +91,8 @@ type ( Id int `json:"id"` // 订单编号 OrderId int64 `json:"orderId"` + // 卖家订单编号 + SellerOrderId int64 `json:"sellerOrderId"` // 商品快照编号 SnapshotId int `json:"snapshotId"` // Sku规格 diff --git a/core/query/order_query.go b/core/query/order_query.go index 396bd66ce..5a8af7a88 100755 --- a/core/query/order_query.go +++ b/core/query/order_query.go @@ -134,8 +134,8 @@ func (o *OrderQuery) QueryPagingNormalOrder(memberId, begin, size int64, paginat items := o.queryNormalOrderItems(idList) for _, v := range items { - if _, ok := orderMap[v.OrderId]; ok { - orderMap[v.OrderId].Items = append(orderMap[v.OrderId].Items, v) + if _, ok := orderMap[v.SellerOrderId]; ok { + orderMap[v.SellerOrderId].Items = append(orderMap[v.SellerOrderId].Items, v) } } } @@ -420,7 +420,7 @@ func (o *OrderQuery) PagingTradeOrderOfBuyer(memberId, begin, size int64, pagina var ticket string for rs.Next() { e := &proto.SSingleOrder{} - rs.Scan(&e.OrderId, &e.OrderNo, &e.SellerId, + rs.Scan(&e.OrderId, &e.OrderNo, &e.SellerId, &e.ItemAmount, &e.DiscountAmount, &e.FinalAmount, &cashPay, &ticket, &e.Status, &e.SubmitTime) e.Data = map[string]string{ @@ -504,23 +504,24 @@ func (o *OrderQuery) PagedTradeOrderOfVendor(vendorId int64, begin, size int, pa func (o *OrderQuery) queryNormalOrderItems(idArr []string) []*dto.OrderItem { list := make([]*dto.OrderItem, 0) + cmd := fmt.Sprintf(`SELECT si.id,si.seller_order_id,si.snap_id,sn.item_id,sn.sku,sn.sku_id, + sn.goods_title,sn.img,sn.price,si.quantity,si.return_quantity,si.amount,si.final_amount, + si.is_shipped FROM sale_order_item si INNER JOIN item_trade_snapshot sn + ON sn.id=si.snap_id WHERE si.seller_order_id IN (%s) + ORDER BY si.id ASC`, strings.Join(idArr, ",")) + + log.Println(cmd) // 查询分页订单的Item - _ = o.Query(fmt.Sprintf(`SELECT si.id,si.order_id,si.snap_id,sn.item_id,sn.sku,sn.sku_id, - sn.goods_title,sn.img,sn.price,si.quantity,si.return_quantity,si.amount,si.final_amount, - si.is_shipped FROM sale_order_item si INNER JOIN item_trade_snapshot sn - ON sn.id=si.snap_id WHERE si.order_id IN (%s) - ORDER BY si.id ASC`, - strings.Join(idArr, ",")), - func(rs *sql.Rows) { - for rs.Next() { - e := &dto.OrderItem{} - _ = rs.Scan(&e.Id, &e.OrderId, &e.SnapshotId, &e.ItemId, - &e.SpecWord, &e.SkuId, &e.ItemTitle, - &e.Image, &e.Price, &e.Quantity, &e.ReturnQuantity, &e.Amount, &e.FinalAmount, &e.IsShipped) - e.FinalPrice = int64(float64(e.FinalAmount) / float64(e.Quantity)) - e.Image = format.GetGoodsImageUrl(e.Image) - list = append(list, e) - } - }) + _ = o.Query(cmd, func(rs *sql.Rows) { + for rs.Next() { + e := &dto.OrderItem{} + _ = rs.Scan(&e.Id, &e.SellerOrderId, &e.SnapshotId, &e.ItemId, + &e.SpecWord, &e.SkuId, &e.ItemTitle, + &e.Image, &e.Price, &e.Quantity, &e.ReturnQuantity, &e.Amount, &e.FinalAmount, &e.IsShipped) + e.FinalPrice = int64(float64(e.FinalAmount) / float64(e.Quantity)) + e.Image = format.GetGoodsImageUrl(e.Image) + list = append(list, e) + } + }) return list } diff --git a/tests/query/order_query_test.go b/tests/query/order_query_test.go index 06f7be968..7f7fcf989 100644 --- a/tests/query/order_query_test.go +++ b/tests/query/order_query_test.go @@ -5,6 +5,7 @@ import ( "github.com/ixre/go2o/core/query" "github.com/ixre/go2o/tests/ti" + "github.com/ixre/gof/types/typeconv" ) func TestQueryMemberNormalOrderList(t *testing.T) { @@ -12,7 +13,7 @@ func TestQueryMemberNormalOrderList(t *testing.T) { q := query.NewOrderQuery(ti.GetOrm()) _, orders := q.QueryPagingNormalOrder(memberId, 0, 50, false, "", "") t.Log("count:", len(orders)) - t.Logf("orders:%#v", orders) + t.Log(typeconv.MustJson(orders[0])) //bytes, _ := json.Marshal(orders[0]) //t.Log(string(bytes)) } From 524aa5b25e5866c1ccda568c5e2692a241a7b83a Mon Sep 17 00:00:00 2001 From: jarrysix Date: Wed, 22 Mar 2023 17:34:12 +0800 Subject: [PATCH 12/25] fix: cancel sub payment order --- core/domain/order/normal_order.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index 584a246ac..c21ef4d94 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -835,16 +835,16 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { i := 0 orderId := o.GetAggregateRootId() - // 生成一个用于支付的子订单 - if l > 1 { - iso, err := o.createPaymentSubOrder() - if err != nil { - log.Println("生成子订单失败:" + err.Error()) - return nil, err - } - list = append(list, iso) - //orderId = int(iso.GetDomainId()) - } + // // 生成一个用于支付的子订单 + // if l > 1 { + // iso, err := o.createPaymentSubOrder() + // if err != nil { + // log.Println("生成子订单失败:" + err.Error()) + // return nil, err + // } + // list = append(list, iso) + // //orderId = int(iso.GetDomainId()) + // } buyerId := o.buyer.GetAggregateRootId() for vendorId, v := range o.vendorItemsMap { @@ -868,7 +868,7 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { return list, nil } -// createPaymentSubOrder 生成一个用于合并支付的子订单 +// createPaymentSubOrder 生成一个用于合并支付的子订单 //todo: 删除 func (o *normalOrderImpl) createPaymentSubOrder() (order.ISubOrder, error) { orderNo := o.OrderNo() breakStatus := order.BreakDefault From 0ddb52cc68d0240db4d2ab74cdfda7bc4fdbc0ba Mon Sep 17 00:00:00 2001 From: jarrysix Date: Wed, 22 Mar 2023 17:54:47 +0800 Subject: [PATCH 13/25] fix: submit order response --- core/domain/interface/order/order.go | 6 +- core/domain/order/order_manager.go | 5 +- core/service/idl/message/order_dto.proto | 12 +- core/service/impl/2.order_service.go | 4 +- core/service/proto/advertisement_dto.pb.go | 2 +- .../service/proto/advertisement_service.pb.go | 2 +- .../proto/advertisement_service_grpc.pb.go | 77 ++-- core/service/proto/aftersales_service.pb.go | 2 +- .../proto/aftersales_service_grpc.pb.go | 72 +-- core/service/proto/app_service.pb.go | 2 +- core/service/proto/app_service_grpc.pb.go | 42 +- core/service/proto/bank_dto.pb.go | 2 +- core/service/proto/cart_dto.pb.go | 2 +- core/service/proto/cart_service.pb.go | 2 +- core/service/proto/cart_service_grpc.pb.go | 32 +- core/service/proto/code_service.pb.go | 2 +- core/service/proto/code_service_grpc.pb.go | 37 +- core/service/proto/content_service.pb.go | 2 +- core/service/proto/content_service_grpc.pb.go | 67 +-- core/service/proto/coupon_dto.pb.go | 2 +- core/service/proto/events_dto.pb.go | 2 +- core/service/proto/execution_service.pb.go | 2 +- .../proto/execution_service_grpc.pb.go | 42 +- core/service/proto/express_service.pb.go | 2 +- core/service/proto/express_service_grpc.pb.go | 52 ++- core/service/proto/finance_service.pb.go | 2 +- core/service/proto/finance_service_grpc.pb.go | 37 +- core/service/proto/foundation_dto.pb.go | 2 +- core/service/proto/foundation_service.pb.go | 2 +- .../proto/foundation_service_grpc.pb.go | 122 +++-- core/service/proto/global.pb.go | 2 +- core/service/proto/item_dto.pb.go | 2 +- core/service/proto/item_service.pb.go | 2 +- core/service/proto/item_service_grpc.pb.go | 117 +++-- core/service/proto/member_dto.pb.go | 2 +- core/service/proto/member_service.pb.go | 2 +- core/service/proto/member_service_grpc.pb.go | 417 ++++++++++------- core/service/proto/merchant_dto.pb.go | 2 +- core/service/proto/merchant_service.pb.go | 2 +- .../service/proto/merchant_service_grpc.pb.go | 217 +++++---- core/service/proto/message_dto.pb.go | 2 +- core/service/proto/message_service.pb.go | 2 +- core/service/proto/message_service_grpc.pb.go | 52 ++- core/service/proto/order_dto.pb.go | 424 +++++++++--------- core/service/proto/order_service.pb.go | 2 +- core/service/proto/order_service_grpc.pb.go | 87 ++-- core/service/proto/payment_dto.pb.go | 2 +- core/service/proto/payment_service.pb.go | 2 +- core/service/proto/payment_service_grpc.pb.go | 87 ++-- core/service/proto/portal_service.pb.go | 2 +- core/service/proto/portal_service_grpc.pb.go | 62 ++- core/service/proto/product_service.pb.go | 2 +- core/service/proto/product_service_grpc.pb.go | 102 +++-- core/service/proto/query_dto.pb.go | 2 +- core/service/proto/query_service.pb.go | 2 +- core/service/proto/query_service_grpc.pb.go | 77 ++-- core/service/proto/quick_pay_service.pb.go | 2 +- .../proto/quick_pay_service_grpc.pb.go | 42 +- core/service/proto/rbac_service.pb.go | 2 +- core/service/proto/rbac_service_grpc.pb.go | 147 +++--- core/service/proto/registry_service.pb.go | 2 +- .../service/proto/registry_service_grpc.pb.go | 57 ++- core/service/proto/shipment_dto.pb.go | 2 +- core/service/proto/shipment_service.pb.go | 2 +- .../service/proto/shipment_service_grpc.pb.go | 27 +- core/service/proto/shop_service.pb.go | 2 +- core/service/proto/shop_service_grpc.pb.go | 57 ++- core/service/proto/status_service.pb.go | 2 +- core/service/proto/status_service_grpc.pb.go | 12 +- core/service/proto/test.pb.go | 2 +- core/service/proto/test_grpc.pb.go | 12 +- core/service/proto/wallet_dto.pb.go | 2 +- core/service/proto/wallet_service.pb.go | 2 +- core/service/proto/wallet_service_grpc.pb.go | 82 ++-- tests/domain/order_test.go | 6 +- 75 files changed, 1647 insertions(+), 1128 deletions(-) diff --git a/core/domain/interface/order/order.go b/core/domain/interface/order/order.go index a2b835291..8c499d1ec 100755 --- a/core/domain/interface/order/order.go +++ b/core/domain/interface/order/order.go @@ -317,14 +317,14 @@ type ( SubmitReturnData struct { // 订单号，多个订单号，用","分割 OrderNo string - // 交易号 - TradeNo string // 交易金额 TradeAmount int64 // 合并支付 - MergePay bool + IsMergePay bool // 支付单号 PaymentOrderNo string + // 支付状态 + PaymentState int } // Order 订单 diff --git a/core/domain/order/order_manager.go b/core/domain/order/order_manager.go index 69e050ff0..b807ea7bd 100755 --- a/core/domain/order/order_manager.go +++ b/core/domain/order/order_manager.go @@ -305,10 +305,11 @@ func (t *orderManagerImpl) submitNormalOrder(data order.SubmitOrderData) (order. // //... // } - rd.TradeNo = ipv.TradeNo + rd.IsMergePay = len(no.GetSubOrders()) > 1 rd.TradeAmount = ipv.FinalAmount rd.OrderNo = ipv.OutOrderNo - rd.PaymentOrderNo = o.GetPaymentOrder().TradeNo() + rd.PaymentState = ipv.State + rd.PaymentOrderNo = ipv.TradeNo return o, rd, err // 剩下单个订单未支付 diff --git a/core/service/idl/message/order_dto.proto b/core/service/idl/message/order_dto.proto index e131f88c5..d7c355456 100644 --- a/core/service/idl/message/order_dto.proto +++ b/core/service/idl/message/order_dto.proto @@ -314,14 +314,14 @@ message OrderSubmitResponse { string errMsg = 2; // 订单号，多个订单号，用","分割 string orderNo = 3; + // 是否已支付 + bool isPayFinish = 4; // 合并支付 - bool mergePay = 4; - // 交易号 - string tradeNo = 5; - // 交易金额 - int64 tradeAmount = 6; + bool isMergePay = 5; // 支付单号 - string paymentOrderNo = 7; + string paymentOrderNo = 6; + // 交易金额 + int64 tradeAmount = 7; } // 获取订单请求 diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index e0dfaf2b4..324aae13c 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -150,8 +150,8 @@ func (s *orderServiceImpl) SubmitOrder(_ context.Context, r *proto.SubmitOrderRe ret.ErrMsg = err.Error() } else { ret.OrderNo = rd.OrderNo - ret.MergePay = rd.MergePay - ret.TradeNo = rd.TradeNo + ret.IsMergePay = rd.IsMergePay + ret.IsPayFinish = rd.PaymentState == payment.StateFinished ret.TradeAmount = rd.TradeAmount ret.PaymentOrderNo = rd.PaymentOrderNo } diff --git a/core/service/proto/advertisement_dto.pb.go b/core/service/proto/advertisement_dto.pb.go index edf6b6bff..cace3e0f2 100644 --- a/core/service/proto/advertisement_dto.pb.go +++ b/core/service/proto/advertisement_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/advertisement_dto.proto package proto diff --git a/core/service/proto/advertisement_service.pb.go b/core/service/proto/advertisement_service.pb.go index 6d5b131d9..67a24e633 100644 --- a/core/service/proto/advertisement_service.pb.go +++ b/core/service/proto/advertisement_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: advertisement_service.proto package proto diff --git a/core/service/proto/advertisement_service_grpc.pb.go b/core/service/proto/advertisement_service_grpc.pb.go index 83eb0dc2c..9fa93937a 100644 --- a/core/service/proto/advertisement_service_grpc.pb.go +++ b/core/service/proto/advertisement_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: advertisement_service.proto package proto @@ -18,6 +18,23 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + AdvertisementService_GetGroups_FullMethodName = "/AdvertisementService/GetGroups" + AdvertisementService_GetPosition_FullMethodName = "/AdvertisementService/GetPosition" + AdvertisementService_SaveAdPosition_FullMethodName = "/AdvertisementService/SaveAdPosition" + AdvertisementService_DeleteAdPosition_FullMethodName = "/AdvertisementService/DeleteAdPosition" + AdvertisementService_PutDefaultAd_FullMethodName = "/AdvertisementService/PutDefaultAd" + AdvertisementService_QueryAd_FullMethodName = "/AdvertisementService/QueryAd" + AdvertisementService_QueryAdvertisementData_FullMethodName = "/AdvertisementService/QueryAdvertisementData" + AdvertisementService_SetUserAd_FullMethodName = "/AdvertisementService/SetUserAd" + AdvertisementService_GetAdvertisement_FullMethodName = "/AdvertisementService/GetAdvertisement" + AdvertisementService_SaveAd_FullMethodName = "/AdvertisementService/SaveAd" + AdvertisementService_DeleteAd_FullMethodName = "/AdvertisementService/DeleteAd" + AdvertisementService_SaveSwiperAdImage_FullMethodName = "/AdvertisementService/SaveSwiperAdImage" + AdvertisementService_GetSwiperAdImage_FullMethodName = "/AdvertisementService/GetSwiperAdImage" + AdvertisementService_DeleteSwiperAdImage_FullMethodName = "/AdvertisementService/DeleteSwiperAdImage" +) + // AdvertisementServiceClient is the client API for AdvertisementService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -58,7 +75,7 @@ func NewAdvertisementServiceClient(cc grpc.ClientConnInterface) AdvertisementSer func (c *advertisementServiceClient) GetGroups(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*AdGroupResponse, error) { out := new(AdGroupResponse) - err := c.cc.Invoke(ctx, "/AdvertisementService/GetGroups", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_GetGroups_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -67,7 +84,7 @@ func (c *advertisementServiceClient) GetGroups(ctx context.Context, in *Empty, o func (c *advertisementServiceClient) GetPosition(ctx context.Context, in *AdPositionId, opts ...grpc.CallOption) (*SAdPosition, error) { out := new(SAdPosition) - err := c.cc.Invoke(ctx, "/AdvertisementService/GetPosition", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_GetPosition_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -76,7 +93,7 @@ func (c *advertisementServiceClient) GetPosition(ctx context.Context, in *AdPosi func (c *advertisementServiceClient) SaveAdPosition(ctx context.Context, in *SAdPosition, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/SaveAdPosition", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_SaveAdPosition_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -85,7 +102,7 @@ func (c *advertisementServiceClient) SaveAdPosition(ctx context.Context, in *SAd func (c *advertisementServiceClient) DeleteAdPosition(ctx context.Context, in *AdPositionId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteAdPosition", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_DeleteAdPosition_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -94,7 +111,7 @@ func (c *advertisementServiceClient) DeleteAdPosition(ctx context.Context, in *A func (c *advertisementServiceClient) PutDefaultAd(ctx context.Context, in *SetDefaultAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/PutDefaultAd", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_PutDefaultAd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -103,7 +120,7 @@ func (c *advertisementServiceClient) PutDefaultAd(ctx context.Context, in *SetDe func (c *advertisementServiceClient) QueryAd(ctx context.Context, in *QueryAdRequest, opts ...grpc.CallOption) (*QueryAdResponse, error) { out := new(QueryAdResponse) - err := c.cc.Invoke(ctx, "/AdvertisementService/QueryAd", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_QueryAd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -112,7 +129,7 @@ func (c *advertisementServiceClient) QueryAd(ctx context.Context, in *QueryAdReq func (c *advertisementServiceClient) QueryAdvertisementData(ctx context.Context, in *QueryAdvertisementDataRequest, opts ...grpc.CallOption) (*QueryAdvertisementDataResponse, error) { out := new(QueryAdvertisementDataResponse) - err := c.cc.Invoke(ctx, "/AdvertisementService/QueryAdvertisementData", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_QueryAdvertisementData_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -121,7 +138,7 @@ func (c *advertisementServiceClient) QueryAdvertisementData(ctx context.Context, func (c *advertisementServiceClient) SetUserAd(ctx context.Context, in *SetUserAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/SetUserAd", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_SetUserAd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -130,7 +147,7 @@ func (c *advertisementServiceClient) SetUserAd(ctx context.Context, in *SetUserA func (c *advertisementServiceClient) GetAdvertisement(ctx context.Context, in *AdIdRequest, opts ...grpc.CallOption) (*SAdDto, error) { out := new(SAdDto) - err := c.cc.Invoke(ctx, "/AdvertisementService/GetAdvertisement", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_GetAdvertisement_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -139,7 +156,7 @@ func (c *advertisementServiceClient) GetAdvertisement(ctx context.Context, in *A func (c *advertisementServiceClient) SaveAd(ctx context.Context, in *SaveAdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/SaveAd", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_SaveAd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -148,7 +165,7 @@ func (c *advertisementServiceClient) SaveAd(ctx context.Context, in *SaveAdReque func (c *advertisementServiceClient) DeleteAd(ctx context.Context, in *AdIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteAd", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_DeleteAd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -157,7 +174,7 @@ func (c *advertisementServiceClient) DeleteAd(ctx context.Context, in *AdIdReque func (c *advertisementServiceClient) SaveSwiperAdImage(ctx context.Context, in *SaveSwiperImageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/SaveSwiperAdImage", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_SaveSwiperAdImage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -166,7 +183,7 @@ func (c *advertisementServiceClient) SaveSwiperAdImage(ctx context.Context, in * func (c *advertisementServiceClient) GetSwiperAdImage(ctx context.Context, in *ImageIdRequest, opts ...grpc.CallOption) (*SImageAdData, error) { out := new(SImageAdData) - err := c.cc.Invoke(ctx, "/AdvertisementService/GetSwiperAdImage", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_GetSwiperAdImage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -175,7 +192,7 @@ func (c *advertisementServiceClient) GetSwiperAdImage(ctx context.Context, in *I func (c *advertisementServiceClient) DeleteSwiperAdImage(ctx context.Context, in *ImageIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AdvertisementService/DeleteSwiperAdImage", in, out, opts...) + err := c.cc.Invoke(ctx, AdvertisementService_DeleteSwiperAdImage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -282,7 +299,7 @@ func _AdvertisementService_GetGroups_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/GetGroups", + FullMethod: AdvertisementService_GetGroups_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetGroups(ctx, req.(*Empty)) @@ -300,7 +317,7 @@ func _AdvertisementService_GetPosition_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/GetPosition", + FullMethod: AdvertisementService_GetPosition_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetPosition(ctx, req.(*AdPositionId)) @@ -318,7 +335,7 @@ func _AdvertisementService_SaveAdPosition_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/SaveAdPosition", + FullMethod: AdvertisementService_SaveAdPosition_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveAdPosition(ctx, req.(*SAdPosition)) @@ -336,7 +353,7 @@ func _AdvertisementService_DeleteAdPosition_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/DeleteAdPosition", + FullMethod: AdvertisementService_DeleteAdPosition_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteAdPosition(ctx, req.(*AdPositionId)) @@ -354,7 +371,7 @@ func _AdvertisementService_PutDefaultAd_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/PutDefaultAd", + FullMethod: AdvertisementService_PutDefaultAd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).PutDefaultAd(ctx, req.(*SetDefaultAdRequest)) @@ -372,7 +389,7 @@ func _AdvertisementService_QueryAd_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/QueryAd", + FullMethod: AdvertisementService_QueryAd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).QueryAd(ctx, req.(*QueryAdRequest)) @@ -390,7 +407,7 @@ func _AdvertisementService_QueryAdvertisementData_Handler(srv interface{}, ctx c } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/QueryAdvertisementData", + FullMethod: AdvertisementService_QueryAdvertisementData_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).QueryAdvertisementData(ctx, req.(*QueryAdvertisementDataRequest)) @@ -408,7 +425,7 @@ func _AdvertisementService_SetUserAd_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/SetUserAd", + FullMethod: AdvertisementService_SetUserAd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SetUserAd(ctx, req.(*SetUserAdRequest)) @@ -426,7 +443,7 @@ func _AdvertisementService_GetAdvertisement_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/GetAdvertisement", + FullMethod: AdvertisementService_GetAdvertisement_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetAdvertisement(ctx, req.(*AdIdRequest)) @@ -444,7 +461,7 @@ func _AdvertisementService_SaveAd_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/SaveAd", + FullMethod: AdvertisementService_SaveAd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveAd(ctx, req.(*SaveAdRequest)) @@ -462,7 +479,7 @@ func _AdvertisementService_DeleteAd_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/DeleteAd", + FullMethod: AdvertisementService_DeleteAd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteAd(ctx, req.(*AdIdRequest)) @@ -480,7 +497,7 @@ func _AdvertisementService_SaveSwiperAdImage_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/SaveSwiperAdImage", + FullMethod: AdvertisementService_SaveSwiperAdImage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).SaveSwiperAdImage(ctx, req.(*SaveSwiperImageRequest)) @@ -498,7 +515,7 @@ func _AdvertisementService_GetSwiperAdImage_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/GetSwiperAdImage", + FullMethod: AdvertisementService_GetSwiperAdImage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).GetSwiperAdImage(ctx, req.(*ImageIdRequest)) @@ -516,7 +533,7 @@ func _AdvertisementService_DeleteSwiperAdImage_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AdvertisementService/DeleteSwiperAdImage", + FullMethod: AdvertisementService_DeleteSwiperAdImage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AdvertisementServiceServer).DeleteSwiperAdImage(ctx, req.(*ImageIdRequest)) diff --git a/core/service/proto/aftersales_service.pb.go b/core/service/proto/aftersales_service.pb.go index 12f23335c..602fb038b 100644 --- a/core/service/proto/aftersales_service.pb.go +++ b/core/service/proto/aftersales_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: aftersales_service.proto package proto diff --git a/core/service/proto/aftersales_service_grpc.pb.go b/core/service/proto/aftersales_service_grpc.pb.go index f73d134fc..4ccf14bbe 100644 --- a/core/service/proto/aftersales_service_grpc.pb.go +++ b/core/service/proto/aftersales_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: aftersales_service.proto package proto @@ -18,6 +18,22 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + AfterSalesService_SubmitAfterSalesOrder_FullMethodName = "/AfterSalesService/SubmitAfterSalesOrder" + AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName = "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder" + AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName = "/AfterSalesService/QueryPagerAfterSalesOrderOfMember" + AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName = "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor" + AfterSalesService_GetAfterSaleOrder_FullMethodName = "/AfterSalesService/GetAfterSaleOrder" + AfterSalesService_AgreeAfterSales_FullMethodName = "/AfterSalesService/AgreeAfterSales" + AfterSalesService_DeclineAfterSales_FullMethodName = "/AfterSalesService/DeclineAfterSales" + AfterSalesService_RequestIntercede_FullMethodName = "/AfterSalesService/RequestIntercede" + AfterSalesService_ConfirmAfterSales_FullMethodName = "/AfterSalesService/ConfirmAfterSales" + AfterSalesService_RejectAfterSales_FullMethodName = "/AfterSalesService/RejectAfterSales" + AfterSalesService_ProcessAfterSalesOrder_FullMethodName = "/AfterSalesService/ProcessAfterSalesOrder" + AfterSalesService_ReturnShipment_FullMethodName = "/AfterSalesService/ReturnShipment" + AfterSalesService_ReceiveItem_FullMethodName = "/AfterSalesService/ReceiveItem" +) + // AfterSalesServiceClient is the client API for AfterSalesService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -60,7 +76,7 @@ func NewAfterSalesServiceClient(cc grpc.ClientConnInterface) AfterSalesServiceCl func (c *afterSalesServiceClient) SubmitAfterSalesOrder(ctx context.Context, in *SubmitAfterSalesOrderRequest, opts ...grpc.CallOption) (*SubmitAfterSalesOrderResponse, error) { out := new(SubmitAfterSalesOrderResponse) - err := c.cc.Invoke(ctx, "/AfterSalesService/SubmitAfterSalesOrder", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_SubmitAfterSalesOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -69,7 +85,7 @@ func (c *afterSalesServiceClient) SubmitAfterSalesOrder(ctx context.Context, in func (c *afterSalesServiceClient) GetAllAfterSalesOrderOfSaleOrder(ctx context.Context, in *OriginOrderIdRequest, opts ...grpc.CallOption) (*AfterSalesOrderListResponse, error) { out := new(AfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -78,7 +94,7 @@ func (c *afterSalesServiceClient) GetAllAfterSalesOrderOfSaleOrder(ctx context.C func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfMember(ctx context.Context, in *PagingBuyerOrdersRequest, opts ...grpc.CallOption) (*PagingBuyerAfterSalesOrderListResponse, error) { out := new(PagingBuyerAfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, "/AfterSalesService/QueryPagerAfterSalesOrderOfMember", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -87,7 +103,7 @@ func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfMember(ctx context. func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfVendor(ctx context.Context, in *PagingSellerOrdersRequest, opts ...grpc.CallOption) (*PagingSellerAfterSalesOrderListResponse, error) { out := new(PagingSellerAfterSalesOrderListResponse) - err := c.cc.Invoke(ctx, "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -96,7 +112,7 @@ func (c *afterSalesServiceClient) QueryPagerAfterSalesOrderOfVendor(ctx context. func (c *afterSalesServiceClient) GetAfterSaleOrder(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*SAfterSalesOrder, error) { out := new(SAfterSalesOrder) - err := c.cc.Invoke(ctx, "/AfterSalesService/GetAfterSaleOrder", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_GetAfterSaleOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -105,7 +121,7 @@ func (c *afterSalesServiceClient) GetAfterSaleOrder(ctx context.Context, in *Aft func (c *afterSalesServiceClient) AgreeAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/AgreeAfterSales", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_AgreeAfterSales_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -114,7 +130,7 @@ func (c *afterSalesServiceClient) AgreeAfterSales(ctx context.Context, in *After func (c *afterSalesServiceClient) DeclineAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/DeclineAfterSales", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_DeclineAfterSales_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -123,7 +139,7 @@ func (c *afterSalesServiceClient) DeclineAfterSales(ctx context.Context, in *Aft func (c *afterSalesServiceClient) RequestIntercede(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/RequestIntercede", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_RequestIntercede_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -132,7 +148,7 @@ func (c *afterSalesServiceClient) RequestIntercede(ctx context.Context, in *Afte func (c *afterSalesServiceClient) ConfirmAfterSales(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/ConfirmAfterSales", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_ConfirmAfterSales_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -141,7 +157,7 @@ func (c *afterSalesServiceClient) ConfirmAfterSales(ctx context.Context, in *Aft func (c *afterSalesServiceClient) RejectAfterSales(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/RejectAfterSales", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_RejectAfterSales_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -150,7 +166,7 @@ func (c *afterSalesServiceClient) RejectAfterSales(ctx context.Context, in *Afte func (c *afterSalesServiceClient) ProcessAfterSalesOrder(ctx context.Context, in *AfterSalesProcessRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/ProcessAfterSalesOrder", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_ProcessAfterSalesOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -159,7 +175,7 @@ func (c *afterSalesServiceClient) ProcessAfterSalesOrder(ctx context.Context, in func (c *afterSalesServiceClient) ReturnShipment(ctx context.Context, in *ReturnShipmentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/ReturnShipment", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_ReturnShipment_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -168,7 +184,7 @@ func (c *afterSalesServiceClient) ReturnShipment(ctx context.Context, in *Return func (c *afterSalesServiceClient) ReceiveItem(ctx context.Context, in *AfterSalesOrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AfterSalesService/ReceiveItem", in, out, opts...) + err := c.cc.Invoke(ctx, AfterSalesService_ReceiveItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -274,7 +290,7 @@ func _AfterSalesService_SubmitAfterSalesOrder_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/SubmitAfterSalesOrder", + FullMethod: AfterSalesService_SubmitAfterSalesOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).SubmitAfterSalesOrder(ctx, req.(*SubmitAfterSalesOrderRequest)) @@ -292,7 +308,7 @@ func _AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_Handler(srv interface{} } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/GetAllAfterSalesOrderOfSaleOrder", + FullMethod: AfterSalesService_GetAllAfterSalesOrderOfSaleOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).GetAllAfterSalesOrderOfSaleOrder(ctx, req.(*OriginOrderIdRequest)) @@ -310,7 +326,7 @@ func _AfterSalesService_QueryPagerAfterSalesOrderOfMember_Handler(srv interface{ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/QueryPagerAfterSalesOrderOfMember", + FullMethod: AfterSalesService_QueryPagerAfterSalesOrderOfMember_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).QueryPagerAfterSalesOrderOfMember(ctx, req.(*PagingBuyerOrdersRequest)) @@ -328,7 +344,7 @@ func _AfterSalesService_QueryPagerAfterSalesOrderOfVendor_Handler(srv interface{ } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/QueryPagerAfterSalesOrderOfVendor", + FullMethod: AfterSalesService_QueryPagerAfterSalesOrderOfVendor_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).QueryPagerAfterSalesOrderOfVendor(ctx, req.(*PagingSellerOrdersRequest)) @@ -346,7 +362,7 @@ func _AfterSalesService_GetAfterSaleOrder_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/GetAfterSaleOrder", + FullMethod: AfterSalesService_GetAfterSaleOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).GetAfterSaleOrder(ctx, req.(*AfterSalesOrderNo)) @@ -364,7 +380,7 @@ func _AfterSalesService_AgreeAfterSales_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/AgreeAfterSales", + FullMethod: AfterSalesService_AgreeAfterSales_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).AgreeAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -382,7 +398,7 @@ func _AfterSalesService_DeclineAfterSales_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/DeclineAfterSales", + FullMethod: AfterSalesService_DeclineAfterSales_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).DeclineAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -400,7 +416,7 @@ func _AfterSalesService_RequestIntercede_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/RequestIntercede", + FullMethod: AfterSalesService_RequestIntercede_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).RequestIntercede(ctx, req.(*AfterSalesProcessRequest)) @@ -418,7 +434,7 @@ func _AfterSalesService_ConfirmAfterSales_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/ConfirmAfterSales", + FullMethod: AfterSalesService_ConfirmAfterSales_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ConfirmAfterSales(ctx, req.(*AfterSalesOrderNo)) @@ -436,7 +452,7 @@ func _AfterSalesService_RejectAfterSales_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/RejectAfterSales", + FullMethod: AfterSalesService_RejectAfterSales_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).RejectAfterSales(ctx, req.(*AfterSalesProcessRequest)) @@ -454,7 +470,7 @@ func _AfterSalesService_ProcessAfterSalesOrder_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/ProcessAfterSalesOrder", + FullMethod: AfterSalesService_ProcessAfterSalesOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ProcessAfterSalesOrder(ctx, req.(*AfterSalesProcessRequest)) @@ -472,7 +488,7 @@ func _AfterSalesService_ReturnShipment_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/ReturnShipment", + FullMethod: AfterSalesService_ReturnShipment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ReturnShipment(ctx, req.(*ReturnShipmentRequest)) @@ -490,7 +506,7 @@ func _AfterSalesService_ReceiveItem_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AfterSalesService/ReceiveItem", + FullMethod: AfterSalesService_ReceiveItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AfterSalesServiceServer).ReceiveItem(ctx, req.(*AfterSalesOrderNo)) diff --git a/core/service/proto/app_service.pb.go b/core/service/proto/app_service.pb.go index a4575b632..0b31551a0 100644 --- a/core/service/proto/app_service.pb.go +++ b/core/service/proto/app_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: app_service.proto package proto diff --git a/core/service/proto/app_service_grpc.pb.go b/core/service/proto/app_service_grpc.pb.go index e2a1bb4eb..404bfb07d 100644 --- a/core/service/proto/app_service_grpc.pb.go +++ b/core/service/proto/app_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: app_service.proto package proto @@ -18,6 +18,16 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + AppService_SaveProd_FullMethodName = "/AppService/SaveProd" + AppService_SaveVersion_FullMethodName = "/AppService/SaveVersion" + AppService_GetProd_FullMethodName = "/AppService/GetProd" + AppService_GetVersion_FullMethodName = "/AppService/GetVersion" + AppService_DeleteProd_FullMethodName = "/AppService/DeleteProd" + AppService_DeleteVersion_FullMethodName = "/AppService/DeleteVersion" + AppService_CheckVersion_FullMethodName = "/AppService/CheckVersion" +) + // AppServiceClient is the client API for AppService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -48,7 +58,7 @@ func NewAppServiceClient(cc grpc.ClientConnInterface) AppServiceClient { func (c *appServiceClient) SaveProd(ctx context.Context, in *AppProdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AppService/SaveProd", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_SaveProd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -57,7 +67,7 @@ func (c *appServiceClient) SaveProd(ctx context.Context, in *AppProdRequest, opt func (c *appServiceClient) SaveVersion(ctx context.Context, in *AppVersionRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AppService/SaveVersion", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_SaveVersion_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -66,7 +76,7 @@ func (c *appServiceClient) SaveVersion(ctx context.Context, in *AppVersionReques func (c *appServiceClient) GetProd(ctx context.Context, in *AppId, opts ...grpc.CallOption) (*SAppProd, error) { out := new(SAppProd) - err := c.cc.Invoke(ctx, "/AppService/GetProd", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_GetProd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -75,7 +85,7 @@ func (c *appServiceClient) GetProd(ctx context.Context, in *AppId, opts ...grpc. func (c *appServiceClient) GetVersion(ctx context.Context, in *AppVersionId, opts ...grpc.CallOption) (*SAppVersion, error) { out := new(SAppVersion) - err := c.cc.Invoke(ctx, "/AppService/GetVersion", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_GetVersion_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,7 +94,7 @@ func (c *appServiceClient) GetVersion(ctx context.Context, in *AppVersionId, opt func (c *appServiceClient) DeleteProd(ctx context.Context, in *AppId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AppService/DeleteProd", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_DeleteProd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,7 +103,7 @@ func (c *appServiceClient) DeleteProd(ctx context.Context, in *AppId, opts ...gr func (c *appServiceClient) DeleteVersion(ctx context.Context, in *AppVersionId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/AppService/DeleteVersion", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_DeleteVersion_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -102,7 +112,7 @@ func (c *appServiceClient) DeleteVersion(ctx context.Context, in *AppVersionId, func (c *appServiceClient) CheckVersion(ctx context.Context, in *CheckVersionRequest, opts ...grpc.CallOption) (*CheckVersionResponse, error) { out := new(CheckVersionResponse) - err := c.cc.Invoke(ctx, "/AppService/CheckVersion", in, out, opts...) + err := c.cc.Invoke(ctx, AppService_CheckVersion_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -178,7 +188,7 @@ func _AppService_SaveProd_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/SaveProd", + FullMethod: AppService_SaveProd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).SaveProd(ctx, req.(*AppProdRequest)) @@ -196,7 +206,7 @@ func _AppService_SaveVersion_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/SaveVersion", + FullMethod: AppService_SaveVersion_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).SaveVersion(ctx, req.(*AppVersionRequest)) @@ -214,7 +224,7 @@ func _AppService_GetProd_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/GetProd", + FullMethod: AppService_GetProd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).GetProd(ctx, req.(*AppId)) @@ -232,7 +242,7 @@ func _AppService_GetVersion_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/GetVersion", + FullMethod: AppService_GetVersion_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).GetVersion(ctx, req.(*AppVersionId)) @@ -250,7 +260,7 @@ func _AppService_DeleteProd_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/DeleteProd", + FullMethod: AppService_DeleteProd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).DeleteProd(ctx, req.(*AppId)) @@ -268,7 +278,7 @@ func _AppService_DeleteVersion_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/DeleteVersion", + FullMethod: AppService_DeleteVersion_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).DeleteVersion(ctx, req.(*AppVersionId)) @@ -286,7 +296,7 @@ func _AppService_CheckVersion_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/AppService/CheckVersion", + FullMethod: AppService_CheckVersion_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(AppServiceServer).CheckVersion(ctx, req.(*CheckVersionRequest)) diff --git a/core/service/proto/bank_dto.pb.go b/core/service/proto/bank_dto.pb.go index 0157c3289..4c26b5bd1 100644 --- a/core/service/proto/bank_dto.pb.go +++ b/core/service/proto/bank_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/bank_dto.proto package proto diff --git a/core/service/proto/cart_dto.pb.go b/core/service/proto/cart_dto.pb.go index 14747e09d..6fa293b88 100644 --- a/core/service/proto/cart_dto.pb.go +++ b/core/service/proto/cart_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/cart_dto.proto package proto diff --git a/core/service/proto/cart_service.pb.go b/core/service/proto/cart_service.pb.go index fcb8e45c2..358959557 100644 --- a/core/service/proto/cart_service.pb.go +++ b/core/service/proto/cart_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: cart_service.proto package proto diff --git a/core/service/proto/cart_service_grpc.pb.go b/core/service/proto/cart_service_grpc.pb.go index 592b5bb80..08a8e4e6e 100644 --- a/core/service/proto/cart_service_grpc.pb.go +++ b/core/service/proto/cart_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: cart_service.proto package proto @@ -18,6 +18,14 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + CartService_WholesaleCartV1_FullMethodName = "/CartService/WholesaleCartV1" + CartService_GetShoppingCart_FullMethodName = "/CartService/GetShoppingCart" + CartService_PutItems_FullMethodName = "/CartService/PutItems" + CartService_ReduceItems_FullMethodName = "/CartService/ReduceItems" + CartService_CheckCart_FullMethodName = "/CartService/CheckCart" +) + // CartServiceClient is the client API for CartService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -44,7 +52,7 @@ func NewCartServiceClient(cc grpc.ClientConnInterface) CartServiceClient { func (c *cartServiceClient) WholesaleCartV1(ctx context.Context, in *WsCartRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/CartService/WholesaleCartV1", in, out, opts...) + err := c.cc.Invoke(ctx, CartService_WholesaleCartV1_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -53,7 +61,7 @@ func (c *cartServiceClient) WholesaleCartV1(ctx context.Context, in *WsCartReque func (c *cartServiceClient) GetShoppingCart(ctx context.Context, in *ShoppingCartId, opts ...grpc.CallOption) (*SShoppingCart, error) { out := new(SShoppingCart) - err := c.cc.Invoke(ctx, "/CartService/GetShoppingCart", in, out, opts...) + err := c.cc.Invoke(ctx, CartService_GetShoppingCart_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -62,7 +70,7 @@ func (c *cartServiceClient) GetShoppingCart(ctx context.Context, in *ShoppingCar func (c *cartServiceClient) PutItems(ctx context.Context, in *CartItemRequest, opts ...grpc.CallOption) (*CartItemResponse, error) { out := new(CartItemResponse) - err := c.cc.Invoke(ctx, "/CartService/PutItems", in, out, opts...) + err := c.cc.Invoke(ctx, CartService_PutItems_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -71,7 +79,7 @@ func (c *cartServiceClient) PutItems(ctx context.Context, in *CartItemRequest, o func (c *cartServiceClient) ReduceItems(ctx context.Context, in *CartItemRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/CartService/ReduceItems", in, out, opts...) + err := c.cc.Invoke(ctx, CartService_ReduceItems_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -80,7 +88,7 @@ func (c *cartServiceClient) ReduceItems(ctx context.Context, in *CartItemRequest func (c *cartServiceClient) CheckCart(ctx context.Context, in *CheckCartRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/CartService/CheckCart", in, out, opts...) + err := c.cc.Invoke(ctx, CartService_CheckCart_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -146,7 +154,7 @@ func _CartService_WholesaleCartV1_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CartService/WholesaleCartV1", + FullMethod: CartService_WholesaleCartV1_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).WholesaleCartV1(ctx, req.(*WsCartRequest)) @@ -164,7 +172,7 @@ func _CartService_GetShoppingCart_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CartService/GetShoppingCart", + FullMethod: CartService_GetShoppingCart_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).GetShoppingCart(ctx, req.(*ShoppingCartId)) @@ -182,7 +190,7 @@ func _CartService_PutItems_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CartService/PutItems", + FullMethod: CartService_PutItems_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).PutItems(ctx, req.(*CartItemRequest)) @@ -200,7 +208,7 @@ func _CartService_ReduceItems_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CartService/ReduceItems", + FullMethod: CartService_ReduceItems_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).ReduceItems(ctx, req.(*CartItemRequest)) @@ -218,7 +226,7 @@ func _CartService_CheckCart_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CartService/CheckCart", + FullMethod: CartService_CheckCart_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CartServiceServer).CheckCart(ctx, req.(*CheckCartRequest)) diff --git a/core/service/proto/code_service.pb.go b/core/service/proto/code_service.pb.go index bcca4a2b2..6ffd9e4aa 100644 --- a/core/service/proto/code_service.pb.go +++ b/core/service/proto/code_service.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: code_service.proto package proto diff --git a/core/service/proto/code_service_grpc.pb.go b/core/service/proto/code_service_grpc.pb.go index cdef42b83..0da8564c0 100644 --- a/core/service/proto/code_service_grpc.pb.go +++ b/core/service/proto/code_service_grpc.pb.go @@ -1,7 +1,22 @@ +//* +// This file is auto generated by tto v0.4.5 ! +// If you want to modify this code, please read the guide +// to modify code template. +// +// Get started: https://github.com/ixre/tto +// +// Copyright (C) 2021 , All rights reserved. +// +// name : template_service.proto +// author : jarrysix +// date : 2021/12/02 10:37:45 +// description : 条码服务 +// history : + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: code_service.proto package proto @@ -18,6 +33,12 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + CodeService_SaveQrTemplate_FullMethodName = "/CodeService/SaveQrTemplate" + CodeService_GetQrTemplate_FullMethodName = "/CodeService/GetQrTemplate" + CodeService_DeleteQrTemplate_FullMethodName = "/CodeService/DeleteQrTemplate" +) + // CodeServiceClient is the client API for CodeService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -40,7 +61,7 @@ func NewCodeServiceClient(cc grpc.ClientConnInterface) CodeServiceClient { func (c *codeServiceClient) SaveQrTemplate(ctx context.Context, in *SaveQrTemplateRequest, opts ...grpc.CallOption) (*SaveQrTemplateResponse, error) { out := new(SaveQrTemplateResponse) - err := c.cc.Invoke(ctx, "/CodeService/SaveQrTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, CodeService_SaveQrTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -49,7 +70,7 @@ func (c *codeServiceClient) SaveQrTemplate(ctx context.Context, in *SaveQrTempla func (c *codeServiceClient) GetQrTemplate(ctx context.Context, in *CommQrTemplateId, opts ...grpc.CallOption) (*SQrTemplate, error) { out := new(SQrTemplate) - err := c.cc.Invoke(ctx, "/CodeService/GetQrTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, CodeService_GetQrTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -58,7 +79,7 @@ func (c *codeServiceClient) GetQrTemplate(ctx context.Context, in *CommQrTemplat func (c *codeServiceClient) DeleteQrTemplate(ctx context.Context, in *CommQrTemplateId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/CodeService/DeleteQrTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, CodeService_DeleteQrTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -114,7 +135,7 @@ func _CodeService_SaveQrTemplate_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CodeService/SaveQrTemplate", + FullMethod: CodeService_SaveQrTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).SaveQrTemplate(ctx, req.(*SaveQrTemplateRequest)) @@ -132,7 +153,7 @@ func _CodeService_GetQrTemplate_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CodeService/GetQrTemplate", + FullMethod: CodeService_GetQrTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).GetQrTemplate(ctx, req.(*CommQrTemplateId)) @@ -150,7 +171,7 @@ func _CodeService_DeleteQrTemplate_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CodeService/DeleteQrTemplate", + FullMethod: CodeService_DeleteQrTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CodeServiceServer).DeleteQrTemplate(ctx, req.(*CommQrTemplateId)) diff --git a/core/service/proto/content_service.pb.go b/core/service/proto/content_service.pb.go index 1a2ee4089..43eeb92e7 100644 --- a/core/service/proto/content_service.pb.go +++ b/core/service/proto/content_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: content_service.proto package proto diff --git a/core/service/proto/content_service_grpc.pb.go b/core/service/proto/content_service_grpc.pb.go index 159c55265..5362871c4 100644 --- a/core/service/proto/content_service_grpc.pb.go +++ b/core/service/proto/content_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: content_service.proto package proto @@ -18,6 +18,21 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ContentService_GetPage_FullMethodName = "/ContentService/GetPage" + ContentService_SavePage_FullMethodName = "/ContentService/SavePage" + ContentService_DeletePage_FullMethodName = "/ContentService/DeletePage" + ContentService_GetArticleCategories_FullMethodName = "/ContentService/GetArticleCategories" + ContentService_GetArticleCategory_FullMethodName = "/ContentService/GetArticleCategory" + ContentService_SaveArticleCategory_FullMethodName = "/ContentService/SaveArticleCategory" + ContentService_DeleteArticleCategory_FullMethodName = "/ContentService/DeleteArticleCategory" + ContentService_GetArticle_FullMethodName = "/ContentService/GetArticle" + ContentService_DeleteArticle_FullMethodName = "/ContentService/DeleteArticle" + ContentService_SaveArticle_FullMethodName = "/ContentService/SaveArticle" + ContentService_QueryTopArticles_FullMethodName = "/ContentService/QueryTopArticles" + ContentService_QueryPagingArticles_FullMethodName = "/ContentService/QueryPagingArticles" +) + // ContentServiceClient is the client API for ContentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -58,7 +73,7 @@ func NewContentServiceClient(cc grpc.ClientConnInterface) ContentServiceClient { func (c *contentServiceClient) GetPage(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SPage, error) { out := new(SPage) - err := c.cc.Invoke(ctx, "/ContentService/GetPage", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_GetPage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -67,7 +82,7 @@ func (c *contentServiceClient) GetPage(ctx context.Context, in *IdOrName, opts . func (c *contentServiceClient) SavePage(ctx context.Context, in *SPage, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/SavePage", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_SavePage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -76,7 +91,7 @@ func (c *contentServiceClient) SavePage(ctx context.Context, in *SPage, opts ... func (c *contentServiceClient) DeletePage(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/DeletePage", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_DeletePage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -85,7 +100,7 @@ func (c *contentServiceClient) DeletePage(ctx context.Context, in *Int64, opts . func (c *contentServiceClient) GetArticleCategories(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ArticleCategoriesResponse, error) { out := new(ArticleCategoriesResponse) - err := c.cc.Invoke(ctx, "/ContentService/GetArticleCategories", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_GetArticleCategories_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -94,7 +109,7 @@ func (c *contentServiceClient) GetArticleCategories(ctx context.Context, in *Emp func (c *contentServiceClient) GetArticleCategory(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SArticleCategory, error) { out := new(SArticleCategory) - err := c.cc.Invoke(ctx, "/ContentService/GetArticleCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_GetArticleCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -103,7 +118,7 @@ func (c *contentServiceClient) GetArticleCategory(ctx context.Context, in *IdOrN func (c *contentServiceClient) SaveArticleCategory(ctx context.Context, in *SArticleCategory, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/SaveArticleCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_SaveArticleCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -112,7 +127,7 @@ func (c *contentServiceClient) SaveArticleCategory(ctx context.Context, in *SArt func (c *contentServiceClient) DeleteArticleCategory(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/DeleteArticleCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_DeleteArticleCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -121,7 +136,7 @@ func (c *contentServiceClient) DeleteArticleCategory(ctx context.Context, in *In func (c *contentServiceClient) GetArticle(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SArticle, error) { out := new(SArticle) - err := c.cc.Invoke(ctx, "/ContentService/GetArticle", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_GetArticle_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -130,7 +145,7 @@ func (c *contentServiceClient) GetArticle(ctx context.Context, in *IdOrName, opt func (c *contentServiceClient) DeleteArticle(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/DeleteArticle", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_DeleteArticle_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -139,7 +154,7 @@ func (c *contentServiceClient) DeleteArticle(ctx context.Context, in *Int64, opt func (c *contentServiceClient) SaveArticle(ctx context.Context, in *SArticle, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ContentService/SaveArticle", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_SaveArticle_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -148,7 +163,7 @@ func (c *contentServiceClient) SaveArticle(ctx context.Context, in *SArticle, op func (c *contentServiceClient) QueryTopArticles(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*ArticleListResponse, error) { out := new(ArticleListResponse) - err := c.cc.Invoke(ctx, "/ContentService/QueryTopArticles", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_QueryTopArticles_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -157,7 +172,7 @@ func (c *contentServiceClient) QueryTopArticles(ctx context.Context, in *IdOrNam func (c *contentServiceClient) QueryPagingArticles(ctx context.Context, in *PagingArticleRequest, opts ...grpc.CallOption) (*ArticleListResponse, error) { out := new(ArticleListResponse) - err := c.cc.Invoke(ctx, "/ContentService/QueryPagingArticles", in, out, opts...) + err := c.cc.Invoke(ctx, ContentService_QueryPagingArticles_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -258,7 +273,7 @@ func _ContentService_GetPage_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/GetPage", + FullMethod: ContentService_GetPage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetPage(ctx, req.(*IdOrName)) @@ -276,7 +291,7 @@ func _ContentService_SavePage_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/SavePage", + FullMethod: ContentService_SavePage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SavePage(ctx, req.(*SPage)) @@ -294,7 +309,7 @@ func _ContentService_DeletePage_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/DeletePage", + FullMethod: ContentService_DeletePage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeletePage(ctx, req.(*Int64)) @@ -312,7 +327,7 @@ func _ContentService_GetArticleCategories_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/GetArticleCategories", + FullMethod: ContentService_GetArticleCategories_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticleCategories(ctx, req.(*Empty)) @@ -330,7 +345,7 @@ func _ContentService_GetArticleCategory_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/GetArticleCategory", + FullMethod: ContentService_GetArticleCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticleCategory(ctx, req.(*IdOrName)) @@ -348,7 +363,7 @@ func _ContentService_SaveArticleCategory_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/SaveArticleCategory", + FullMethod: ContentService_SaveArticleCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SaveArticleCategory(ctx, req.(*SArticleCategory)) @@ -366,7 +381,7 @@ func _ContentService_DeleteArticleCategory_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/DeleteArticleCategory", + FullMethod: ContentService_DeleteArticleCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeleteArticleCategory(ctx, req.(*Int64)) @@ -384,7 +399,7 @@ func _ContentService_GetArticle_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/GetArticle", + FullMethod: ContentService_GetArticle_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).GetArticle(ctx, req.(*IdOrName)) @@ -402,7 +417,7 @@ func _ContentService_DeleteArticle_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/DeleteArticle", + FullMethod: ContentService_DeleteArticle_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).DeleteArticle(ctx, req.(*Int64)) @@ -420,7 +435,7 @@ func _ContentService_SaveArticle_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/SaveArticle", + FullMethod: ContentService_SaveArticle_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).SaveArticle(ctx, req.(*SArticle)) @@ -438,7 +453,7 @@ func _ContentService_QueryTopArticles_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/QueryTopArticles", + FullMethod: ContentService_QueryTopArticles_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).QueryTopArticles(ctx, req.(*IdOrName)) @@ -456,7 +471,7 @@ func _ContentService_QueryPagingArticles_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ContentService/QueryPagingArticles", + FullMethod: ContentService_QueryPagingArticles_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ContentServiceServer).QueryPagingArticles(ctx, req.(*PagingArticleRequest)) diff --git a/core/service/proto/coupon_dto.pb.go b/core/service/proto/coupon_dto.pb.go index b801055dc..d8f3e9b28 100644 --- a/core/service/proto/coupon_dto.pb.go +++ b/core/service/proto/coupon_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/coupon_dto.proto package proto diff --git a/core/service/proto/events_dto.pb.go b/core/service/proto/events_dto.pb.go index 4e3ab6051..ececb5f79 100644 --- a/core/service/proto/events_dto.pb.go +++ b/core/service/proto/events_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/events_dto.proto package proto diff --git a/core/service/proto/execution_service.pb.go b/core/service/proto/execution_service.pb.go index e41bd4daf..478415d28 100644 --- a/core/service/proto/execution_service.pb.go +++ b/core/service/proto/execution_service.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: execution_service.proto package proto diff --git a/core/service/proto/execution_service_grpc.pb.go b/core/service/proto/execution_service_grpc.pb.go index 18772475b..6b015fdc2 100644 --- a/core/service/proto/execution_service_grpc.pb.go +++ b/core/service/proto/execution_service_grpc.pb.go @@ -1,7 +1,22 @@ +//* +// This file is auto generated by tto v0.4.5 ! +// If you want to modify this code, please read the guide +// to modify code template. +// +// Get started: https://github.com/ixre/tto +// +// Copyright (C) 2009-2022 56X.NET, All rights reserved. +// +// name : job_exec_data_service.proto +// author : jarrysix +// date : 2022/03/06 03:16:21 +// description : +// history : + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: execution_service.proto package proto @@ -18,6 +33,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ExecutionService_GetJob_FullMethodName = "/ExecutionService/GetJob" + ExecutionService_UpdateExecuteCursor_FullMethodName = "/ExecutionService/UpdateExecuteCursor" + ExecutionService_AddFail_FullMethodName = "/ExecutionService/AddFail" + ExecutionService_RejoinQueue_FullMethodName = "/ExecutionService/RejoinQueue" +) + // ExecutionServiceClient is the client API for ExecutionService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -41,7 +63,7 @@ func NewExecutionServiceClient(cc grpc.ClientConnInterface) ExecutionServiceClie func (c *executionServiceClient) GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*SExecutionData, error) { out := new(SExecutionData) - err := c.cc.Invoke(ctx, "/ExecutionService/GetJob", in, out, opts...) + err := c.cc.Invoke(ctx, ExecutionService_GetJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -50,7 +72,7 @@ func (c *executionServiceClient) GetJob(ctx context.Context, in *GetJobRequest, func (c *executionServiceClient) UpdateExecuteCursor(ctx context.Context, in *UpdateCursorRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ExecutionService/UpdateExecuteCursor", in, out, opts...) + err := c.cc.Invoke(ctx, ExecutionService_UpdateExecuteCursor_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -59,7 +81,7 @@ func (c *executionServiceClient) UpdateExecuteCursor(ctx context.Context, in *Up func (c *executionServiceClient) AddFail(ctx context.Context, in *AddFailRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ExecutionService/AddFail", in, out, opts...) + err := c.cc.Invoke(ctx, ExecutionService_AddFail_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -68,7 +90,7 @@ func (c *executionServiceClient) AddFail(ctx context.Context, in *AddFailRequest func (c *executionServiceClient) RejoinQueue(ctx context.Context, in *RejoinQueueRequest, opts ...grpc.CallOption) (*RejoinQueueResponse, error) { out := new(RejoinQueueResponse) - err := c.cc.Invoke(ctx, "/ExecutionService/RejoinQueue", in, out, opts...) + err := c.cc.Invoke(ctx, ExecutionService_RejoinQueue_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -128,7 +150,7 @@ func _ExecutionService_GetJob_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExecutionService/GetJob", + FullMethod: ExecutionService_GetJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).GetJob(ctx, req.(*GetJobRequest)) @@ -146,7 +168,7 @@ func _ExecutionService_UpdateExecuteCursor_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExecutionService/UpdateExecuteCursor", + FullMethod: ExecutionService_UpdateExecuteCursor_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).UpdateExecuteCursor(ctx, req.(*UpdateCursorRequest)) @@ -164,7 +186,7 @@ func _ExecutionService_AddFail_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExecutionService/AddFail", + FullMethod: ExecutionService_AddFail_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).AddFail(ctx, req.(*AddFailRequest)) @@ -182,7 +204,7 @@ func _ExecutionService_RejoinQueue_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExecutionService/RejoinQueue", + FullMethod: ExecutionService_RejoinQueue_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExecutionServiceServer).RejoinQueue(ctx, req.(*RejoinQueueRequest)) diff --git a/core/service/proto/express_service.pb.go b/core/service/proto/express_service.pb.go index c6586aa02..2b96b8903 100644 --- a/core/service/proto/express_service.pb.go +++ b/core/service/proto/express_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: express_service.proto package proto diff --git a/core/service/proto/express_service_grpc.pb.go b/core/service/proto/express_service_grpc.pb.go index 51aaf7903..e4a64f330 100644 --- a/core/service/proto/express_service_grpc.pb.go +++ b/core/service/proto/express_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: express_service.proto package proto @@ -18,6 +18,18 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ExpressService_GetExpressProvider_FullMethodName = "/ExpressService/GetExpressProvider" + ExpressService_SaveExpressProvider_FullMethodName = "/ExpressService/SaveExpressProvider" + ExpressService_GetProviders_FullMethodName = "/ExpressService/GetProviders" + ExpressService_GetProviderGroup_FullMethodName = "/ExpressService/GetProviderGroup" + ExpressService_SaveExpressTemplate_FullMethodName = "/ExpressService/SaveExpressTemplate" + ExpressService_GetTemplate_FullMethodName = "/ExpressService/GetTemplate" + ExpressService_GetTemplates_FullMethodName = "/ExpressService/GetTemplates" + ExpressService_DeleteTemplate_FullMethodName = "/ExpressService/DeleteTemplate" + ExpressService_SaveAreaTemplate_FullMethodName = "/ExpressService/SaveAreaTemplate" +) + // ExpressServiceClient is the client API for ExpressService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -52,7 +64,7 @@ func NewExpressServiceClient(cc grpc.ClientConnInterface) ExpressServiceClient { func (c *expressServiceClient) GetExpressProvider(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SExpressProvider, error) { out := new(SExpressProvider) - err := c.cc.Invoke(ctx, "/ExpressService/GetExpressProvider", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_GetExpressProvider_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -61,7 +73,7 @@ func (c *expressServiceClient) GetExpressProvider(ctx context.Context, in *IdOrN func (c *expressServiceClient) SaveExpressProvider(ctx context.Context, in *SExpressProvider, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ExpressService/SaveExpressProvider", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_SaveExpressProvider_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -70,7 +82,7 @@ func (c *expressServiceClient) SaveExpressProvider(ctx context.Context, in *SExp func (c *expressServiceClient) GetProviders(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ExpressProviderListResponse, error) { out := new(ExpressProviderListResponse) - err := c.cc.Invoke(ctx, "/ExpressService/GetProviders", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_GetProviders_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -79,7 +91,7 @@ func (c *expressServiceClient) GetProviders(ctx context.Context, in *Empty, opts func (c *expressServiceClient) GetProviderGroup(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ExpressProviderGroupResponse, error) { out := new(ExpressProviderGroupResponse) - err := c.cc.Invoke(ctx, "/ExpressService/GetProviderGroup", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_GetProviderGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -88,7 +100,7 @@ func (c *expressServiceClient) GetProviderGroup(ctx context.Context, in *Empty, func (c *expressServiceClient) SaveExpressTemplate(ctx context.Context, in *SExpressTemplate, opts ...grpc.CallOption) (*SaveTemplateResponse, error) { out := new(SaveTemplateResponse) - err := c.cc.Invoke(ctx, "/ExpressService/SaveExpressTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_SaveExpressTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -97,7 +109,7 @@ func (c *expressServiceClient) SaveExpressTemplate(ctx context.Context, in *SExp func (c *expressServiceClient) GetTemplate(ctx context.Context, in *ExpressTemplateId, opts ...grpc.CallOption) (*SExpressTemplate, error) { out := new(SExpressTemplate) - err := c.cc.Invoke(ctx, "/ExpressService/GetTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_GetTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -106,7 +118,7 @@ func (c *expressServiceClient) GetTemplate(ctx context.Context, in *ExpressTempl func (c *expressServiceClient) GetTemplates(ctx context.Context, in *GetTemplatesRequest, opts ...grpc.CallOption) (*ExpressTemplateListResponse, error) { out := new(ExpressTemplateListResponse) - err := c.cc.Invoke(ctx, "/ExpressService/GetTemplates", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_GetTemplates_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -115,7 +127,7 @@ func (c *expressServiceClient) GetTemplates(ctx context.Context, in *GetTemplate func (c *expressServiceClient) DeleteTemplate(ctx context.Context, in *ExpressTemplateId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ExpressService/DeleteTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_DeleteTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -124,7 +136,7 @@ func (c *expressServiceClient) DeleteTemplate(ctx context.Context, in *ExpressTe func (c *expressServiceClient) SaveAreaTemplate(ctx context.Context, in *SaveAreaExpTemplateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ExpressService/SaveAreaTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, ExpressService_SaveAreaTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -210,7 +222,7 @@ func _ExpressService_GetExpressProvider_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/GetExpressProvider", + FullMethod: ExpressService_GetExpressProvider_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetExpressProvider(ctx, req.(*IdOrName)) @@ -228,7 +240,7 @@ func _ExpressService_SaveExpressProvider_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/SaveExpressProvider", + FullMethod: ExpressService_SaveExpressProvider_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveExpressProvider(ctx, req.(*SExpressProvider)) @@ -246,7 +258,7 @@ func _ExpressService_GetProviders_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/GetProviders", + FullMethod: ExpressService_GetProviders_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetProviders(ctx, req.(*Empty)) @@ -264,7 +276,7 @@ func _ExpressService_GetProviderGroup_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/GetProviderGroup", + FullMethod: ExpressService_GetProviderGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetProviderGroup(ctx, req.(*Empty)) @@ -282,7 +294,7 @@ func _ExpressService_SaveExpressTemplate_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/SaveExpressTemplate", + FullMethod: ExpressService_SaveExpressTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveExpressTemplate(ctx, req.(*SExpressTemplate)) @@ -300,7 +312,7 @@ func _ExpressService_GetTemplate_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/GetTemplate", + FullMethod: ExpressService_GetTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetTemplate(ctx, req.(*ExpressTemplateId)) @@ -318,7 +330,7 @@ func _ExpressService_GetTemplates_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/GetTemplates", + FullMethod: ExpressService_GetTemplates_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).GetTemplates(ctx, req.(*GetTemplatesRequest)) @@ -336,7 +348,7 @@ func _ExpressService_DeleteTemplate_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/DeleteTemplate", + FullMethod: ExpressService_DeleteTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).DeleteTemplate(ctx, req.(*ExpressTemplateId)) @@ -354,7 +366,7 @@ func _ExpressService_SaveAreaTemplate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ExpressService/SaveAreaTemplate", + FullMethod: ExpressService_SaveAreaTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ExpressServiceServer).SaveAreaTemplate(ctx, req.(*SaveAreaExpTemplateRequest)) diff --git a/core/service/proto/finance_service.pb.go b/core/service/proto/finance_service.pb.go index 05d4f1186..304ea55d0 100644 --- a/core/service/proto/finance_service.pb.go +++ b/core/service/proto/finance_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: finance_service.proto package proto diff --git a/core/service/proto/finance_service_grpc.pb.go b/core/service/proto/finance_service_grpc.pb.go index 3d913ea43..b6f35820c 100644 --- a/core/service/proto/finance_service_grpc.pb.go +++ b/core/service/proto/finance_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: finance_service.proto package proto @@ -18,6 +18,15 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + FinanceService_GetRiseInfo_FullMethodName = "/FinanceService/GetRiseInfo" + FinanceService_RiseTransferIn_FullMethodName = "/FinanceService/RiseTransferIn" + FinanceService_RiseTransferOut_FullMethodName = "/FinanceService/RiseTransferOut" + FinanceService_RiseSettleByDay_FullMethodName = "/FinanceService/RiseSettleByDay" + FinanceService_CommitTransfer_FullMethodName = "/FinanceService/CommitTransfer" + FinanceService_OpenRiseService_FullMethodName = "/FinanceService/OpenRiseService" +) + // FinanceServiceClient is the client API for FinanceService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -46,7 +55,7 @@ func NewFinanceServiceClient(cc grpc.ClientConnInterface) FinanceServiceClient { func (c *financeServiceClient) GetRiseInfo(ctx context.Context, in *PersonId, opts ...grpc.CallOption) (*SRiseInfo, error) { out := new(SRiseInfo) - err := c.cc.Invoke(ctx, "/FinanceService/GetRiseInfo", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_GetRiseInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -55,7 +64,7 @@ func (c *financeServiceClient) GetRiseInfo(ctx context.Context, in *PersonId, op func (c *financeServiceClient) RiseTransferIn(ctx context.Context, in *TransferInRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FinanceService/RiseTransferIn", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_RiseTransferIn_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -64,7 +73,7 @@ func (c *financeServiceClient) RiseTransferIn(ctx context.Context, in *TransferI func (c *financeServiceClient) RiseTransferOut(ctx context.Context, in *RiseTransferOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FinanceService/RiseTransferOut", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_RiseTransferOut_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -73,7 +82,7 @@ func (c *financeServiceClient) RiseTransferOut(ctx context.Context, in *RiseTran func (c *financeServiceClient) RiseSettleByDay(ctx context.Context, in *RiseSettleRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FinanceService/RiseSettleByDay", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_RiseSettleByDay_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -82,7 +91,7 @@ func (c *financeServiceClient) RiseSettleByDay(ctx context.Context, in *RiseSett func (c *financeServiceClient) CommitTransfer(ctx context.Context, in *CommitTransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FinanceService/CommitTransfer", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_CommitTransfer_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -91,7 +100,7 @@ func (c *financeServiceClient) CommitTransfer(ctx context.Context, in *CommitTra func (c *financeServiceClient) OpenRiseService(ctx context.Context, in *PersonId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FinanceService/OpenRiseService", in, out, opts...) + err := c.cc.Invoke(ctx, FinanceService_OpenRiseService_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -162,7 +171,7 @@ func _FinanceService_GetRiseInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/GetRiseInfo", + FullMethod: FinanceService_GetRiseInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).GetRiseInfo(ctx, req.(*PersonId)) @@ -180,7 +189,7 @@ func _FinanceService_RiseTransferIn_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/RiseTransferIn", + FullMethod: FinanceService_RiseTransferIn_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseTransferIn(ctx, req.(*TransferInRequest)) @@ -198,7 +207,7 @@ func _FinanceService_RiseTransferOut_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/RiseTransferOut", + FullMethod: FinanceService_RiseTransferOut_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseTransferOut(ctx, req.(*RiseTransferOutRequest)) @@ -216,7 +225,7 @@ func _FinanceService_RiseSettleByDay_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/RiseSettleByDay", + FullMethod: FinanceService_RiseSettleByDay_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).RiseSettleByDay(ctx, req.(*RiseSettleRequest)) @@ -234,7 +243,7 @@ func _FinanceService_CommitTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/CommitTransfer", + FullMethod: FinanceService_CommitTransfer_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).CommitTransfer(ctx, req.(*CommitTransferRequest)) @@ -252,7 +261,7 @@ func _FinanceService_OpenRiseService_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FinanceService/OpenRiseService", + FullMethod: FinanceService_OpenRiseService_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FinanceServiceServer).OpenRiseService(ctx, req.(*PersonId)) diff --git a/core/service/proto/foundation_dto.pb.go b/core/service/proto/foundation_dto.pb.go index 5b84a3cdb..aef2cfe16 100644 --- a/core/service/proto/foundation_dto.pb.go +++ b/core/service/proto/foundation_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/foundation_dto.proto package proto diff --git a/core/service/proto/foundation_service.pb.go b/core/service/proto/foundation_service.pb.go index e8e30a43f..c3dac29e4 100644 --- a/core/service/proto/foundation_service.pb.go +++ b/core/service/proto/foundation_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: foundation_service.proto package proto diff --git a/core/service/proto/foundation_service_grpc.pb.go b/core/service/proto/foundation_service_grpc.pb.go index ad022d6c1..2760ab061 100644 --- a/core/service/proto/foundation_service_grpc.pb.go +++ b/core/service/proto/foundation_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: foundation_service.proto package proto @@ -18,6 +18,32 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + FoundationService_CheckSensitive_FullMethodName = "/FoundationService/CheckSensitive" + FoundationService_ReplaceSensitive_FullMethodName = "/FoundationService/ReplaceSensitive" + FoundationService_GetSmsSetting_FullMethodName = "/FoundationService/GetSmsSetting" + FoundationService_SaveSmsSetting_FullMethodName = "/FoundationService/SaveSmsSetting" + FoundationService_CleanCache_FullMethodName = "/FoundationService/CleanCache" + FoundationService_SaveBoardHook_FullMethodName = "/FoundationService/SaveBoardHook" + FoundationService_ResourceUrl_FullMethodName = "/FoundationService/ResourceUrl" + FoundationService_RegisterApp_FullMethodName = "/FoundationService/RegisterApp" + FoundationService_GetApp_FullMethodName = "/FoundationService/GetApp" + FoundationService_GetAllSsoApp_FullMethodName = "/FoundationService/GetAllSsoApp" + FoundationService_SuperValidate_FullMethodName = "/FoundationService/SuperValidate" + FoundationService_FlushSuperPwd_FullMethodName = "/FoundationService/FlushSuperPwd" + FoundationService_GetSyncLoginUrl_FullMethodName = "/FoundationService/GetSyncLoginUrl" + FoundationService_GetAreaNames_FullMethodName = "/FoundationService/GetAreaNames" + FoundationService_GetAreaString_FullMethodName = "/FoundationService/GetAreaString" + FoundationService_GetChildAreas_FullMethodName = "/FoundationService/GetChildAreas" + FoundationService_GetMoAppConf_FullMethodName = "/FoundationService/GetMoAppConf" + FoundationService_SaveMoAppConf_FullMethodName = "/FoundationService/SaveMoAppConf" + FoundationService_GetWxApiConfig_FullMethodName = "/FoundationService/GetWxApiConfig" + FoundationService_SaveWxApiConfig_FullMethodName = "/FoundationService/SaveWxApiConfig" + FoundationService_GetPayPlatform_FullMethodName = "/FoundationService/GetPayPlatform" + FoundationService_GetGlobMchSaleConf__FullMethodName = "/FoundationService/GetGlobMchSaleConf_" + FoundationService_SaveGlobMchSaleConf__FullMethodName = "/FoundationService/SaveGlobMchSaleConf_" +) + // FoundationServiceClient is the client API for FoundationService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -89,7 +115,7 @@ func NewFoundationServiceClient(cc grpc.ClientConnInterface) FoundationServiceCl func (c *foundationServiceClient) CheckSensitive(ctx context.Context, in *String, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, "/FoundationService/CheckSensitive", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_CheckSensitive_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -98,7 +124,7 @@ func (c *foundationServiceClient) CheckSensitive(ctx context.Context, in *String func (c *foundationServiceClient) ReplaceSensitive(ctx context.Context, in *ReplaceSensitiveRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/FoundationService/ReplaceSensitive", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_ReplaceSensitive_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -107,7 +133,7 @@ func (c *foundationServiceClient) ReplaceSensitive(ctx context.Context, in *Repl func (c *foundationServiceClient) GetSmsSetting(ctx context.Context, in *GetSmsSettingRequest, opts ...grpc.CallOption) (*SSmsProviderSetting, error) { out := new(SSmsProviderSetting) - err := c.cc.Invoke(ctx, "/FoundationService/GetSmsSetting", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetSmsSetting_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +142,7 @@ func (c *foundationServiceClient) GetSmsSetting(ctx context.Context, in *GetSmsS func (c *foundationServiceClient) SaveSmsSetting(ctx context.Context, in *SSmsProviderSetting, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/SaveSmsSetting", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SaveSmsSetting_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -125,7 +151,7 @@ func (c *foundationServiceClient) SaveSmsSetting(ctx context.Context, in *SSmsPr func (c *foundationServiceClient) CleanCache(ctx context.Context, in *CleanCacheRequest, opts ...grpc.CallOption) (*CleanCacheResponse, error) { out := new(CleanCacheResponse) - err := c.cc.Invoke(ctx, "/FoundationService/CleanCache", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_CleanCache_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -134,7 +160,7 @@ func (c *foundationServiceClient) CleanCache(ctx context.Context, in *CleanCache func (c *foundationServiceClient) SaveBoardHook(ctx context.Context, in *BoardHookSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/SaveBoardHook", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SaveBoardHook_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -143,7 +169,7 @@ func (c *foundationServiceClient) SaveBoardHook(ctx context.Context, in *BoardHo func (c *foundationServiceClient) ResourceUrl(ctx context.Context, in *String, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/FoundationService/ResourceUrl", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_ResourceUrl_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -152,7 +178,7 @@ func (c *foundationServiceClient) ResourceUrl(ctx context.Context, in *String, o func (c *foundationServiceClient) RegisterApp(ctx context.Context, in *SSsoApp, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/FoundationService/RegisterApp", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_RegisterApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -161,7 +187,7 @@ func (c *foundationServiceClient) RegisterApp(ctx context.Context, in *SSsoApp, func (c *foundationServiceClient) GetApp(ctx context.Context, in *String, opts ...grpc.CallOption) (*SSsoApp, error) { out := new(SSsoApp) - err := c.cc.Invoke(ctx, "/FoundationService/GetApp", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -170,7 +196,7 @@ func (c *foundationServiceClient) GetApp(ctx context.Context, in *String, opts . func (c *foundationServiceClient) GetAllSsoApp(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*StringListResponse, error) { out := new(StringListResponse) - err := c.cc.Invoke(ctx, "/FoundationService/GetAllSsoApp", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetAllSsoApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -179,7 +205,7 @@ func (c *foundationServiceClient) GetAllSsoApp(ctx context.Context, in *Empty, o func (c *foundationServiceClient) SuperValidate(ctx context.Context, in *UserPwd, opts ...grpc.CallOption) (*SuperLoginResponse, error) { out := new(SuperLoginResponse) - err := c.cc.Invoke(ctx, "/FoundationService/SuperValidate", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SuperValidate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -188,7 +214,7 @@ func (c *foundationServiceClient) SuperValidate(ctx context.Context, in *UserPwd func (c *foundationServiceClient) FlushSuperPwd(ctx context.Context, in *UserPwd, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/FlushSuperPwd", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_FlushSuperPwd_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -197,7 +223,7 @@ func (c *foundationServiceClient) FlushSuperPwd(ctx context.Context, in *UserPwd func (c *foundationServiceClient) GetSyncLoginUrl(ctx context.Context, in *String, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/FoundationService/GetSyncLoginUrl", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetSyncLoginUrl_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -206,7 +232,7 @@ func (c *foundationServiceClient) GetSyncLoginUrl(ctx context.Context, in *Strin func (c *foundationServiceClient) GetAreaNames(ctx context.Context, in *GetAreaNamesRequest, opts ...grpc.CallOption) (*StringListResponse, error) { out := new(StringListResponse) - err := c.cc.Invoke(ctx, "/FoundationService/GetAreaNames", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetAreaNames_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -215,7 +241,7 @@ func (c *foundationServiceClient) GetAreaNames(ctx context.Context, in *GetAreaN func (c *foundationServiceClient) GetAreaString(ctx context.Context, in *AreaStringRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/FoundationService/GetAreaString", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetAreaString_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -224,7 +250,7 @@ func (c *foundationServiceClient) GetAreaString(ctx context.Context, in *AreaStr func (c *foundationServiceClient) GetChildAreas(ctx context.Context, in *Int32, opts ...grpc.CallOption) (*AreaListResponse, error) { out := new(AreaListResponse) - err := c.cc.Invoke(ctx, "/FoundationService/GetChildAreas", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetChildAreas_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -233,7 +259,7 @@ func (c *foundationServiceClient) GetChildAreas(ctx context.Context, in *Int32, func (c *foundationServiceClient) GetMoAppConf(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SMobileAppConfig, error) { out := new(SMobileAppConfig) - err := c.cc.Invoke(ctx, "/FoundationService/GetMoAppConf", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetMoAppConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -242,7 +268,7 @@ func (c *foundationServiceClient) GetMoAppConf(ctx context.Context, in *Empty, o func (c *foundationServiceClient) SaveMoAppConf(ctx context.Context, in *SMobileAppConfig, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/SaveMoAppConf", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SaveMoAppConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -251,7 +277,7 @@ func (c *foundationServiceClient) SaveMoAppConf(ctx context.Context, in *SMobile func (c *foundationServiceClient) GetWxApiConfig(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SWxApiConfig, error) { out := new(SWxApiConfig) - err := c.cc.Invoke(ctx, "/FoundationService/GetWxApiConfig", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetWxApiConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -260,7 +286,7 @@ func (c *foundationServiceClient) GetWxApiConfig(ctx context.Context, in *Empty, func (c *foundationServiceClient) SaveWxApiConfig(ctx context.Context, in *SWxApiConfig, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/SaveWxApiConfig", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SaveWxApiConfig_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -269,7 +295,7 @@ func (c *foundationServiceClient) SaveWxApiConfig(ctx context.Context, in *SWxAp func (c *foundationServiceClient) GetPayPlatform(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*PaymentPlatformResponse, error) { out := new(PaymentPlatformResponse) - err := c.cc.Invoke(ctx, "/FoundationService/GetPayPlatform", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetPayPlatform_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -278,7 +304,7 @@ func (c *foundationServiceClient) GetPayPlatform(ctx context.Context, in *Empty, func (c *foundationServiceClient) GetGlobMchSaleConf_(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SGlobMchSaleConf, error) { out := new(SGlobMchSaleConf) - err := c.cc.Invoke(ctx, "/FoundationService/GetGlobMchSaleConf_", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_GetGlobMchSaleConf__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -287,7 +313,7 @@ func (c *foundationServiceClient) GetGlobMchSaleConf_(ctx context.Context, in *E func (c *foundationServiceClient) SaveGlobMchSaleConf_(ctx context.Context, in *SGlobMchSaleConf, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/FoundationService/SaveGlobMchSaleConf_", in, out, opts...) + err := c.cc.Invoke(ctx, FoundationService_SaveGlobMchSaleConf__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -452,7 +478,7 @@ func _FoundationService_CheckSensitive_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/CheckSensitive", + FullMethod: FoundationService_CheckSensitive_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).CheckSensitive(ctx, req.(*String)) @@ -470,7 +496,7 @@ func _FoundationService_ReplaceSensitive_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/ReplaceSensitive", + FullMethod: FoundationService_ReplaceSensitive_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).ReplaceSensitive(ctx, req.(*ReplaceSensitiveRequest)) @@ -488,7 +514,7 @@ func _FoundationService_GetSmsSetting_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetSmsSetting", + FullMethod: FoundationService_GetSmsSetting_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetSmsSetting(ctx, req.(*GetSmsSettingRequest)) @@ -506,7 +532,7 @@ func _FoundationService_SaveSmsSetting_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SaveSmsSetting", + FullMethod: FoundationService_SaveSmsSetting_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveSmsSetting(ctx, req.(*SSmsProviderSetting)) @@ -524,7 +550,7 @@ func _FoundationService_CleanCache_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/CleanCache", + FullMethod: FoundationService_CleanCache_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).CleanCache(ctx, req.(*CleanCacheRequest)) @@ -542,7 +568,7 @@ func _FoundationService_SaveBoardHook_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SaveBoardHook", + FullMethod: FoundationService_SaveBoardHook_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveBoardHook(ctx, req.(*BoardHookSaveRequest)) @@ -560,7 +586,7 @@ func _FoundationService_ResourceUrl_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/ResourceUrl", + FullMethod: FoundationService_ResourceUrl_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).ResourceUrl(ctx, req.(*String)) @@ -578,7 +604,7 @@ func _FoundationService_RegisterApp_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/RegisterApp", + FullMethod: FoundationService_RegisterApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).RegisterApp(ctx, req.(*SSsoApp)) @@ -596,7 +622,7 @@ func _FoundationService_GetApp_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetApp", + FullMethod: FoundationService_GetApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetApp(ctx, req.(*String)) @@ -614,7 +640,7 @@ func _FoundationService_GetAllSsoApp_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetAllSsoApp", + FullMethod: FoundationService_GetAllSsoApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAllSsoApp(ctx, req.(*Empty)) @@ -632,7 +658,7 @@ func _FoundationService_SuperValidate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SuperValidate", + FullMethod: FoundationService_SuperValidate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SuperValidate(ctx, req.(*UserPwd)) @@ -650,7 +676,7 @@ func _FoundationService_FlushSuperPwd_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/FlushSuperPwd", + FullMethod: FoundationService_FlushSuperPwd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).FlushSuperPwd(ctx, req.(*UserPwd)) @@ -668,7 +694,7 @@ func _FoundationService_GetSyncLoginUrl_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetSyncLoginUrl", + FullMethod: FoundationService_GetSyncLoginUrl_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetSyncLoginUrl(ctx, req.(*String)) @@ -686,7 +712,7 @@ func _FoundationService_GetAreaNames_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetAreaNames", + FullMethod: FoundationService_GetAreaNames_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAreaNames(ctx, req.(*GetAreaNamesRequest)) @@ -704,7 +730,7 @@ func _FoundationService_GetAreaString_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetAreaString", + FullMethod: FoundationService_GetAreaString_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetAreaString(ctx, req.(*AreaStringRequest)) @@ -722,7 +748,7 @@ func _FoundationService_GetChildAreas_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetChildAreas", + FullMethod: FoundationService_GetChildAreas_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetChildAreas(ctx, req.(*Int32)) @@ -740,7 +766,7 @@ func _FoundationService_GetMoAppConf_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetMoAppConf", + FullMethod: FoundationService_GetMoAppConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetMoAppConf(ctx, req.(*Empty)) @@ -758,7 +784,7 @@ func _FoundationService_SaveMoAppConf_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SaveMoAppConf", + FullMethod: FoundationService_SaveMoAppConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveMoAppConf(ctx, req.(*SMobileAppConfig)) @@ -776,7 +802,7 @@ func _FoundationService_GetWxApiConfig_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetWxApiConfig", + FullMethod: FoundationService_GetWxApiConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetWxApiConfig(ctx, req.(*Empty)) @@ -794,7 +820,7 @@ func _FoundationService_SaveWxApiConfig_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SaveWxApiConfig", + FullMethod: FoundationService_SaveWxApiConfig_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveWxApiConfig(ctx, req.(*SWxApiConfig)) @@ -812,7 +838,7 @@ func _FoundationService_GetPayPlatform_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetPayPlatform", + FullMethod: FoundationService_GetPayPlatform_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetPayPlatform(ctx, req.(*Empty)) @@ -830,7 +856,7 @@ func _FoundationService_GetGlobMchSaleConf__Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/GetGlobMchSaleConf_", + FullMethod: FoundationService_GetGlobMchSaleConf__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).GetGlobMchSaleConf_(ctx, req.(*Empty)) @@ -848,7 +874,7 @@ func _FoundationService_SaveGlobMchSaleConf__Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/FoundationService/SaveGlobMchSaleConf_", + FullMethod: FoundationService_SaveGlobMchSaleConf__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FoundationServiceServer).SaveGlobMchSaleConf_(ctx, req.(*SGlobMchSaleConf)) diff --git a/core/service/proto/global.pb.go b/core/service/proto/global.pb.go index e2f5fdac2..3fa364af4 100644 --- a/core/service/proto/global.pb.go +++ b/core/service/proto/global.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: global.proto package proto diff --git a/core/service/proto/item_dto.pb.go b/core/service/proto/item_dto.pb.go index ca93f4541..766c99903 100644 --- a/core/service/proto/item_dto.pb.go +++ b/core/service/proto/item_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/item_dto.proto package proto diff --git a/core/service/proto/item_service.pb.go b/core/service/proto/item_service.pb.go index 0c56e8226..ccd4c8a54 100644 --- a/core/service/proto/item_service.pb.go +++ b/core/service/proto/item_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: item_service.proto package proto diff --git a/core/service/proto/item_service_grpc.pb.go b/core/service/proto/item_service_grpc.pb.go index 3643b3703..d429c02f3 100644 --- a/core/service/proto/item_service_grpc.pb.go +++ b/core/service/proto/item_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: item_service.proto package proto @@ -18,6 +18,31 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ItemService_GetItem_FullMethodName = "/ItemService/GetItem" + ItemService_SaveItem_FullMethodName = "/ItemService/SaveItem" + ItemService_GetItemBySku_FullMethodName = "/ItemService/GetItemBySku" + ItemService_GetItemAndSnapshot_FullMethodName = "/ItemService/GetItemAndSnapshot" + ItemService_GetTradeSnapshot_FullMethodName = "/ItemService/GetTradeSnapshot" + ItemService_GetSku_FullMethodName = "/ItemService/GetSku" + ItemService_ReviewItem_FullMethodName = "/ItemService/ReviewItem" + ItemService_RecycleItem_FullMethodName = "/ItemService/RecycleItem" + ItemService_SaveLevelPrices_FullMethodName = "/ItemService/SaveLevelPrices" + ItemService_SignAsIllegal_FullMethodName = "/ItemService/SignAsIllegal" + ItemService_SetShelveState_FullMethodName = "/ItemService/SetShelveState" + ItemService_GetItemDetailData_FullMethodName = "/ItemService/GetItemDetailData" + ItemService_GetItems_FullMethodName = "/ItemService/GetItems" + ItemService_GetWholesalePriceArray_FullMethodName = "/ItemService/GetWholesalePriceArray" + ItemService_SaveWholesalePrice_FullMethodName = "/ItemService/SaveWholesalePrice" + ItemService_GetWholesaleDiscountArray_FullMethodName = "/ItemService/GetWholesaleDiscountArray" + ItemService_SaveWholesaleDiscount_FullMethodName = "/ItemService/SaveWholesaleDiscount" + ItemService_GetAllSaleLabels_FullMethodName = "/ItemService/GetAllSaleLabels" + ItemService_GetSaleLabel_FullMethodName = "/ItemService/GetSaleLabel" + ItemService_SaveSaleLabel_FullMethodName = "/ItemService/SaveSaleLabel" + ItemService_DeleteSaleLabel_FullMethodName = "/ItemService/DeleteSaleLabel" + ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName = "/ItemService/GetPagedValueGoodsBySaleLabel_" +) + // ItemServiceClient is the client API for ItemService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -78,7 +103,7 @@ func NewItemServiceClient(cc grpc.ClientConnInterface) ItemServiceClient { func (c *itemServiceClient) GetItem(ctx context.Context, in *GetItemRequest, opts ...grpc.CallOption) (*SItemDataResponse, error) { out := new(SItemDataResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetItem", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -87,7 +112,7 @@ func (c *itemServiceClient) GetItem(ctx context.Context, in *GetItemRequest, opt func (c *itemServiceClient) SaveItem(ctx context.Context, in *SaveItemRequest, opts ...grpc.CallOption) (*SaveItemResponse, error) { out := new(SaveItemResponse) - err := c.cc.Invoke(ctx, "/ItemService/SaveItem", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SaveItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -96,7 +121,7 @@ func (c *itemServiceClient) SaveItem(ctx context.Context, in *SaveItemRequest, o func (c *itemServiceClient) GetItemBySku(ctx context.Context, in *ItemBySkuRequest, opts ...grpc.CallOption) (*SUnifiedViewItem, error) { out := new(SUnifiedViewItem) - err := c.cc.Invoke(ctx, "/ItemService/GetItemBySku", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetItemBySku_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -105,7 +130,7 @@ func (c *itemServiceClient) GetItemBySku(ctx context.Context, in *ItemBySkuReque func (c *itemServiceClient) GetItemAndSnapshot(ctx context.Context, in *GetItemAndSnapshotRequest, opts ...grpc.CallOption) (*ItemSnapshotResponse, error) { out := new(ItemSnapshotResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetItemAndSnapshot", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetItemAndSnapshot_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -114,7 +139,7 @@ func (c *itemServiceClient) GetItemAndSnapshot(ctx context.Context, in *GetItemA func (c *itemServiceClient) GetTradeSnapshot(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*STradeSnapshot, error) { out := new(STradeSnapshot) - err := c.cc.Invoke(ctx, "/ItemService/GetTradeSnapshot", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetTradeSnapshot_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -123,7 +148,7 @@ func (c *itemServiceClient) GetTradeSnapshot(ctx context.Context, in *Int64, opt func (c *itemServiceClient) GetSku(ctx context.Context, in *SkuId, opts ...grpc.CallOption) (*SSku, error) { out := new(SSku) - err := c.cc.Invoke(ctx, "/ItemService/GetSku", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetSku_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -132,7 +157,7 @@ func (c *itemServiceClient) GetSku(ctx context.Context, in *SkuId, opts ...grpc. func (c *itemServiceClient) ReviewItem(ctx context.Context, in *ItemReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/ReviewItem", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_ReviewItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -141,7 +166,7 @@ func (c *itemServiceClient) ReviewItem(ctx context.Context, in *ItemReviewReques func (c *itemServiceClient) RecycleItem(ctx context.Context, in *RecycleItemRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/RecycleItem", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_RecycleItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -150,7 +175,7 @@ func (c *itemServiceClient) RecycleItem(ctx context.Context, in *RecycleItemRequ func (c *itemServiceClient) SaveLevelPrices(ctx context.Context, in *SaveLevelPriceRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SaveLevelPrices", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SaveLevelPrices_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -159,7 +184,7 @@ func (c *itemServiceClient) SaveLevelPrices(ctx context.Context, in *SaveLevelPr func (c *itemServiceClient) SignAsIllegal(ctx context.Context, in *ItemIllegalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SignAsIllegal", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SignAsIllegal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -168,7 +193,7 @@ func (c *itemServiceClient) SignAsIllegal(ctx context.Context, in *ItemIllegalRe func (c *itemServiceClient) SetShelveState(ctx context.Context, in *ShelveStateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SetShelveState", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SetShelveState_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -177,7 +202,7 @@ func (c *itemServiceClient) SetShelveState(ctx context.Context, in *ShelveStateR func (c *itemServiceClient) GetItemDetailData(ctx context.Context, in *ItemDetailRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/ItemService/GetItemDetailData", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetItemDetailData_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -186,7 +211,7 @@ func (c *itemServiceClient) GetItemDetailData(ctx context.Context, in *ItemDetai func (c *itemServiceClient) GetItems(ctx context.Context, in *GetItemsRequest, opts ...grpc.CallOption) (*PagingGoodsResponse, error) { out := new(PagingGoodsResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetItems", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetItems_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -195,7 +220,7 @@ func (c *itemServiceClient) GetItems(ctx context.Context, in *GetItemsRequest, o func (c *itemServiceClient) GetWholesalePriceArray(ctx context.Context, in *SkuId, opts ...grpc.CallOption) (*SWsSkuPriceListResponse, error) { out := new(SWsSkuPriceListResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetWholesalePriceArray", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetWholesalePriceArray_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -204,7 +229,7 @@ func (c *itemServiceClient) GetWholesalePriceArray(ctx context.Context, in *SkuI func (c *itemServiceClient) SaveWholesalePrice(ctx context.Context, in *SaveSkuPricesRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SaveWholesalePrice", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SaveWholesalePrice_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -213,7 +238,7 @@ func (c *itemServiceClient) SaveWholesalePrice(ctx context.Context, in *SaveSkuP func (c *itemServiceClient) GetWholesaleDiscountArray(ctx context.Context, in *GetWsDiscountRequest, opts ...grpc.CallOption) (*SWsItemDiscountListResponse, error) { out := new(SWsItemDiscountListResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetWholesaleDiscountArray", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetWholesaleDiscountArray_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -222,7 +247,7 @@ func (c *itemServiceClient) GetWholesaleDiscountArray(ctx context.Context, in *G func (c *itemServiceClient) SaveWholesaleDiscount(ctx context.Context, in *SaveItemDiscountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SaveWholesaleDiscount", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SaveWholesaleDiscount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -231,7 +256,7 @@ func (c *itemServiceClient) SaveWholesaleDiscount(ctx context.Context, in *SaveI func (c *itemServiceClient) GetAllSaleLabels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ItemLabelListResponse, error) { out := new(ItemLabelListResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetAllSaleLabels", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetAllSaleLabels_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -240,7 +265,7 @@ func (c *itemServiceClient) GetAllSaleLabels(ctx context.Context, in *Empty, opt func (c *itemServiceClient) GetSaleLabel(ctx context.Context, in *IdOrName, opts ...grpc.CallOption) (*SItemLabel, error) { out := new(SItemLabel) - err := c.cc.Invoke(ctx, "/ItemService/GetSaleLabel", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetSaleLabel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -249,7 +274,7 @@ func (c *itemServiceClient) GetSaleLabel(ctx context.Context, in *IdOrName, opts func (c *itemServiceClient) SaveSaleLabel(ctx context.Context, in *SItemLabel, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/SaveSaleLabel", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_SaveSaleLabel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -258,7 +283,7 @@ func (c *itemServiceClient) SaveSaleLabel(ctx context.Context, in *SItemLabel, o func (c *itemServiceClient) DeleteSaleLabel(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ItemService/DeleteSaleLabel", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_DeleteSaleLabel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -267,7 +292,7 @@ func (c *itemServiceClient) DeleteSaleLabel(ctx context.Context, in *Int64, opts func (c *itemServiceClient) GetPagedValueGoodsBySaleLabel_(ctx context.Context, in *SaleLabelItemsRequest_, opts ...grpc.CallOption) (*PagingGoodsResponse, error) { out := new(PagingGoodsResponse) - err := c.cc.Invoke(ctx, "/ItemService/GetPagedValueGoodsBySaleLabel_", in, out, opts...) + err := c.cc.Invoke(ctx, ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -418,7 +443,7 @@ func _ItemService_GetItem_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetItem", + FullMethod: ItemService_GetItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItem(ctx, req.(*GetItemRequest)) @@ -436,7 +461,7 @@ func _ItemService_SaveItem_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SaveItem", + FullMethod: ItemService_SaveItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveItem(ctx, req.(*SaveItemRequest)) @@ -454,7 +479,7 @@ func _ItemService_GetItemBySku_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetItemBySku", + FullMethod: ItemService_GetItemBySku_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemBySku(ctx, req.(*ItemBySkuRequest)) @@ -472,7 +497,7 @@ func _ItemService_GetItemAndSnapshot_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetItemAndSnapshot", + FullMethod: ItemService_GetItemAndSnapshot_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemAndSnapshot(ctx, req.(*GetItemAndSnapshotRequest)) @@ -490,7 +515,7 @@ func _ItemService_GetTradeSnapshot_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetTradeSnapshot", + FullMethod: ItemService_GetTradeSnapshot_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetTradeSnapshot(ctx, req.(*Int64)) @@ -508,7 +533,7 @@ func _ItemService_GetSku_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetSku", + FullMethod: ItemService_GetSku_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetSku(ctx, req.(*SkuId)) @@ -526,7 +551,7 @@ func _ItemService_ReviewItem_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/ReviewItem", + FullMethod: ItemService_ReviewItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).ReviewItem(ctx, req.(*ItemReviewRequest)) @@ -544,7 +569,7 @@ func _ItemService_RecycleItem_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/RecycleItem", + FullMethod: ItemService_RecycleItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).RecycleItem(ctx, req.(*RecycleItemRequest)) @@ -562,7 +587,7 @@ func _ItemService_SaveLevelPrices_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SaveLevelPrices", + FullMethod: ItemService_SaveLevelPrices_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveLevelPrices(ctx, req.(*SaveLevelPriceRequest)) @@ -580,7 +605,7 @@ func _ItemService_SignAsIllegal_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SignAsIllegal", + FullMethod: ItemService_SignAsIllegal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SignAsIllegal(ctx, req.(*ItemIllegalRequest)) @@ -598,7 +623,7 @@ func _ItemService_SetShelveState_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SetShelveState", + FullMethod: ItemService_SetShelveState_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SetShelveState(ctx, req.(*ShelveStateRequest)) @@ -616,7 +641,7 @@ func _ItemService_GetItemDetailData_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetItemDetailData", + FullMethod: ItemService_GetItemDetailData_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItemDetailData(ctx, req.(*ItemDetailRequest)) @@ -634,7 +659,7 @@ func _ItemService_GetItems_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetItems", + FullMethod: ItemService_GetItems_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetItems(ctx, req.(*GetItemsRequest)) @@ -652,7 +677,7 @@ func _ItemService_GetWholesalePriceArray_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetWholesalePriceArray", + FullMethod: ItemService_GetWholesalePriceArray_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetWholesalePriceArray(ctx, req.(*SkuId)) @@ -670,7 +695,7 @@ func _ItemService_SaveWholesalePrice_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SaveWholesalePrice", + FullMethod: ItemService_SaveWholesalePrice_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveWholesalePrice(ctx, req.(*SaveSkuPricesRequest)) @@ -688,7 +713,7 @@ func _ItemService_GetWholesaleDiscountArray_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetWholesaleDiscountArray", + FullMethod: ItemService_GetWholesaleDiscountArray_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetWholesaleDiscountArray(ctx, req.(*GetWsDiscountRequest)) @@ -706,7 +731,7 @@ func _ItemService_SaveWholesaleDiscount_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SaveWholesaleDiscount", + FullMethod: ItemService_SaveWholesaleDiscount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveWholesaleDiscount(ctx, req.(*SaveItemDiscountRequest)) @@ -724,7 +749,7 @@ func _ItemService_GetAllSaleLabels_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetAllSaleLabels", + FullMethod: ItemService_GetAllSaleLabels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetAllSaleLabels(ctx, req.(*Empty)) @@ -742,7 +767,7 @@ func _ItemService_GetSaleLabel_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetSaleLabel", + FullMethod: ItemService_GetSaleLabel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetSaleLabel(ctx, req.(*IdOrName)) @@ -760,7 +785,7 @@ func _ItemService_SaveSaleLabel_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/SaveSaleLabel", + FullMethod: ItemService_SaveSaleLabel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).SaveSaleLabel(ctx, req.(*SItemLabel)) @@ -778,7 +803,7 @@ func _ItemService_DeleteSaleLabel_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/DeleteSaleLabel", + FullMethod: ItemService_DeleteSaleLabel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).DeleteSaleLabel(ctx, req.(*Int64)) @@ -796,7 +821,7 @@ func _ItemService_GetPagedValueGoodsBySaleLabel__Handler(srv interface{}, ctx co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ItemService/GetPagedValueGoodsBySaleLabel_", + FullMethod: ItemService_GetPagedValueGoodsBySaleLabel__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ItemServiceServer).GetPagedValueGoodsBySaleLabel_(ctx, req.(*SaleLabelItemsRequest_)) diff --git a/core/service/proto/member_dto.pb.go b/core/service/proto/member_dto.pb.go index 760e36223..f88dbe56b 100644 --- a/core/service/proto/member_dto.pb.go +++ b/core/service/proto/member_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/member_dto.proto package proto diff --git a/core/service/proto/member_service.pb.go b/core/service/proto/member_service.pb.go index e68a05ab1..6dba12b24 100644 --- a/core/service/proto/member_service.pb.go +++ b/core/service/proto/member_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: member_service.proto package proto diff --git a/core/service/proto/member_service_grpc.pb.go b/core/service/proto/member_service_grpc.pb.go index 504195256..a7e1b4ed4 100644 --- a/core/service/proto/member_service_grpc.pb.go +++ b/core/service/proto/member_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: member_service.proto package proto @@ -18,6 +18,91 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + MemberService_Register_FullMethodName = "/MemberService/Register" + MemberService_CheckLogin_FullMethodName = "/MemberService/CheckLogin" + MemberService_GrantAccessToken_FullMethodName = "/MemberService/GrantAccessToken" + MemberService_CheckAccessToken_FullMethodName = "/MemberService/CheckAccessToken" + MemberService_VerifyTradePassword_FullMethodName = "/MemberService/VerifyTradePassword" + MemberService_GetLevels_FullMethodName = "/MemberService/GetLevels" + MemberService_GetTrustInfo_FullMethodName = "/MemberService/GetTrustInfo" + MemberService_SubmitTrustInfo_FullMethodName = "/MemberService/SubmitTrustInfo" + MemberService_ReviewTrustedInfo_FullMethodName = "/MemberService/ReviewTrustedInfo" + MemberService_GetMemberLevel_FullMethodName = "/MemberService/GetMemberLevel" + MemberService_SaveMemberLevel_FullMethodName = "/MemberService/SaveMemberLevel" + MemberService_GetLevelBySign_FullMethodName = "/MemberService/GetLevelBySign" + MemberService_DeleteMemberLevel_FullMethodName = "/MemberService/DeleteMemberLevel" + MemberService_GetMember_FullMethodName = "/MemberService/GetMember" + MemberService_FindMember_FullMethodName = "/MemberService/FindMember" + MemberService_GetProfile_FullMethodName = "/MemberService/GetProfile" + MemberService_SaveProfile_FullMethodName = "/MemberService/SaveProfile" + MemberService_GetInviter_FullMethodName = "/MemberService/GetInviter" + MemberService_GetInviteCount_FullMethodName = "/MemberService/GetInviteCount" + MemberService_GetBankCards_FullMethodName = "/MemberService/GetBankCards" + MemberService_AddBankCard_FullMethodName = "/MemberService/AddBankCard" + MemberService_RemoveBankCard_FullMethodName = "/MemberService/RemoveBankCard" + MemberService_Active_FullMethodName = "/MemberService/Active" + MemberService_Lock_FullMethodName = "/MemberService/Lock" + MemberService_Unlock_FullMethodName = "/MemberService/Unlock" + MemberService_GrantFlag_FullMethodName = "/MemberService/GrantFlag" + MemberService_Complex_FullMethodName = "/MemberService/Complex" + MemberService_SendCode_FullMethodName = "/MemberService/SendCode" + MemberService_CompareCode_FullMethodName = "/MemberService/CompareCode" + MemberService_ReceiptsCodes_FullMethodName = "/MemberService/ReceiptsCodes" + MemberService_SaveReceiptsCode_FullMethodName = "/MemberService/SaveReceiptsCode" + MemberService_SetPayPriority_FullMethodName = "/MemberService/SetPayPriority" + MemberService_CheckProfileComplete_FullMethodName = "/MemberService/CheckProfileComplete" + MemberService_MemberLevelInfo_FullMethodName = "/MemberService/MemberLevelInfo" + MemberService_ChangeLevel_FullMethodName = "/MemberService/ChangeLevel" + MemberService_ReviewLevelUpRequest_FullMethodName = "/MemberService/ReviewLevelUpRequest" + MemberService_ConfirmLevelUpRequest_FullMethodName = "/MemberService/ConfirmLevelUpRequest" + MemberService_ChangePhone_FullMethodName = "/MemberService/ChangePhone" + MemberService_ChangeUsername_FullMethodName = "/MemberService/ChangeUsername" + MemberService_ChangeNickname_FullMethodName = "/MemberService/ChangeNickname" + MemberService_ChangeHeadPortrait_FullMethodName = "/MemberService/ChangeHeadPortrait" + MemberService_ChangePassword_FullMethodName = "/MemberService/ChangePassword" + MemberService_ChangeTradePassword_FullMethodName = "/MemberService/ChangeTradePassword" + MemberService_CheckProfileCompleted_FullMethodName = "/MemberService/CheckProfileCompleted" + MemberService_SetInviter_FullMethodName = "/MemberService/SetInviter" + MemberService_Premium_FullMethodName = "/MemberService/Premium" + MemberService_GetToken_FullMethodName = "/MemberService/GetToken" + MemberService_CheckToken_FullMethodName = "/MemberService/CheckToken" + MemberService_RemoveToken_FullMethodName = "/MemberService/RemoveToken" + MemberService_GetAddressList_FullMethodName = "/MemberService/GetAddressList" + MemberService_SaveAddress_FullMethodName = "/MemberService/SaveAddress" + MemberService_GetAddress_FullMethodName = "/MemberService/GetAddress" + MemberService_DeleteAddress_FullMethodName = "/MemberService/DeleteAddress" + MemberService_GetAccount_FullMethodName = "/MemberService/GetAccount" + MemberService_IsInvitation_FullMethodName = "/MemberService/IsInvitation" + MemberService_InviterArray_FullMethodName = "/MemberService/InviterArray" + MemberService_InviteMembersQuantity_FullMethodName = "/MemberService/InviteMembersQuantity" + MemberService_QueryInviteQuantity_FullMethodName = "/MemberService/QueryInviteQuantity" + MemberService_QueryInviteArray_FullMethodName = "/MemberService/QueryInviteArray" + MemberService_GetMyPagedInvitationMembers_FullMethodName = "/MemberService/GetMyPagedInvitationMembers" + MemberService_AccountCharge_FullMethodName = "/MemberService/AccountCharge" + MemberService_AccountCarryTo_FullMethodName = "/MemberService/AccountCarryTo" + MemberService_AccountConsume_FullMethodName = "/MemberService/AccountConsume" + MemberService_AccountDiscount_FullMethodName = "/MemberService/AccountDiscount" + MemberService_Freeze_FullMethodName = "/MemberService/Freeze" + MemberService_Unfreeze_FullMethodName = "/MemberService/Unfreeze" + MemberService_AccountRefund_FullMethodName = "/MemberService/AccountRefund" + MemberService_AccountAdjust_FullMethodName = "/MemberService/AccountAdjust" + MemberService_AccountTransfer_FullMethodName = "/MemberService/AccountTransfer" + MemberService_Withdraw_FullMethodName = "/MemberService/Withdraw" + MemberService_ReviewWithdrawal_FullMethodName = "/MemberService/ReviewWithdrawal" + MemberService_FinishWithdrawal_FullMethodName = "/MemberService/FinishWithdrawal" + MemberService_QueryWithdrawalLog_FullMethodName = "/MemberService/QueryWithdrawalLog" + MemberService_BindOAuthApp_FullMethodName = "/MemberService/BindOAuthApp" + MemberService_UnbindOAuthApp_FullMethodName = "/MemberService/UnbindOAuthApp" + MemberService_GetOAuthBindInfo_FullMethodName = "/MemberService/GetOAuthBindInfo" + MemberService_B4EAuth_FullMethodName = "/MemberService/B4EAuth" + MemberService_GetWalletLog_FullMethodName = "/MemberService/GetWalletLog" + MemberService_RemoveFavorite_FullMethodName = "/MemberService/RemoveFavorite" + MemberService_Favorite_FullMethodName = "/MemberService/Favorite" + MemberService_IsFavored_FullMethodName = "/MemberService/IsFavored" + MemberService_QueryCoupons_FullMethodName = "/MemberService/QueryCoupons" +) + // MemberServiceClient is the client API for MemberService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -208,7 +293,7 @@ func NewMemberServiceClient(cc grpc.ClientConnInterface) MemberServiceClient { func (c *memberServiceClient) Register(ctx context.Context, in *RegisterMemberRequest, opts ...grpc.CallOption) (*RegisterResponse, error) { out := new(RegisterResponse) - err := c.cc.Invoke(ctx, "/MemberService/Register", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Register_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -217,7 +302,7 @@ func (c *memberServiceClient) Register(ctx context.Context, in *RegisterMemberRe func (c *memberServiceClient) CheckLogin(ctx context.Context, in *LoginRequest, opts ...grpc.CallOption) (*LoginResponse, error) { out := new(LoginResponse) - err := c.cc.Invoke(ctx, "/MemberService/CheckLogin", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CheckLogin_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -226,7 +311,7 @@ func (c *memberServiceClient) CheckLogin(ctx context.Context, in *LoginRequest, func (c *memberServiceClient) GrantAccessToken(ctx context.Context, in *GrantAccessTokenRequest, opts ...grpc.CallOption) (*GrantAccessTokenResponse, error) { out := new(GrantAccessTokenResponse) - err := c.cc.Invoke(ctx, "/MemberService/GrantAccessToken", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GrantAccessToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -235,7 +320,7 @@ func (c *memberServiceClient) GrantAccessToken(ctx context.Context, in *GrantAcc func (c *memberServiceClient) CheckAccessToken(ctx context.Context, in *CheckAccessTokenRequest, opts ...grpc.CallOption) (*CheckAccessTokenResponse, error) { out := new(CheckAccessTokenResponse) - err := c.cc.Invoke(ctx, "/MemberService/CheckAccessToken", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CheckAccessToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -244,7 +329,7 @@ func (c *memberServiceClient) CheckAccessToken(ctx context.Context, in *CheckAcc func (c *memberServiceClient) VerifyTradePassword(ctx context.Context, in *VerifyPasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/VerifyTradePassword", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_VerifyTradePassword_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -253,7 +338,7 @@ func (c *memberServiceClient) VerifyTradePassword(ctx context.Context, in *Verif func (c *memberServiceClient) GetLevels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*SMemberLevelListResponse, error) { out := new(SMemberLevelListResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetLevels", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetLevels_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -262,7 +347,7 @@ func (c *memberServiceClient) GetLevels(ctx context.Context, in *Empty, opts ... func (c *memberServiceClient) GetTrustInfo(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*STrustedInfo, error) { out := new(STrustedInfo) - err := c.cc.Invoke(ctx, "/MemberService/GetTrustInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetTrustInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -271,7 +356,7 @@ func (c *memberServiceClient) GetTrustInfo(ctx context.Context, in *MemberIdRequ func (c *memberServiceClient) SubmitTrustInfo(ctx context.Context, in *SubmitTrustInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SubmitTrustInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SubmitTrustInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -280,7 +365,7 @@ func (c *memberServiceClient) SubmitTrustInfo(ctx context.Context, in *SubmitTru func (c *memberServiceClient) ReviewTrustedInfo(ctx context.Context, in *ReviewTrustInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ReviewTrustedInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ReviewTrustedInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -289,7 +374,7 @@ func (c *memberServiceClient) ReviewTrustedInfo(ctx context.Context, in *ReviewT func (c *memberServiceClient) GetMemberLevel(ctx context.Context, in *Int32, opts ...grpc.CallOption) (*SMemberLevel, error) { out := new(SMemberLevel) - err := c.cc.Invoke(ctx, "/MemberService/GetMemberLevel", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetMemberLevel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -298,7 +383,7 @@ func (c *memberServiceClient) GetMemberLevel(ctx context.Context, in *Int32, opt func (c *memberServiceClient) SaveMemberLevel(ctx context.Context, in *SMemberLevel, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SaveMemberLevel", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SaveMemberLevel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -307,7 +392,7 @@ func (c *memberServiceClient) SaveMemberLevel(ctx context.Context, in *SMemberLe func (c *memberServiceClient) GetLevelBySign(ctx context.Context, in *String, opts ...grpc.CallOption) (*SMemberLevel, error) { out := new(SMemberLevel) - err := c.cc.Invoke(ctx, "/MemberService/GetLevelBySign", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetLevelBySign_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -316,7 +401,7 @@ func (c *memberServiceClient) GetLevelBySign(ctx context.Context, in *String, op func (c *memberServiceClient) DeleteMemberLevel(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/DeleteMemberLevel", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_DeleteMemberLevel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -325,7 +410,7 @@ func (c *memberServiceClient) DeleteMemberLevel(ctx context.Context, in *Int64, func (c *memberServiceClient) GetMember(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SMember, error) { out := new(SMember) - err := c.cc.Invoke(ctx, "/MemberService/GetMember", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetMember_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -334,7 +419,7 @@ func (c *memberServiceClient) GetMember(ctx context.Context, in *MemberIdRequest func (c *memberServiceClient) FindMember(ctx context.Context, in *FindMemberRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MemberService/FindMember", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_FindMember_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -343,7 +428,7 @@ func (c *memberServiceClient) FindMember(ctx context.Context, in *FindMemberRequ func (c *memberServiceClient) GetProfile(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SProfile, error) { out := new(SProfile) - err := c.cc.Invoke(ctx, "/MemberService/GetProfile", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetProfile_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -352,7 +437,7 @@ func (c *memberServiceClient) GetProfile(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) SaveProfile(ctx context.Context, in *SProfile, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SaveProfile", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SaveProfile_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -361,7 +446,7 @@ func (c *memberServiceClient) SaveProfile(ctx context.Context, in *SProfile, opt func (c *memberServiceClient) GetInviter(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*MemberInviterResponse, error) { out := new(MemberInviterResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetInviter", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetInviter_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -370,7 +455,7 @@ func (c *memberServiceClient) GetInviter(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) GetInviteCount(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*MemberInviteCountResponse, error) { out := new(MemberInviteCountResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetInviteCount", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetInviteCount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -379,7 +464,7 @@ func (c *memberServiceClient) GetInviteCount(ctx context.Context, in *MemberIdRe func (c *memberServiceClient) GetBankCards(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*BankCardListResponse, error) { out := new(BankCardListResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetBankCards", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetBankCards_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -388,7 +473,7 @@ func (c *memberServiceClient) GetBankCards(ctx context.Context, in *MemberIdRequ func (c *memberServiceClient) AddBankCard(ctx context.Context, in *BankCardAddRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AddBankCard", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AddBankCard_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -397,7 +482,7 @@ func (c *memberServiceClient) AddBankCard(ctx context.Context, in *BankCardAddRe func (c *memberServiceClient) RemoveBankCard(ctx context.Context, in *BankCardRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/RemoveBankCard", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_RemoveBankCard_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -406,7 +491,7 @@ func (c *memberServiceClient) RemoveBankCard(ctx context.Context, in *BankCardRe func (c *memberServiceClient) Active(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Active", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Active_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -415,7 +500,7 @@ func (c *memberServiceClient) Active(ctx context.Context, in *MemberIdRequest, o func (c *memberServiceClient) Lock(ctx context.Context, in *LockRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Lock", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Lock_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -424,7 +509,7 @@ func (c *memberServiceClient) Lock(ctx context.Context, in *LockRequest, opts .. func (c *memberServiceClient) Unlock(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Unlock", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Unlock_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -433,7 +518,7 @@ func (c *memberServiceClient) Unlock(ctx context.Context, in *MemberIdRequest, o func (c *memberServiceClient) GrantFlag(ctx context.Context, in *GrantFlagRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/GrantFlag", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GrantFlag_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -442,7 +527,7 @@ func (c *memberServiceClient) GrantFlag(ctx context.Context, in *GrantFlagReques func (c *memberServiceClient) Complex(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SComplexMember, error) { out := new(SComplexMember) - err := c.cc.Invoke(ctx, "/MemberService/Complex", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Complex_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -451,7 +536,7 @@ func (c *memberServiceClient) Complex(ctx context.Context, in *MemberIdRequest, func (c *memberServiceClient) SendCode(ctx context.Context, in *SendCodeRequest, opts ...grpc.CallOption) (*SendCodeResponse, error) { out := new(SendCodeResponse) - err := c.cc.Invoke(ctx, "/MemberService/SendCode", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SendCode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -460,7 +545,7 @@ func (c *memberServiceClient) SendCode(ctx context.Context, in *SendCodeRequest, func (c *memberServiceClient) CompareCode(ctx context.Context, in *CompareCodeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/CompareCode", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CompareCode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -469,7 +554,7 @@ func (c *memberServiceClient) CompareCode(ctx context.Context, in *CompareCodeRe func (c *memberServiceClient) ReceiptsCodes(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SReceiptsCodeListResponse, error) { out := new(SReceiptsCodeListResponse) - err := c.cc.Invoke(ctx, "/MemberService/ReceiptsCodes", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ReceiptsCodes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -478,7 +563,7 @@ func (c *memberServiceClient) ReceiptsCodes(ctx context.Context, in *MemberIdReq func (c *memberServiceClient) SaveReceiptsCode(ctx context.Context, in *ReceiptsCodeSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SaveReceiptsCode", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SaveReceiptsCode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -487,7 +572,7 @@ func (c *memberServiceClient) SaveReceiptsCode(ctx context.Context, in *Receipts func (c *memberServiceClient) SetPayPriority(ctx context.Context, in *PayPriorityRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SetPayPriority", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SetPayPriority_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -496,7 +581,7 @@ func (c *memberServiceClient) SetPayPriority(ctx context.Context, in *PayPriorit func (c *memberServiceClient) CheckProfileComplete(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/CheckProfileComplete", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CheckProfileComplete_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -505,7 +590,7 @@ func (c *memberServiceClient) CheckProfileComplete(ctx context.Context, in *Memb func (c *memberServiceClient) MemberLevelInfo(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SMemberLevelInfo, error) { out := new(SMemberLevelInfo) - err := c.cc.Invoke(ctx, "/MemberService/MemberLevelInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_MemberLevelInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -514,7 +599,7 @@ func (c *memberServiceClient) MemberLevelInfo(ctx context.Context, in *MemberIdR func (c *memberServiceClient) ChangeLevel(ctx context.Context, in *ChangeLevelRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangeLevel", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangeLevel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -523,7 +608,7 @@ func (c *memberServiceClient) ChangeLevel(ctx context.Context, in *ChangeLevelRe func (c *memberServiceClient) ReviewLevelUpRequest(ctx context.Context, in *LevelUpReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ReviewLevelUpRequest", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ReviewLevelUpRequest_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -532,7 +617,7 @@ func (c *memberServiceClient) ReviewLevelUpRequest(ctx context.Context, in *Leve func (c *memberServiceClient) ConfirmLevelUpRequest(ctx context.Context, in *LevelUpConfirmRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ConfirmLevelUpRequest", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ConfirmLevelUpRequest_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -541,7 +626,7 @@ func (c *memberServiceClient) ConfirmLevelUpRequest(ctx context.Context, in *Lev func (c *memberServiceClient) ChangePhone(ctx context.Context, in *ChangePhoneRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangePhone", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangePhone_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -550,7 +635,7 @@ func (c *memberServiceClient) ChangePhone(ctx context.Context, in *ChangePhoneRe func (c *memberServiceClient) ChangeUsername(ctx context.Context, in *ChangeUsernameRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangeUsername", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangeUsername_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -559,7 +644,7 @@ func (c *memberServiceClient) ChangeUsername(ctx context.Context, in *ChangeUser func (c *memberServiceClient) ChangeNickname(ctx context.Context, in *ChangeNicknameRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangeNickname", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangeNickname_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -568,7 +653,7 @@ func (c *memberServiceClient) ChangeNickname(ctx context.Context, in *ChangeNick func (c *memberServiceClient) ChangeHeadPortrait(ctx context.Context, in *ChangePortraitRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangeHeadPortrait", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangeHeadPortrait_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -577,7 +662,7 @@ func (c *memberServiceClient) ChangeHeadPortrait(ctx context.Context, in *Change func (c *memberServiceClient) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangePassword", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangePassword_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -586,7 +671,7 @@ func (c *memberServiceClient) ChangePassword(ctx context.Context, in *ChangePass func (c *memberServiceClient) ChangeTradePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ChangeTradePassword", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ChangeTradePassword_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -595,7 +680,7 @@ func (c *memberServiceClient) ChangeTradePassword(ctx context.Context, in *Chang func (c *memberServiceClient) CheckProfileCompleted(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, "/MemberService/CheckProfileCompleted", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CheckProfileCompleted_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -604,7 +689,7 @@ func (c *memberServiceClient) CheckProfileCompleted(ctx context.Context, in *Int func (c *memberServiceClient) SetInviter(ctx context.Context, in *SetInviterRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/SetInviter", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SetInviter_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -613,7 +698,7 @@ func (c *memberServiceClient) SetInviter(ctx context.Context, in *SetInviterRequ func (c *memberServiceClient) Premium(ctx context.Context, in *PremiumRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Premium", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Premium_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -622,7 +707,7 @@ func (c *memberServiceClient) Premium(ctx context.Context, in *PremiumRequest, o func (c *memberServiceClient) GetToken(ctx context.Context, in *GetTokenRequest, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/MemberService/GetToken", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -631,7 +716,7 @@ func (c *memberServiceClient) GetToken(ctx context.Context, in *GetTokenRequest, func (c *memberServiceClient) CheckToken(ctx context.Context, in *CheckTokenRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, "/MemberService/CheckToken", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_CheckToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -640,7 +725,7 @@ func (c *memberServiceClient) CheckToken(ctx context.Context, in *CheckTokenRequ func (c *memberServiceClient) RemoveToken(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*Empty, error) { out := new(Empty) - err := c.cc.Invoke(ctx, "/MemberService/RemoveToken", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_RemoveToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -649,7 +734,7 @@ func (c *memberServiceClient) RemoveToken(ctx context.Context, in *MemberIdReque func (c *memberServiceClient) GetAddressList(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*AddressListResponse, error) { out := new(AddressListResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetAddressList", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetAddressList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -658,7 +743,7 @@ func (c *memberServiceClient) GetAddressList(ctx context.Context, in *MemberIdRe func (c *memberServiceClient) SaveAddress(ctx context.Context, in *SaveAddressRequest, opts ...grpc.CallOption) (*SaveAddressResponse, error) { out := new(SaveAddressResponse) - err := c.cc.Invoke(ctx, "/MemberService/SaveAddress", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_SaveAddress_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -667,7 +752,7 @@ func (c *memberServiceClient) SaveAddress(ctx context.Context, in *SaveAddressRe func (c *memberServiceClient) GetAddress(ctx context.Context, in *GetAddressRequest, opts ...grpc.CallOption) (*SAddress, error) { out := new(SAddress) - err := c.cc.Invoke(ctx, "/MemberService/GetAddress", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetAddress_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -676,7 +761,7 @@ func (c *memberServiceClient) GetAddress(ctx context.Context, in *GetAddressRequ func (c *memberServiceClient) DeleteAddress(ctx context.Context, in *AddressIdRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/DeleteAddress", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_DeleteAddress_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -685,7 +770,7 @@ func (c *memberServiceClient) DeleteAddress(ctx context.Context, in *AddressIdRe func (c *memberServiceClient) GetAccount(ctx context.Context, in *MemberIdRequest, opts ...grpc.CallOption) (*SAccount, error) { out := new(SAccount) - err := c.cc.Invoke(ctx, "/MemberService/GetAccount", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetAccount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -694,7 +779,7 @@ func (c *memberServiceClient) GetAccount(ctx context.Context, in *MemberIdReques func (c *memberServiceClient) IsInvitation(ctx context.Context, in *IsInvitationRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, "/MemberService/IsInvitation", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_IsInvitation_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -703,7 +788,7 @@ func (c *memberServiceClient) IsInvitation(ctx context.Context, in *IsInvitation func (c *memberServiceClient) InviterArray(ctx context.Context, in *DepthRequest, opts ...grpc.CallOption) (*InviterIdListResponse, error) { out := new(InviterIdListResponse) - err := c.cc.Invoke(ctx, "/MemberService/InviterArray", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_InviterArray_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -712,7 +797,7 @@ func (c *memberServiceClient) InviterArray(ctx context.Context, in *DepthRequest func (c *memberServiceClient) InviteMembersQuantity(ctx context.Context, in *DepthRequest, opts ...grpc.CallOption) (*Int32, error) { out := new(Int32) - err := c.cc.Invoke(ctx, "/MemberService/InviteMembersQuantity", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_InviteMembersQuantity_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -721,7 +806,7 @@ func (c *memberServiceClient) InviteMembersQuantity(ctx context.Context, in *Dep func (c *memberServiceClient) QueryInviteQuantity(ctx context.Context, in *InviteQuantityRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MemberService/QueryInviteQuantity", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_QueryInviteQuantity_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -730,7 +815,7 @@ func (c *memberServiceClient) QueryInviteQuantity(ctx context.Context, in *Invit func (c *memberServiceClient) QueryInviteArray(ctx context.Context, in *InviteQuantityRequest, opts ...grpc.CallOption) (*MemberIdListResponse, error) { out := new(MemberIdListResponse) - err := c.cc.Invoke(ctx, "/MemberService/QueryInviteArray", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_QueryInviteArray_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -739,7 +824,7 @@ func (c *memberServiceClient) QueryInviteArray(ctx context.Context, in *InviteQu func (c *memberServiceClient) GetMyPagedInvitationMembers(ctx context.Context, in *MemberInvitationPagingRequest, opts ...grpc.CallOption) (*MemberInvitationPagingResponse, error) { out := new(MemberInvitationPagingResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetMyPagedInvitationMembers", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetMyPagedInvitationMembers_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -748,7 +833,7 @@ func (c *memberServiceClient) GetMyPagedInvitationMembers(ctx context.Context, i func (c *memberServiceClient) AccountCharge(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountCharge", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountCharge_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -757,7 +842,7 @@ func (c *memberServiceClient) AccountCharge(ctx context.Context, in *AccountChan func (c *memberServiceClient) AccountCarryTo(ctx context.Context, in *AccountCarryRequest, opts ...grpc.CallOption) (*AccountCarryResponse, error) { out := new(AccountCarryResponse) - err := c.cc.Invoke(ctx, "/MemberService/AccountCarryTo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountCarryTo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -766,7 +851,7 @@ func (c *memberServiceClient) AccountCarryTo(ctx context.Context, in *AccountCar func (c *memberServiceClient) AccountConsume(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountConsume", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountConsume_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -775,7 +860,7 @@ func (c *memberServiceClient) AccountConsume(ctx context.Context, in *AccountCha func (c *memberServiceClient) AccountDiscount(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountDiscount", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountDiscount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -784,7 +869,7 @@ func (c *memberServiceClient) AccountDiscount(ctx context.Context, in *AccountCh func (c *memberServiceClient) Freeze(ctx context.Context, in *AccountFreezeRequest, opts ...grpc.CallOption) (*AccountFreezeResponse, error) { out := new(AccountFreezeResponse) - err := c.cc.Invoke(ctx, "/MemberService/Freeze", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Freeze_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -793,7 +878,7 @@ func (c *memberServiceClient) Freeze(ctx context.Context, in *AccountFreezeReque func (c *memberServiceClient) Unfreeze(ctx context.Context, in *AccountUnfreezeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Unfreeze", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Unfreeze_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -802,7 +887,7 @@ func (c *memberServiceClient) Unfreeze(ctx context.Context, in *AccountUnfreezeR func (c *memberServiceClient) AccountRefund(ctx context.Context, in *AccountChangeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountRefund", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountRefund_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -811,7 +896,7 @@ func (c *memberServiceClient) AccountRefund(ctx context.Context, in *AccountChan func (c *memberServiceClient) AccountAdjust(ctx context.Context, in *AccountAdjustRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountAdjust", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountAdjust_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -820,7 +905,7 @@ func (c *memberServiceClient) AccountAdjust(ctx context.Context, in *AccountAdju func (c *memberServiceClient) AccountTransfer(ctx context.Context, in *AccountTransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/AccountTransfer", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_AccountTransfer_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -829,7 +914,7 @@ func (c *memberServiceClient) AccountTransfer(ctx context.Context, in *AccountTr func (c *memberServiceClient) Withdraw(ctx context.Context, in *WithdrawRequest, opts ...grpc.CallOption) (*WithdrawalResponse, error) { out := new(WithdrawalResponse) - err := c.cc.Invoke(ctx, "/MemberService/Withdraw", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Withdraw_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -838,7 +923,7 @@ func (c *memberServiceClient) Withdraw(ctx context.Context, in *WithdrawRequest, func (c *memberServiceClient) ReviewWithdrawal(ctx context.Context, in *ReviewWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/ReviewWithdrawal", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_ReviewWithdrawal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -847,7 +932,7 @@ func (c *memberServiceClient) ReviewWithdrawal(ctx context.Context, in *ReviewWi func (c *memberServiceClient) FinishWithdrawal(ctx context.Context, in *FinishWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/FinishWithdrawal", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_FinishWithdrawal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -856,7 +941,7 @@ func (c *memberServiceClient) FinishWithdrawal(ctx context.Context, in *FinishWi func (c *memberServiceClient) QueryWithdrawalLog(ctx context.Context, in *WithdrawalLogRequest, opts ...grpc.CallOption) (*WithdrawalLogResponse, error) { out := new(WithdrawalLogResponse) - err := c.cc.Invoke(ctx, "/MemberService/QueryWithdrawalLog", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_QueryWithdrawalLog_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -865,7 +950,7 @@ func (c *memberServiceClient) QueryWithdrawalLog(ctx context.Context, in *Withdr func (c *memberServiceClient) BindOAuthApp(ctx context.Context, in *SMemberOAuthAccount, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/BindOAuthApp", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_BindOAuthApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -874,7 +959,7 @@ func (c *memberServiceClient) BindOAuthApp(ctx context.Context, in *SMemberOAuth func (c *memberServiceClient) UnbindOAuthApp(ctx context.Context, in *MemberOAuthRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/UnbindOAuthApp", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_UnbindOAuthApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -883,7 +968,7 @@ func (c *memberServiceClient) UnbindOAuthApp(ctx context.Context, in *MemberOAut func (c *memberServiceClient) GetOAuthBindInfo(ctx context.Context, in *MemberOAuthRequest, opts ...grpc.CallOption) (*SMemberOAuthAccount, error) { out := new(SMemberOAuthAccount) - err := c.cc.Invoke(ctx, "/MemberService/GetOAuthBindInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetOAuthBindInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -892,7 +977,7 @@ func (c *memberServiceClient) GetOAuthBindInfo(ctx context.Context, in *MemberOA func (c *memberServiceClient) B4EAuth(ctx context.Context, in *B4EAuthRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/B4EAuth", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_B4EAuth_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -901,7 +986,7 @@ func (c *memberServiceClient) B4EAuth(ctx context.Context, in *B4EAuthRequest, o func (c *memberServiceClient) GetWalletLog(ctx context.Context, in *WalletLogRequest, opts ...grpc.CallOption) (*WalletLogResponse, error) { out := new(WalletLogResponse) - err := c.cc.Invoke(ctx, "/MemberService/GetWalletLog", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_GetWalletLog_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -910,7 +995,7 @@ func (c *memberServiceClient) GetWalletLog(ctx context.Context, in *WalletLogReq func (c *memberServiceClient) RemoveFavorite(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/RemoveFavorite", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_RemoveFavorite_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -919,7 +1004,7 @@ func (c *memberServiceClient) RemoveFavorite(ctx context.Context, in *FavoriteRe func (c *memberServiceClient) Favorite(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MemberService/Favorite", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_Favorite_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -928,7 +1013,7 @@ func (c *memberServiceClient) Favorite(ctx context.Context, in *FavoriteRequest, func (c *memberServiceClient) IsFavored(ctx context.Context, in *FavoriteRequest, opts ...grpc.CallOption) (*Bool, error) { out := new(Bool) - err := c.cc.Invoke(ctx, "/MemberService/IsFavored", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_IsFavored_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -937,7 +1022,7 @@ func (c *memberServiceClient) IsFavored(ctx context.Context, in *FavoriteRequest func (c *memberServiceClient) QueryCoupons(ctx context.Context, in *MemberCouponPagingRequest, opts ...grpc.CallOption) (*MemberCouponListResponse, error) { out := new(MemberCouponListResponse) - err := c.cc.Invoke(ctx, "/MemberService/QueryCoupons", in, out, opts...) + err := c.cc.Invoke(ctx, MemberService_QueryCoupons_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -1398,7 +1483,7 @@ func _MemberService_Register_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Register", + FullMethod: MemberService_Register_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Register(ctx, req.(*RegisterMemberRequest)) @@ -1416,7 +1501,7 @@ func _MemberService_CheckLogin_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CheckLogin", + FullMethod: MemberService_CheckLogin_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckLogin(ctx, req.(*LoginRequest)) @@ -1434,7 +1519,7 @@ func _MemberService_GrantAccessToken_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GrantAccessToken", + FullMethod: MemberService_GrantAccessToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GrantAccessToken(ctx, req.(*GrantAccessTokenRequest)) @@ -1452,7 +1537,7 @@ func _MemberService_CheckAccessToken_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CheckAccessToken", + FullMethod: MemberService_CheckAccessToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckAccessToken(ctx, req.(*CheckAccessTokenRequest)) @@ -1470,7 +1555,7 @@ func _MemberService_VerifyTradePassword_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/VerifyTradePassword", + FullMethod: MemberService_VerifyTradePassword_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).VerifyTradePassword(ctx, req.(*VerifyPasswordRequest)) @@ -1488,7 +1573,7 @@ func _MemberService_GetLevels_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetLevels", + FullMethod: MemberService_GetLevels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetLevels(ctx, req.(*Empty)) @@ -1506,7 +1591,7 @@ func _MemberService_GetTrustInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetTrustInfo", + FullMethod: MemberService_GetTrustInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetTrustInfo(ctx, req.(*MemberIdRequest)) @@ -1524,7 +1609,7 @@ func _MemberService_SubmitTrustInfo_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SubmitTrustInfo", + FullMethod: MemberService_SubmitTrustInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SubmitTrustInfo(ctx, req.(*SubmitTrustInfoRequest)) @@ -1542,7 +1627,7 @@ func _MemberService_ReviewTrustedInfo_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ReviewTrustedInfo", + FullMethod: MemberService_ReviewTrustedInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewTrustedInfo(ctx, req.(*ReviewTrustInfoRequest)) @@ -1560,7 +1645,7 @@ func _MemberService_GetMemberLevel_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetMemberLevel", + FullMethod: MemberService_GetMemberLevel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMemberLevel(ctx, req.(*Int32)) @@ -1578,7 +1663,7 @@ func _MemberService_SaveMemberLevel_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SaveMemberLevel", + FullMethod: MemberService_SaveMemberLevel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveMemberLevel(ctx, req.(*SMemberLevel)) @@ -1596,7 +1681,7 @@ func _MemberService_GetLevelBySign_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetLevelBySign", + FullMethod: MemberService_GetLevelBySign_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetLevelBySign(ctx, req.(*String)) @@ -1614,7 +1699,7 @@ func _MemberService_DeleteMemberLevel_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/DeleteMemberLevel", + FullMethod: MemberService_DeleteMemberLevel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).DeleteMemberLevel(ctx, req.(*Int64)) @@ -1632,7 +1717,7 @@ func _MemberService_GetMember_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetMember", + FullMethod: MemberService_GetMember_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMember(ctx, req.(*MemberIdRequest)) @@ -1650,7 +1735,7 @@ func _MemberService_FindMember_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/FindMember", + FullMethod: MemberService_FindMember_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).FindMember(ctx, req.(*FindMemberRequest)) @@ -1668,7 +1753,7 @@ func _MemberService_GetProfile_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetProfile", + FullMethod: MemberService_GetProfile_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetProfile(ctx, req.(*MemberIdRequest)) @@ -1686,7 +1771,7 @@ func _MemberService_SaveProfile_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SaveProfile", + FullMethod: MemberService_SaveProfile_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveProfile(ctx, req.(*SProfile)) @@ -1704,7 +1789,7 @@ func _MemberService_GetInviter_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetInviter", + FullMethod: MemberService_GetInviter_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetInviter(ctx, req.(*MemberIdRequest)) @@ -1722,7 +1807,7 @@ func _MemberService_GetInviteCount_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetInviteCount", + FullMethod: MemberService_GetInviteCount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetInviteCount(ctx, req.(*MemberIdRequest)) @@ -1740,7 +1825,7 @@ func _MemberService_GetBankCards_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetBankCards", + FullMethod: MemberService_GetBankCards_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetBankCards(ctx, req.(*MemberIdRequest)) @@ -1758,7 +1843,7 @@ func _MemberService_AddBankCard_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AddBankCard", + FullMethod: MemberService_AddBankCard_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AddBankCard(ctx, req.(*BankCardAddRequest)) @@ -1776,7 +1861,7 @@ func _MemberService_RemoveBankCard_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/RemoveBankCard", + FullMethod: MemberService_RemoveBankCard_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveBankCard(ctx, req.(*BankCardRequest)) @@ -1794,7 +1879,7 @@ func _MemberService_Active_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Active", + FullMethod: MemberService_Active_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Active(ctx, req.(*MemberIdRequest)) @@ -1812,7 +1897,7 @@ func _MemberService_Lock_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Lock", + FullMethod: MemberService_Lock_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Lock(ctx, req.(*LockRequest)) @@ -1830,7 +1915,7 @@ func _MemberService_Unlock_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Unlock", + FullMethod: MemberService_Unlock_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Unlock(ctx, req.(*MemberIdRequest)) @@ -1848,7 +1933,7 @@ func _MemberService_GrantFlag_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GrantFlag", + FullMethod: MemberService_GrantFlag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GrantFlag(ctx, req.(*GrantFlagRequest)) @@ -1866,7 +1951,7 @@ func _MemberService_Complex_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Complex", + FullMethod: MemberService_Complex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Complex(ctx, req.(*MemberIdRequest)) @@ -1884,7 +1969,7 @@ func _MemberService_SendCode_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SendCode", + FullMethod: MemberService_SendCode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SendCode(ctx, req.(*SendCodeRequest)) @@ -1902,7 +1987,7 @@ func _MemberService_CompareCode_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CompareCode", + FullMethod: MemberService_CompareCode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CompareCode(ctx, req.(*CompareCodeRequest)) @@ -1920,7 +2005,7 @@ func _MemberService_ReceiptsCodes_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ReceiptsCodes", + FullMethod: MemberService_ReceiptsCodes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReceiptsCodes(ctx, req.(*MemberIdRequest)) @@ -1938,7 +2023,7 @@ func _MemberService_SaveReceiptsCode_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SaveReceiptsCode", + FullMethod: MemberService_SaveReceiptsCode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveReceiptsCode(ctx, req.(*ReceiptsCodeSaveRequest)) @@ -1956,7 +2041,7 @@ func _MemberService_SetPayPriority_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SetPayPriority", + FullMethod: MemberService_SetPayPriority_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SetPayPriority(ctx, req.(*PayPriorityRequest)) @@ -1974,7 +2059,7 @@ func _MemberService_CheckProfileComplete_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CheckProfileComplete", + FullMethod: MemberService_CheckProfileComplete_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckProfileComplete(ctx, req.(*MemberIdRequest)) @@ -1992,7 +2077,7 @@ func _MemberService_MemberLevelInfo_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/MemberLevelInfo", + FullMethod: MemberService_MemberLevelInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).MemberLevelInfo(ctx, req.(*MemberIdRequest)) @@ -2010,7 +2095,7 @@ func _MemberService_ChangeLevel_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangeLevel", + FullMethod: MemberService_ChangeLevel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeLevel(ctx, req.(*ChangeLevelRequest)) @@ -2028,7 +2113,7 @@ func _MemberService_ReviewLevelUpRequest_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ReviewLevelUpRequest", + FullMethod: MemberService_ReviewLevelUpRequest_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewLevelUpRequest(ctx, req.(*LevelUpReviewRequest)) @@ -2046,7 +2131,7 @@ func _MemberService_ConfirmLevelUpRequest_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ConfirmLevelUpRequest", + FullMethod: MemberService_ConfirmLevelUpRequest_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ConfirmLevelUpRequest(ctx, req.(*LevelUpConfirmRequest)) @@ -2064,7 +2149,7 @@ func _MemberService_ChangePhone_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangePhone", + FullMethod: MemberService_ChangePhone_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangePhone(ctx, req.(*ChangePhoneRequest)) @@ -2082,7 +2167,7 @@ func _MemberService_ChangeUsername_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangeUsername", + FullMethod: MemberService_ChangeUsername_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeUsername(ctx, req.(*ChangeUsernameRequest)) @@ -2100,7 +2185,7 @@ func _MemberService_ChangeNickname_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangeNickname", + FullMethod: MemberService_ChangeNickname_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeNickname(ctx, req.(*ChangeNicknameRequest)) @@ -2118,7 +2203,7 @@ func _MemberService_ChangeHeadPortrait_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangeHeadPortrait", + FullMethod: MemberService_ChangeHeadPortrait_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeHeadPortrait(ctx, req.(*ChangePortraitRequest)) @@ -2136,7 +2221,7 @@ func _MemberService_ChangePassword_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangePassword", + FullMethod: MemberService_ChangePassword_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangePassword(ctx, req.(*ChangePasswordRequest)) @@ -2154,7 +2239,7 @@ func _MemberService_ChangeTradePassword_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ChangeTradePassword", + FullMethod: MemberService_ChangeTradePassword_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ChangeTradePassword(ctx, req.(*ChangePasswordRequest)) @@ -2172,7 +2257,7 @@ func _MemberService_CheckProfileCompleted_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CheckProfileCompleted", + FullMethod: MemberService_CheckProfileCompleted_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckProfileCompleted(ctx, req.(*Int64)) @@ -2190,7 +2275,7 @@ func _MemberService_SetInviter_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SetInviter", + FullMethod: MemberService_SetInviter_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SetInviter(ctx, req.(*SetInviterRequest)) @@ -2208,7 +2293,7 @@ func _MemberService_Premium_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Premium", + FullMethod: MemberService_Premium_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Premium(ctx, req.(*PremiumRequest)) @@ -2226,7 +2311,7 @@ func _MemberService_GetToken_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetToken", + FullMethod: MemberService_GetToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetToken(ctx, req.(*GetTokenRequest)) @@ -2244,7 +2329,7 @@ func _MemberService_CheckToken_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/CheckToken", + FullMethod: MemberService_CheckToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).CheckToken(ctx, req.(*CheckTokenRequest)) @@ -2262,7 +2347,7 @@ func _MemberService_RemoveToken_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/RemoveToken", + FullMethod: MemberService_RemoveToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveToken(ctx, req.(*MemberIdRequest)) @@ -2280,7 +2365,7 @@ func _MemberService_GetAddressList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetAddressList", + FullMethod: MemberService_GetAddressList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAddressList(ctx, req.(*MemberIdRequest)) @@ -2298,7 +2383,7 @@ func _MemberService_SaveAddress_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/SaveAddress", + FullMethod: MemberService_SaveAddress_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).SaveAddress(ctx, req.(*SaveAddressRequest)) @@ -2316,7 +2401,7 @@ func _MemberService_GetAddress_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetAddress", + FullMethod: MemberService_GetAddress_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAddress(ctx, req.(*GetAddressRequest)) @@ -2334,7 +2419,7 @@ func _MemberService_DeleteAddress_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/DeleteAddress", + FullMethod: MemberService_DeleteAddress_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).DeleteAddress(ctx, req.(*AddressIdRequest)) @@ -2352,7 +2437,7 @@ func _MemberService_GetAccount_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetAccount", + FullMethod: MemberService_GetAccount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetAccount(ctx, req.(*MemberIdRequest)) @@ -2370,7 +2455,7 @@ func _MemberService_IsInvitation_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/IsInvitation", + FullMethod: MemberService_IsInvitation_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).IsInvitation(ctx, req.(*IsInvitationRequest)) @@ -2388,7 +2473,7 @@ func _MemberService_InviterArray_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/InviterArray", + FullMethod: MemberService_InviterArray_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).InviterArray(ctx, req.(*DepthRequest)) @@ -2406,7 +2491,7 @@ func _MemberService_InviteMembersQuantity_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/InviteMembersQuantity", + FullMethod: MemberService_InviteMembersQuantity_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).InviteMembersQuantity(ctx, req.(*DepthRequest)) @@ -2424,7 +2509,7 @@ func _MemberService_QueryInviteQuantity_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/QueryInviteQuantity", + FullMethod: MemberService_QueryInviteQuantity_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryInviteQuantity(ctx, req.(*InviteQuantityRequest)) @@ -2442,7 +2527,7 @@ func _MemberService_QueryInviteArray_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/QueryInviteArray", + FullMethod: MemberService_QueryInviteArray_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryInviteArray(ctx, req.(*InviteQuantityRequest)) @@ -2460,7 +2545,7 @@ func _MemberService_GetMyPagedInvitationMembers_Handler(srv interface{}, ctx con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetMyPagedInvitationMembers", + FullMethod: MemberService_GetMyPagedInvitationMembers_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetMyPagedInvitationMembers(ctx, req.(*MemberInvitationPagingRequest)) @@ -2478,7 +2563,7 @@ func _MemberService_AccountCharge_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountCharge", + FullMethod: MemberService_AccountCharge_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountCharge(ctx, req.(*AccountChangeRequest)) @@ -2496,7 +2581,7 @@ func _MemberService_AccountCarryTo_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountCarryTo", + FullMethod: MemberService_AccountCarryTo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountCarryTo(ctx, req.(*AccountCarryRequest)) @@ -2514,7 +2599,7 @@ func _MemberService_AccountConsume_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountConsume", + FullMethod: MemberService_AccountConsume_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountConsume(ctx, req.(*AccountChangeRequest)) @@ -2532,7 +2617,7 @@ func _MemberService_AccountDiscount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountDiscount", + FullMethod: MemberService_AccountDiscount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountDiscount(ctx, req.(*AccountChangeRequest)) @@ -2550,7 +2635,7 @@ func _MemberService_Freeze_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Freeze", + FullMethod: MemberService_Freeze_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Freeze(ctx, req.(*AccountFreezeRequest)) @@ -2568,7 +2653,7 @@ func _MemberService_Unfreeze_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Unfreeze", + FullMethod: MemberService_Unfreeze_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Unfreeze(ctx, req.(*AccountUnfreezeRequest)) @@ -2586,7 +2671,7 @@ func _MemberService_AccountRefund_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountRefund", + FullMethod: MemberService_AccountRefund_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountRefund(ctx, req.(*AccountChangeRequest)) @@ -2604,7 +2689,7 @@ func _MemberService_AccountAdjust_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountAdjust", + FullMethod: MemberService_AccountAdjust_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountAdjust(ctx, req.(*AccountAdjustRequest)) @@ -2622,7 +2707,7 @@ func _MemberService_AccountTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/AccountTransfer", + FullMethod: MemberService_AccountTransfer_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).AccountTransfer(ctx, req.(*AccountTransferRequest)) @@ -2640,7 +2725,7 @@ func _MemberService_Withdraw_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Withdraw", + FullMethod: MemberService_Withdraw_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Withdraw(ctx, req.(*WithdrawRequest)) @@ -2658,7 +2743,7 @@ func _MemberService_ReviewWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/ReviewWithdrawal", + FullMethod: MemberService_ReviewWithdrawal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).ReviewWithdrawal(ctx, req.(*ReviewWithdrawalRequest)) @@ -2676,7 +2761,7 @@ func _MemberService_FinishWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/FinishWithdrawal", + FullMethod: MemberService_FinishWithdrawal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).FinishWithdrawal(ctx, req.(*FinishWithdrawalRequest)) @@ -2694,7 +2779,7 @@ func _MemberService_QueryWithdrawalLog_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/QueryWithdrawalLog", + FullMethod: MemberService_QueryWithdrawalLog_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryWithdrawalLog(ctx, req.(*WithdrawalLogRequest)) @@ -2712,7 +2797,7 @@ func _MemberService_BindOAuthApp_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/BindOAuthApp", + FullMethod: MemberService_BindOAuthApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).BindOAuthApp(ctx, req.(*SMemberOAuthAccount)) @@ -2730,7 +2815,7 @@ func _MemberService_UnbindOAuthApp_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/UnbindOAuthApp", + FullMethod: MemberService_UnbindOAuthApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).UnbindOAuthApp(ctx, req.(*MemberOAuthRequest)) @@ -2748,7 +2833,7 @@ func _MemberService_GetOAuthBindInfo_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetOAuthBindInfo", + FullMethod: MemberService_GetOAuthBindInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetOAuthBindInfo(ctx, req.(*MemberOAuthRequest)) @@ -2766,7 +2851,7 @@ func _MemberService_B4EAuth_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/B4EAuth", + FullMethod: MemberService_B4EAuth_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).B4EAuth(ctx, req.(*B4EAuthRequest)) @@ -2784,7 +2869,7 @@ func _MemberService_GetWalletLog_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/GetWalletLog", + FullMethod: MemberService_GetWalletLog_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).GetWalletLog(ctx, req.(*WalletLogRequest)) @@ -2802,7 +2887,7 @@ func _MemberService_RemoveFavorite_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/RemoveFavorite", + FullMethod: MemberService_RemoveFavorite_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).RemoveFavorite(ctx, req.(*FavoriteRequest)) @@ -2820,7 +2905,7 @@ func _MemberService_Favorite_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/Favorite", + FullMethod: MemberService_Favorite_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).Favorite(ctx, req.(*FavoriteRequest)) @@ -2838,7 +2923,7 @@ func _MemberService_IsFavored_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/IsFavored", + FullMethod: MemberService_IsFavored_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).IsFavored(ctx, req.(*FavoriteRequest)) @@ -2856,7 +2941,7 @@ func _MemberService_QueryCoupons_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MemberService/QueryCoupons", + FullMethod: MemberService_QueryCoupons_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MemberServiceServer).QueryCoupons(ctx, req.(*MemberCouponPagingRequest)) diff --git a/core/service/proto/merchant_dto.pb.go b/core/service/proto/merchant_dto.pb.go index b70cd924a..04b372d48 100644 --- a/core/service/proto/merchant_dto.pb.go +++ b/core/service/proto/merchant_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/merchant_dto.proto package proto diff --git a/core/service/proto/merchant_service.pb.go b/core/service/proto/merchant_service.pb.go index d032125c4..25d7ff349 100644 --- a/core/service/proto/merchant_service.pb.go +++ b/core/service/proto/merchant_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: merchant_service.proto package proto diff --git a/core/service/proto/merchant_service_grpc.pb.go b/core/service/proto/merchant_service_grpc.pb.go index 333955cc8..e2a35ede0 100644 --- a/core/service/proto/merchant_service_grpc.pb.go +++ b/core/service/proto/merchant_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: merchant_service.proto package proto @@ -18,6 +18,51 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + MerchantService_GetMerchant_FullMethodName = "/MerchantService/GetMerchant" + MerchantService_CreateMerchant_FullMethodName = "/MerchantService/CreateMerchant" + MerchantService_SaveMerchant_FullMethodName = "/MerchantService/SaveMerchant" + MerchantService_CheckLogin_FullMethodName = "/MerchantService/CheckLogin" + MerchantService_Stat_FullMethodName = "/MerchantService/Stat" + MerchantService_SyncWholesaleItem_FullMethodName = "/MerchantService/SyncWholesaleItem" + MerchantService_GetAllTradeConf__FullMethodName = "/MerchantService/GetAllTradeConf_" + MerchantService_GetTradeConf_FullMethodName = "/MerchantService/GetTradeConf" + MerchantService_SaveTradeConf_FullMethodName = "/MerchantService/SaveTradeConf" + MerchantService_CreateSignUpToken_FullMethodName = "/MerchantService/CreateSignUpToken" + MerchantService_GetMemberFromSignUpToken_FullMethodName = "/MerchantService/GetMemberFromSignUpToken" + MerchantService_SignUp_FullMethodName = "/MerchantService/SignUp" + MerchantService_GetMchSignUpId_FullMethodName = "/MerchantService/GetMchSignUpId" + MerchantService_GetSignUp_FullMethodName = "/MerchantService/GetSignUp" + MerchantService_ReviewSignUp_FullMethodName = "/MerchantService/ReviewSignUp" + MerchantService_RemoveMerchantSignUp_FullMethodName = "/MerchantService/RemoveMerchantSignUp" + MerchantService_GetMerchantIdByMember_FullMethodName = "/MerchantService/GetMerchantIdByMember" + MerchantService_ChangeMemberBind_FullMethodName = "/MerchantService/ChangeMemberBind" + MerchantService_GetEnterpriseInfo_FullMethodName = "/MerchantService/GetEnterpriseInfo" + MerchantService_SaveEnterpriseInfo_FullMethodName = "/MerchantService/SaveEnterpriseInfo" + MerchantService_ReviewEnterpriseInfo_FullMethodName = "/MerchantService/ReviewEnterpriseInfo" + MerchantService_GetAccount_FullMethodName = "/MerchantService/GetAccount" + MerchantService_SetEnabled_FullMethodName = "/MerchantService/SetEnabled" + MerchantService_GetMerchantIdByHost_FullMethodName = "/MerchantService/GetMerchantIdByHost" + MerchantService_GetMerchantMajorHost_FullMethodName = "/MerchantService/GetMerchantMajorHost" + MerchantService_SaveSaleConf_FullMethodName = "/MerchantService/SaveSaleConf" + MerchantService_GetSaleConf_FullMethodName = "/MerchantService/GetSaleConf" + MerchantService_GetShopId_FullMethodName = "/MerchantService/GetShopId" + MerchantService_ChangePassword_FullMethodName = "/MerchantService/ChangePassword" + MerchantService_GetApiInfo_FullMethodName = "/MerchantService/GetApiInfo" + MerchantService_ToggleApiPerm_FullMethodName = "/MerchantService/ToggleApiPerm" + MerchantService_GetMerchantIdByApiId_FullMethodName = "/MerchantService/GetMerchantIdByApiId" + MerchantService_PagedNormalOrderOfVendor_FullMethodName = "/MerchantService/PagedNormalOrderOfVendor" + MerchantService_PagedWholesaleOrderOfVendor_FullMethodName = "/MerchantService/PagedWholesaleOrderOfVendor" + MerchantService_PagedTradeOrderOfVendor_FullMethodName = "/MerchantService/PagedTradeOrderOfVendor" + MerchantService_WithdrawToMemberAccount_FullMethodName = "/MerchantService/WithdrawToMemberAccount" + MerchantService_ChargeAccount_FullMethodName = "/MerchantService/ChargeAccount" + MerchantService_GetMchBuyerGroup__FullMethodName = "/MerchantService/GetMchBuyerGroup_" + MerchantService_SaveMchBuyerGroup_FullMethodName = "/MerchantService/SaveMchBuyerGroup" + MerchantService_GetBuyerGroups_FullMethodName = "/MerchantService/GetBuyerGroups" + MerchantService_GetRebateRate_FullMethodName = "/MerchantService/GetRebateRate" + MerchantService_SaveGroupRebateRate_FullMethodName = "/MerchantService/SaveGroupRebateRate" +) + // MerchantServiceClient is the client API for MerchantService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -115,7 +160,7 @@ func NewMerchantServiceClient(cc grpc.ClientConnInterface) MerchantServiceClient func (c *merchantServiceClient) GetMerchant(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMerchant, error) { out := new(SMerchant) - err := c.cc.Invoke(ctx, "/MerchantService/GetMerchant", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMerchant_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -124,7 +169,7 @@ func (c *merchantServiceClient) GetMerchant(ctx context.Context, in *Int64, opts func (c *merchantServiceClient) CreateMerchant(ctx context.Context, in *MerchantCreateRequest, opts ...grpc.CallOption) (*MerchantCreateResponse, error) { out := new(MerchantCreateResponse) - err := c.cc.Invoke(ctx, "/MerchantService/CreateMerchant", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_CreateMerchant_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -133,7 +178,7 @@ func (c *merchantServiceClient) CreateMerchant(ctx context.Context, in *Merchant func (c *merchantServiceClient) SaveMerchant(ctx context.Context, in *SaveMerchantRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveMerchant", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveMerchant_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -142,7 +187,7 @@ func (c *merchantServiceClient) SaveMerchant(ctx context.Context, in *SaveMercha func (c *merchantServiceClient) CheckLogin(ctx context.Context, in *MchUserPwdRequest, opts ...grpc.CallOption) (*MchLoginResponse, error) { out := new(MchLoginResponse) - err := c.cc.Invoke(ctx, "/MerchantService/CheckLogin", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_CheckLogin_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -151,7 +196,7 @@ func (c *merchantServiceClient) CheckLogin(ctx context.Context, in *MchUserPwdRe func (c *merchantServiceClient) Stat(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/Stat", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_Stat_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -160,7 +205,7 @@ func (c *merchantServiceClient) Stat(ctx context.Context, in *Int64, opts ...grp func (c *merchantServiceClient) SyncWholesaleItem(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SyncWSItemsResponse, error) { out := new(SyncWSItemsResponse) - err := c.cc.Invoke(ctx, "/MerchantService/SyncWholesaleItem", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SyncWholesaleItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -169,7 +214,7 @@ func (c *merchantServiceClient) SyncWholesaleItem(ctx context.Context, in *Int64 func (c *merchantServiceClient) GetAllTradeConf_(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*STradeConfListResponse, error) { out := new(STradeConfListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/GetAllTradeConf_", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetAllTradeConf__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -178,7 +223,7 @@ func (c *merchantServiceClient) GetAllTradeConf_(ctx context.Context, in *Int64, func (c *merchantServiceClient) GetTradeConf(ctx context.Context, in *TradeConfRequest, opts ...grpc.CallOption) (*STradeConf_, error) { out := new(STradeConf_) - err := c.cc.Invoke(ctx, "/MerchantService/GetTradeConf", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetTradeConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -187,7 +232,7 @@ func (c *merchantServiceClient) GetTradeConf(ctx context.Context, in *TradeConfR func (c *merchantServiceClient) SaveTradeConf(ctx context.Context, in *TradeConfSaveRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveTradeConf", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveTradeConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -196,7 +241,7 @@ func (c *merchantServiceClient) SaveTradeConf(ctx context.Context, in *TradeConf func (c *merchantServiceClient) CreateSignUpToken(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/MerchantService/CreateSignUpToken", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_CreateSignUpToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -205,7 +250,7 @@ func (c *merchantServiceClient) CreateSignUpToken(ctx context.Context, in *Membe func (c *merchantServiceClient) GetMemberFromSignUpToken(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetMemberFromSignUpToken", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMemberFromSignUpToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -214,7 +259,7 @@ func (c *merchantServiceClient) GetMemberFromSignUpToken(ctx context.Context, in func (c *merchantServiceClient) SignUp(ctx context.Context, in *SMchSignUp, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SignUp", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SignUp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -223,7 +268,7 @@ func (c *merchantServiceClient) SignUp(ctx context.Context, in *SMchSignUp, opts func (c *merchantServiceClient) GetMchSignUpId(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetMchSignUpId", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMchSignUpId_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -232,7 +277,7 @@ func (c *merchantServiceClient) GetMchSignUpId(ctx context.Context, in *MemberId func (c *merchantServiceClient) GetSignUp(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMchSignUp, error) { out := new(SMchSignUp) - err := c.cc.Invoke(ctx, "/MerchantService/GetSignUp", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetSignUp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -241,7 +286,7 @@ func (c *merchantServiceClient) GetSignUp(ctx context.Context, in *Int64, opts . func (c *merchantServiceClient) ReviewSignUp(ctx context.Context, in *MchReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ReviewSignUp", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ReviewSignUp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -250,7 +295,7 @@ func (c *merchantServiceClient) ReviewSignUp(ctx context.Context, in *MchReviewR func (c *merchantServiceClient) RemoveMerchantSignUp(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/RemoveMerchantSignUp", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_RemoveMerchantSignUp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -259,7 +304,7 @@ func (c *merchantServiceClient) RemoveMerchantSignUp(ctx context.Context, in *Me func (c *merchantServiceClient) GetMerchantIdByMember(ctx context.Context, in *MemberId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByMember", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByMember_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -268,7 +313,7 @@ func (c *merchantServiceClient) GetMerchantIdByMember(ctx context.Context, in *M func (c *merchantServiceClient) ChangeMemberBind(ctx context.Context, in *ChangeMemberBindRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ChangeMemberBind", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ChangeMemberBind_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -277,7 +322,7 @@ func (c *merchantServiceClient) ChangeMemberBind(ctx context.Context, in *Change func (c *merchantServiceClient) GetEnterpriseInfo(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SEnterpriseInfo, error) { out := new(SEnterpriseInfo) - err := c.cc.Invoke(ctx, "/MerchantService/GetEnterpriseInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetEnterpriseInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -286,7 +331,7 @@ func (c *merchantServiceClient) GetEnterpriseInfo(ctx context.Context, in *Merch func (c *merchantServiceClient) SaveEnterpriseInfo(ctx context.Context, in *SaveEnterpriseRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveEnterpriseInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveEnterpriseInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -295,7 +340,7 @@ func (c *merchantServiceClient) SaveEnterpriseInfo(ctx context.Context, in *Save func (c *merchantServiceClient) ReviewEnterpriseInfo(ctx context.Context, in *MchReviewRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ReviewEnterpriseInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ReviewEnterpriseInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -304,7 +349,7 @@ func (c *merchantServiceClient) ReviewEnterpriseInfo(ctx context.Context, in *Mc func (c *merchantServiceClient) GetAccount(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantAccount, error) { out := new(SMerchantAccount) - err := c.cc.Invoke(ctx, "/MerchantService/GetAccount", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetAccount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -313,7 +358,7 @@ func (c *merchantServiceClient) GetAccount(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) SetEnabled(ctx context.Context, in *MerchantDisableRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SetEnabled", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SetEnabled_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -322,7 +367,7 @@ func (c *merchantServiceClient) SetEnabled(ctx context.Context, in *MerchantDisa func (c *merchantServiceClient) GetMerchantIdByHost(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByHost", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByHost_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -331,7 +376,7 @@ func (c *merchantServiceClient) GetMerchantIdByHost(ctx context.Context, in *Str func (c *merchantServiceClient) GetMerchantMajorHost(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantMajorHost", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMerchantMajorHost_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -340,7 +385,7 @@ func (c *merchantServiceClient) GetMerchantMajorHost(ctx context.Context, in *Me func (c *merchantServiceClient) SaveSaleConf(ctx context.Context, in *SaveMerchantSaleConfRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveSaleConf", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveSaleConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -349,7 +394,7 @@ func (c *merchantServiceClient) SaveSaleConf(ctx context.Context, in *SaveMercha func (c *merchantServiceClient) GetSaleConf(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantSaleConf, error) { out := new(SMerchantSaleConf) - err := c.cc.Invoke(ctx, "/MerchantService/GetSaleConf", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetSaleConf_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -358,7 +403,7 @@ func (c *merchantServiceClient) GetSaleConf(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) GetShopId(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetShopId", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetShopId_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -367,7 +412,7 @@ func (c *merchantServiceClient) GetShopId(ctx context.Context, in *MerchantId, o func (c *merchantServiceClient) ChangePassword(ctx context.Context, in *ModifyMerchantPasswordRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ChangePassword", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ChangePassword_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -376,7 +421,7 @@ func (c *merchantServiceClient) ChangePassword(ctx context.Context, in *ModifyMe func (c *merchantServiceClient) GetApiInfo(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*SMerchantApiInfo, error) { out := new(SMerchantApiInfo) - err := c.cc.Invoke(ctx, "/MerchantService/GetApiInfo", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetApiInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -385,7 +430,7 @@ func (c *merchantServiceClient) GetApiInfo(ctx context.Context, in *MerchantId, func (c *merchantServiceClient) ToggleApiPerm(ctx context.Context, in *MerchantApiPermRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ToggleApiPerm", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ToggleApiPerm_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -394,7 +439,7 @@ func (c *merchantServiceClient) ToggleApiPerm(ctx context.Context, in *MerchantA func (c *merchantServiceClient) GetMerchantIdByApiId(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/MerchantService/GetMerchantIdByApiId", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMerchantIdByApiId_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -403,7 +448,7 @@ func (c *merchantServiceClient) GetMerchantIdByApiId(ctx context.Context, in *St func (c *merchantServiceClient) PagedNormalOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/PagedNormalOrderOfVendor", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_PagedNormalOrderOfVendor_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -412,7 +457,7 @@ func (c *merchantServiceClient) PagedNormalOrderOfVendor(ctx context.Context, in func (c *merchantServiceClient) PagedWholesaleOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/PagedWholesaleOrderOfVendor", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_PagedWholesaleOrderOfVendor_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -421,7 +466,7 @@ func (c *merchantServiceClient) PagedWholesaleOrderOfVendor(ctx context.Context, func (c *merchantServiceClient) PagedTradeOrderOfVendor(ctx context.Context, in *MerchantOrderRequest, opts ...grpc.CallOption) (*PagingMerchantOrderListResponse, error) { out := new(PagingMerchantOrderListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/PagedTradeOrderOfVendor", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_PagedTradeOrderOfVendor_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -430,7 +475,7 @@ func (c *merchantServiceClient) PagedTradeOrderOfVendor(ctx context.Context, in func (c *merchantServiceClient) WithdrawToMemberAccount(ctx context.Context, in *WithdrawToMemberAccountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/WithdrawToMemberAccount", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_WithdrawToMemberAccount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -439,7 +484,7 @@ func (c *merchantServiceClient) WithdrawToMemberAccount(ctx context.Context, in func (c *merchantServiceClient) ChargeAccount(ctx context.Context, in *MerchantChargeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/ChargeAccount", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_ChargeAccount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -448,7 +493,7 @@ func (c *merchantServiceClient) ChargeAccount(ctx context.Context, in *MerchantC func (c *merchantServiceClient) GetMchBuyerGroup_(ctx context.Context, in *MerchantBuyerGroupId, opts ...grpc.CallOption) (*SMerchantBuyerGroup, error) { out := new(SMerchantBuyerGroup) - err := c.cc.Invoke(ctx, "/MerchantService/GetMchBuyerGroup_", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetMchBuyerGroup__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -457,7 +502,7 @@ func (c *merchantServiceClient) GetMchBuyerGroup_(ctx context.Context, in *Merch func (c *merchantServiceClient) SaveMchBuyerGroup(ctx context.Context, in *SaveMerchantBuyerGroupRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveMchBuyerGroup", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveMchBuyerGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -466,7 +511,7 @@ func (c *merchantServiceClient) SaveMchBuyerGroup(ctx context.Context, in *SaveM func (c *merchantServiceClient) GetBuyerGroups(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*MerchantBuyerGroupListResponse, error) { out := new(MerchantBuyerGroupListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/GetBuyerGroups", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetBuyerGroups_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -475,7 +520,7 @@ func (c *merchantServiceClient) GetBuyerGroups(ctx context.Context, in *Merchant func (c *merchantServiceClient) GetRebateRate(ctx context.Context, in *MerchantBuyerGroupId, opts ...grpc.CallOption) (*WholesaleRebateRateListResponse, error) { out := new(WholesaleRebateRateListResponse) - err := c.cc.Invoke(ctx, "/MerchantService/GetRebateRate", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_GetRebateRate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -484,7 +529,7 @@ func (c *merchantServiceClient) GetRebateRate(ctx context.Context, in *MerchantB func (c *merchantServiceClient) SaveGroupRebateRate(ctx context.Context, in *SaveWholesaleRebateRateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MerchantService/SaveGroupRebateRate", in, out, opts...) + err := c.cc.Invoke(ctx, MerchantService_SaveGroupRebateRate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -732,7 +777,7 @@ func _MerchantService_GetMerchant_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMerchant", + FullMethod: MerchantService_GetMerchant_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchant(ctx, req.(*Int64)) @@ -750,7 +795,7 @@ func _MerchantService_CreateMerchant_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/CreateMerchant", + FullMethod: MerchantService_CreateMerchant_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CreateMerchant(ctx, req.(*MerchantCreateRequest)) @@ -768,7 +813,7 @@ func _MerchantService_SaveMerchant_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveMerchant", + FullMethod: MerchantService_SaveMerchant_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveMerchant(ctx, req.(*SaveMerchantRequest)) @@ -786,7 +831,7 @@ func _MerchantService_CheckLogin_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/CheckLogin", + FullMethod: MerchantService_CheckLogin_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CheckLogin(ctx, req.(*MchUserPwdRequest)) @@ -804,7 +849,7 @@ func _MerchantService_Stat_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/Stat", + FullMethod: MerchantService_Stat_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).Stat(ctx, req.(*Int64)) @@ -822,7 +867,7 @@ func _MerchantService_SyncWholesaleItem_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SyncWholesaleItem", + FullMethod: MerchantService_SyncWholesaleItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SyncWholesaleItem(ctx, req.(*Int64)) @@ -840,7 +885,7 @@ func _MerchantService_GetAllTradeConf__Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetAllTradeConf_", + FullMethod: MerchantService_GetAllTradeConf__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetAllTradeConf_(ctx, req.(*Int64)) @@ -858,7 +903,7 @@ func _MerchantService_GetTradeConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetTradeConf", + FullMethod: MerchantService_GetTradeConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetTradeConf(ctx, req.(*TradeConfRequest)) @@ -876,7 +921,7 @@ func _MerchantService_SaveTradeConf_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveTradeConf", + FullMethod: MerchantService_SaveTradeConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveTradeConf(ctx, req.(*TradeConfSaveRequest)) @@ -894,7 +939,7 @@ func _MerchantService_CreateSignUpToken_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/CreateSignUpToken", + FullMethod: MerchantService_CreateSignUpToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).CreateSignUpToken(ctx, req.(*MemberId)) @@ -912,7 +957,7 @@ func _MerchantService_GetMemberFromSignUpToken_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMemberFromSignUpToken", + FullMethod: MerchantService_GetMemberFromSignUpToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMemberFromSignUpToken(ctx, req.(*String)) @@ -930,7 +975,7 @@ func _MerchantService_SignUp_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SignUp", + FullMethod: MerchantService_SignUp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SignUp(ctx, req.(*SMchSignUp)) @@ -948,7 +993,7 @@ func _MerchantService_GetMchSignUpId_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMchSignUpId", + FullMethod: MerchantService_GetMchSignUpId_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMchSignUpId(ctx, req.(*MemberId)) @@ -966,7 +1011,7 @@ func _MerchantService_GetSignUp_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetSignUp", + FullMethod: MerchantService_GetSignUp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetSignUp(ctx, req.(*Int64)) @@ -984,7 +1029,7 @@ func _MerchantService_ReviewSignUp_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ReviewSignUp", + FullMethod: MerchantService_ReviewSignUp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ReviewSignUp(ctx, req.(*MchReviewRequest)) @@ -1002,7 +1047,7 @@ func _MerchantService_RemoveMerchantSignUp_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/RemoveMerchantSignUp", + FullMethod: MerchantService_RemoveMerchantSignUp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).RemoveMerchantSignUp(ctx, req.(*MemberId)) @@ -1020,7 +1065,7 @@ func _MerchantService_GetMerchantIdByMember_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMerchantIdByMember", + FullMethod: MerchantService_GetMerchantIdByMember_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByMember(ctx, req.(*MemberId)) @@ -1038,7 +1083,7 @@ func _MerchantService_ChangeMemberBind_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ChangeMemberBind", + FullMethod: MerchantService_ChangeMemberBind_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChangeMemberBind(ctx, req.(*ChangeMemberBindRequest)) @@ -1056,7 +1101,7 @@ func _MerchantService_GetEnterpriseInfo_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetEnterpriseInfo", + FullMethod: MerchantService_GetEnterpriseInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetEnterpriseInfo(ctx, req.(*MerchantId)) @@ -1074,7 +1119,7 @@ func _MerchantService_SaveEnterpriseInfo_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveEnterpriseInfo", + FullMethod: MerchantService_SaveEnterpriseInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveEnterpriseInfo(ctx, req.(*SaveEnterpriseRequest)) @@ -1092,7 +1137,7 @@ func _MerchantService_ReviewEnterpriseInfo_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ReviewEnterpriseInfo", + FullMethod: MerchantService_ReviewEnterpriseInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ReviewEnterpriseInfo(ctx, req.(*MchReviewRequest)) @@ -1110,7 +1155,7 @@ func _MerchantService_GetAccount_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetAccount", + FullMethod: MerchantService_GetAccount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetAccount(ctx, req.(*MerchantId)) @@ -1128,7 +1173,7 @@ func _MerchantService_SetEnabled_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SetEnabled", + FullMethod: MerchantService_SetEnabled_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SetEnabled(ctx, req.(*MerchantDisableRequest)) @@ -1146,7 +1191,7 @@ func _MerchantService_GetMerchantIdByHost_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMerchantIdByHost", + FullMethod: MerchantService_GetMerchantIdByHost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByHost(ctx, req.(*String)) @@ -1164,7 +1209,7 @@ func _MerchantService_GetMerchantMajorHost_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMerchantMajorHost", + FullMethod: MerchantService_GetMerchantMajorHost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantMajorHost(ctx, req.(*MerchantId)) @@ -1182,7 +1227,7 @@ func _MerchantService_SaveSaleConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveSaleConf", + FullMethod: MerchantService_SaveSaleConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveSaleConf(ctx, req.(*SaveMerchantSaleConfRequest)) @@ -1200,7 +1245,7 @@ func _MerchantService_GetSaleConf_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetSaleConf", + FullMethod: MerchantService_GetSaleConf_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetSaleConf(ctx, req.(*MerchantId)) @@ -1218,7 +1263,7 @@ func _MerchantService_GetShopId_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetShopId", + FullMethod: MerchantService_GetShopId_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetShopId(ctx, req.(*MerchantId)) @@ -1236,7 +1281,7 @@ func _MerchantService_ChangePassword_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ChangePassword", + FullMethod: MerchantService_ChangePassword_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChangePassword(ctx, req.(*ModifyMerchantPasswordRequest)) @@ -1254,7 +1299,7 @@ func _MerchantService_GetApiInfo_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetApiInfo", + FullMethod: MerchantService_GetApiInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetApiInfo(ctx, req.(*MerchantId)) @@ -1272,7 +1317,7 @@ func _MerchantService_ToggleApiPerm_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ToggleApiPerm", + FullMethod: MerchantService_ToggleApiPerm_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ToggleApiPerm(ctx, req.(*MerchantApiPermRequest)) @@ -1290,7 +1335,7 @@ func _MerchantService_GetMerchantIdByApiId_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMerchantIdByApiId", + FullMethod: MerchantService_GetMerchantIdByApiId_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMerchantIdByApiId(ctx, req.(*String)) @@ -1308,7 +1353,7 @@ func _MerchantService_PagedNormalOrderOfVendor_Handler(srv interface{}, ctx cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/PagedNormalOrderOfVendor", + FullMethod: MerchantService_PagedNormalOrderOfVendor_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedNormalOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1326,7 +1371,7 @@ func _MerchantService_PagedWholesaleOrderOfVendor_Handler(srv interface{}, ctx c } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/PagedWholesaleOrderOfVendor", + FullMethod: MerchantService_PagedWholesaleOrderOfVendor_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedWholesaleOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1344,7 +1389,7 @@ func _MerchantService_PagedTradeOrderOfVendor_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/PagedTradeOrderOfVendor", + FullMethod: MerchantService_PagedTradeOrderOfVendor_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).PagedTradeOrderOfVendor(ctx, req.(*MerchantOrderRequest)) @@ -1362,7 +1407,7 @@ func _MerchantService_WithdrawToMemberAccount_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/WithdrawToMemberAccount", + FullMethod: MerchantService_WithdrawToMemberAccount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).WithdrawToMemberAccount(ctx, req.(*WithdrawToMemberAccountRequest)) @@ -1380,7 +1425,7 @@ func _MerchantService_ChargeAccount_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/ChargeAccount", + FullMethod: MerchantService_ChargeAccount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).ChargeAccount(ctx, req.(*MerchantChargeRequest)) @@ -1398,7 +1443,7 @@ func _MerchantService_GetMchBuyerGroup__Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetMchBuyerGroup_", + FullMethod: MerchantService_GetMchBuyerGroup__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetMchBuyerGroup_(ctx, req.(*MerchantBuyerGroupId)) @@ -1416,7 +1461,7 @@ func _MerchantService_SaveMchBuyerGroup_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveMchBuyerGroup", + FullMethod: MerchantService_SaveMchBuyerGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveMchBuyerGroup(ctx, req.(*SaveMerchantBuyerGroupRequest)) @@ -1434,7 +1479,7 @@ func _MerchantService_GetBuyerGroups_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetBuyerGroups", + FullMethod: MerchantService_GetBuyerGroups_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetBuyerGroups(ctx, req.(*MerchantId)) @@ -1452,7 +1497,7 @@ func _MerchantService_GetRebateRate_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/GetRebateRate", + FullMethod: MerchantService_GetRebateRate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).GetRebateRate(ctx, req.(*MerchantBuyerGroupId)) @@ -1470,7 +1515,7 @@ func _MerchantService_SaveGroupRebateRate_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MerchantService/SaveGroupRebateRate", + FullMethod: MerchantService_SaveGroupRebateRate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MerchantServiceServer).SaveGroupRebateRate(ctx, req.(*SaveWholesaleRebateRateRequest)) diff --git a/core/service/proto/message_dto.pb.go b/core/service/proto/message_dto.pb.go index 40e8447fc..6fe2da18a 100644 --- a/core/service/proto/message_dto.pb.go +++ b/core/service/proto/message_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/message_dto.proto package proto diff --git a/core/service/proto/message_service.pb.go b/core/service/proto/message_service.pb.go index 0d5be53b7..da5d6cf89 100644 --- a/core/service/proto/message_service.pb.go +++ b/core/service/proto/message_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message_service.proto package proto diff --git a/core/service/proto/message_service_grpc.pb.go b/core/service/proto/message_service_grpc.pb.go index b653e9d8a..b8279eec0 100644 --- a/core/service/proto/message_service_grpc.pb.go +++ b/core/service/proto/message_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: message_service.proto package proto @@ -18,6 +18,18 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + MessageService_GetNotifyItem_FullMethodName = "/MessageService/GetNotifyItem" + MessageService_SendPhoneMessage_FullMethodName = "/MessageService/SendPhoneMessage" + MessageService_GetAllNotifyItem_FullMethodName = "/MessageService/GetAllNotifyItem" + MessageService_SaveNotifyItem_FullMethodName = "/MessageService/SaveNotifyItem" + MessageService_GetMailTemplate_FullMethodName = "/MessageService/GetMailTemplate" + MessageService_SaveMailTemplate_FullMethodName = "/MessageService/SaveMailTemplate" + MessageService_GetMailTemplates_FullMethodName = "/MessageService/GetMailTemplates" + MessageService_DeleteMailTemplate_FullMethodName = "/MessageService/DeleteMailTemplate" + MessageService_SendSiteMessage_FullMethodName = "/MessageService/SendSiteMessage" +) + // MessageServiceClient is the client API for MessageService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -56,7 +68,7 @@ func NewMessageServiceClient(cc grpc.ClientConnInterface) MessageServiceClient { func (c *messageServiceClient) GetNotifyItem(ctx context.Context, in *String, opts ...grpc.CallOption) (*SNotifyItem, error) { out := new(SNotifyItem) - err := c.cc.Invoke(ctx, "/MessageService/GetNotifyItem", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_GetNotifyItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -65,7 +77,7 @@ func (c *messageServiceClient) GetNotifyItem(ctx context.Context, in *String, op func (c *messageServiceClient) SendPhoneMessage(ctx context.Context, in *SendMessageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MessageService/SendPhoneMessage", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_SendPhoneMessage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -74,7 +86,7 @@ func (c *messageServiceClient) SendPhoneMessage(ctx context.Context, in *SendMes func (c *messageServiceClient) GetAllNotifyItem(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*NotifyItemListResponse, error) { out := new(NotifyItemListResponse) - err := c.cc.Invoke(ctx, "/MessageService/GetAllNotifyItem", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_GetAllNotifyItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -83,7 +95,7 @@ func (c *messageServiceClient) GetAllNotifyItem(ctx context.Context, in *Empty, func (c *messageServiceClient) SaveNotifyItem(ctx context.Context, in *SNotifyItem, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MessageService/SaveNotifyItem", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_SaveNotifyItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -92,7 +104,7 @@ func (c *messageServiceClient) SaveNotifyItem(ctx context.Context, in *SNotifyIt func (c *messageServiceClient) GetMailTemplate(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SMailTemplate, error) { out := new(SMailTemplate) - err := c.cc.Invoke(ctx, "/MessageService/GetMailTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_GetMailTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -101,7 +113,7 @@ func (c *messageServiceClient) GetMailTemplate(ctx context.Context, in *Int64, o func (c *messageServiceClient) SaveMailTemplate(ctx context.Context, in *SMailTemplate, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MessageService/SaveMailTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_SaveMailTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -110,7 +122,7 @@ func (c *messageServiceClient) SaveMailTemplate(ctx context.Context, in *SMailTe func (c *messageServiceClient) GetMailTemplates(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*MailTemplateListResponse, error) { out := new(MailTemplateListResponse) - err := c.cc.Invoke(ctx, "/MessageService/GetMailTemplates", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_GetMailTemplates_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -119,7 +131,7 @@ func (c *messageServiceClient) GetMailTemplates(ctx context.Context, in *Empty, func (c *messageServiceClient) DeleteMailTemplate(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MessageService/DeleteMailTemplate", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_DeleteMailTemplate_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -128,7 +140,7 @@ func (c *messageServiceClient) DeleteMailTemplate(ctx context.Context, in *Int64 func (c *messageServiceClient) SendSiteMessage(ctx context.Context, in *SendSiteMessageRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/MessageService/SendSiteMessage", in, out, opts...) + err := c.cc.Invoke(ctx, MessageService_SendSiteMessage_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -218,7 +230,7 @@ func _MessageService_GetNotifyItem_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/GetNotifyItem", + FullMethod: MessageService_GetNotifyItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetNotifyItem(ctx, req.(*String)) @@ -236,7 +248,7 @@ func _MessageService_SendPhoneMessage_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/SendPhoneMessage", + FullMethod: MessageService_SendPhoneMessage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SendPhoneMessage(ctx, req.(*SendMessageRequest)) @@ -254,7 +266,7 @@ func _MessageService_GetAllNotifyItem_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/GetAllNotifyItem", + FullMethod: MessageService_GetAllNotifyItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetAllNotifyItem(ctx, req.(*Empty)) @@ -272,7 +284,7 @@ func _MessageService_SaveNotifyItem_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/SaveNotifyItem", + FullMethod: MessageService_SaveNotifyItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SaveNotifyItem(ctx, req.(*SNotifyItem)) @@ -290,7 +302,7 @@ func _MessageService_GetMailTemplate_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/GetMailTemplate", + FullMethod: MessageService_GetMailTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetMailTemplate(ctx, req.(*Int64)) @@ -308,7 +320,7 @@ func _MessageService_SaveMailTemplate_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/SaveMailTemplate", + FullMethod: MessageService_SaveMailTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SaveMailTemplate(ctx, req.(*SMailTemplate)) @@ -326,7 +338,7 @@ func _MessageService_GetMailTemplates_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/GetMailTemplates", + FullMethod: MessageService_GetMailTemplates_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).GetMailTemplates(ctx, req.(*Empty)) @@ -344,7 +356,7 @@ func _MessageService_DeleteMailTemplate_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/DeleteMailTemplate", + FullMethod: MessageService_DeleteMailTemplate_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).DeleteMailTemplate(ctx, req.(*Int64)) @@ -362,7 +374,7 @@ func _MessageService_SendSiteMessage_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/MessageService/SendSiteMessage", + FullMethod: MessageService_SendSiteMessage_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MessageServiceServer).SendSiteMessage(ctx, req.(*SendSiteMessageRequest)) diff --git a/core/service/proto/order_dto.pb.go b/core/service/proto/order_dto.pb.go index 6850bcbe1..8b6690b72 100644 --- a/core/service/proto/order_dto.pb.go +++ b/core/service/proto/order_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/order_dto.proto package proto @@ -1517,14 +1517,14 @@ type OrderSubmitResponse struct { ErrMsg string `protobuf:"bytes,2,opt,name=errMsg,proto3" json:"errMsg"` // 订单号，多个订单号，用","分割 OrderNo string `protobuf:"bytes,3,opt,name=orderNo,proto3" json:"orderNo"` + // 是否已支付 + IsPayFinish bool `protobuf:"varint,4,opt,name=isPayFinish,proto3" json:"isPayFinish"` // 合并支付 - MergePay bool `protobuf:"varint,4,opt,name=mergePay,proto3" json:"mergePay"` - // 交易号 - TradeNo string `protobuf:"bytes,5,opt,name=tradeNo,proto3" json:"tradeNo"` - // 交易金额 - TradeAmount int64 `protobuf:"varint,6,opt,name=tradeAmount,proto3" json:"tradeAmount"` + IsMergePay bool `protobuf:"varint,5,opt,name=isMergePay,proto3" json:"isMergePay"` // 支付单号 - PaymentOrderNo string `protobuf:"bytes,7,opt,name=paymentOrderNo,proto3" json:"paymentOrderNo"` + PaymentOrderNo string `protobuf:"bytes,6,opt,name=paymentOrderNo,proto3" json:"paymentOrderNo"` + // 交易金额 + TradeAmount int64 `protobuf:"varint,7,opt,name=tradeAmount,proto3" json:"tradeAmount"` } func (x *OrderSubmitResponse) Reset() { @@ -1580,32 +1580,32 @@ func (x *OrderSubmitResponse) GetOrderNo() string { return "" } -func (x *OrderSubmitResponse) GetMergePay() bool { +func (x *OrderSubmitResponse) GetIsPayFinish() bool { if x != nil { - return x.MergePay + return x.IsPayFinish } return false } -func (x *OrderSubmitResponse) GetTradeNo() string { +func (x *OrderSubmitResponse) GetIsMergePay() bool { if x != nil { - return x.TradeNo + return x.IsMergePay } - return "" + return false } -func (x *OrderSubmitResponse) GetTradeAmount() int64 { +func (x *OrderSubmitResponse) GetPaymentOrderNo() string { if x != nil { - return x.TradeAmount + return x.PaymentOrderNo } - return 0 + return "" } -func (x *OrderSubmitResponse) GetPaymentOrderNo() string { +func (x *OrderSubmitResponse) GetTradeAmount() int64 { if x != nil { - return x.PaymentOrderNo + return x.TradeAmount } - return "" + return 0 } // 获取订单请求 @@ -3309,209 +3309,209 @@ var file_message_order_dto_proto_rawDesc = []byte{ 0x0c, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, - 0x6f, 0x64, 0x65, 0x22, 0xe1, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, + 0x6f, 0x64, 0x65, 0x22, 0xed, 0x01, 0x0a, 0x13, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 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, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, - 0x50, 0x61, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x65, 0x72, 0x67, 0x65, - 0x50, 0x61, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x20, 0x0a, - 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, - 0x26, 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, - 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x22, 0x52, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, - 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, - 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, - 0x72, 0x61, 0x74, 0x65, 0x22, 0x49, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, - 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x39, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x50, 0x61, 0x79, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, + 0x50, 0x61, 0x79, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x4d, + 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, + 0x73, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x50, 0x61, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x61, 0x79, + 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x22, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, - 0x75, 0x62, 0x22, 0x21, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, - 0x4f, 0x72, 0x4e, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x02, 0x69, 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, 0x7e, - 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 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, 0x10, - 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, - 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, - 0x01, 0x0a, 0x14, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, - 0x73, 0x75, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x22, 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, - 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, - 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, - 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, - 0x74, 0x69, 0x74, 0x79, 0x22, 0xed, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, - 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, - 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, - 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, - 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, - 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, - 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, - 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, - 0x69, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, - 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, - 0x69, 0x74, 0x65, 0x6d, 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, - 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, - 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, - 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x53, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, - 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, - 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, - 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, - 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, - 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, - 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, - 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, - 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, - 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, - 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, - 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, - 0x0b, 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, - 0x28, 0x12, 0x52, 0x0b, 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, - 0x8e, 0x01, 0x0a, 0x12, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x12, 0x52, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, - 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, - 0x6f, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x22, 0xbb, 0x01, 0x0a, 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x08, 0x73, 0x75, 0x62, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x52, 0x0a, 0x17, + 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x53, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, + 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, + 0x22, 0x49, 0x0a, 0x17, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x07, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x35, 0x0a, 0x07, 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, 0x10, 0x0a, 0x03, + 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x22, 0x21, + 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x22, 0x37, 0x0a, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x4f, 0x72, 0x4e, 0x6f, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 0x7e, 0x0a, 0x12, 0x43, 0x61, + 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 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, 0x10, 0x0a, 0x03, 0x73, 0x75, + 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, 0x24, 0x0a, 0x0d, + 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x42, 0x75, 0x79, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x63, + 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x14, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 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, 0x10, 0x0a, + 0x03, 0x73, 0x75, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x73, 0x75, 0x62, 0x12, + 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x69, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x22, 0x5d, 0x0a, 0x11, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, - 0x6b, 0x75, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, - 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x11, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, - 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, - 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x74, 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x08, 0x74, 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, - 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, - 0x20, 0x0a, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, - 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, - 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, - 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x08, 0x64, 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, - 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, - 0x09, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, - 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, - 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, - 0xa9, 0x02, 0x0a, 0x0c, 0x45, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x12, 0x06, 0x0a, 0x02, 0x5f, 0x33, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, - 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, - 0x01, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, - 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, - 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, - 0x10, 0x03, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, - 0x6e, 0x67, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, - 0x53, 0x74, 0x61, 0x74, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, - 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, - 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, - 0x65, 0x63, 0x6c, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, - 0x74, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, - 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, - 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, - 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, - 0x07, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, - 0x65, 0x64, 0x10, 0x08, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, - 0x73, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, - 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, - 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x75, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, + 0x22, 0xed, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, + 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, + 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1c, + 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, + 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, + 0x0a, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x52, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, + 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, + 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, + 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x73, 0x65, 0x6c, + 0x6c, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x53, 0x50, 0x72, + 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x07, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, + 0x69, 0x67, 0x6e, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x43, + 0x6f, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x6f, + 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, + 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, + 0x73, 0x73, 0x46, 0x65, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, + 0x72, 0x65, 0x73, 0x73, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x61, + 0x67, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x63, + 0x6b, 0x61, 0x67, 0x65, 0x46, 0x65, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, + 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, + 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x0f, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0d, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x75, 0x79, 0x65, 0x72, 0x42, 0x61, + 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0c, 0x62, 0x75, 0x79, + 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x75, 0x79, + 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, + 0x62, 0x75, 0x79, 0x65, 0x72, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x22, 0x8e, 0x01, 0x0a, 0x12, + 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x06, + 0x73, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xbb, 0x01, 0x0a, + 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x74, + 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x12, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, + 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x52, 0x05, 0x73, 0x6b, 0x75, 0x49, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x73, 0x70, 0x65, 0x63, 0x57, 0x6f, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x11, + 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, + 0x2e, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0xd3, 0x02, 0x0a, 0x0b, 0x53, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6c, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, + 0x72, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x66, 0x66, 0x69, 0x6c, + 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x61, 0x66, 0x66, 0x69, 0x6c, 0x69, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, + 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x73, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x0b, 0x53, 0x52, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x65, 0x62, + 0x61, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x69, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x74, 0x65, + 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x74, + 0x65, 0x6d, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, + 0x6d, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x62, 0x61, 0x74, + 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, + 0x65, 0x62, 0x61, 0x74, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x2a, 0xa9, 0x02, 0x0a, 0x0c, + 0x45, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x06, 0x0a, 0x02, + 0x5f, 0x33, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x17, 0x0a, + 0x13, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x72, 0x6d, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, + 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x10, 0x03, 0x12, 0x18, + 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x53, 0x68, + 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x10, 0x0b, 0x12, 0x16, 0x0a, 0x12, 0x53, + 0x74, 0x61, 0x74, 0x41, 0x77, 0x61, 0x69, 0x74, 0x69, 0x6e, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x44, 0x65, 0x63, 0x6c, 0x69, + 0x6e, 0x65, 0x64, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x74, 0x69, + 0x61, 0x6c, 0x6c, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x05, 0x12, 0x0f, 0x0a, + 0x0b, 0x53, 0x74, 0x61, 0x74, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x10, 0x06, 0x12, 0x0d, + 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x10, 0x07, 0x12, 0x11, 0x0a, + 0x0d, 0x53, 0x74, 0x61, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0x08, + 0x12, 0x15, 0x0a, 0x11, 0x53, 0x74, 0x61, 0x74, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x65, 0x64, 0x10, 0x0f, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, + 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/core/service/proto/order_service.pb.go b/core/service/proto/order_service.pb.go index 84256505f..7d97155d2 100644 --- a/core/service/proto/order_service.pb.go +++ b/core/service/proto/order_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: order_service.proto package proto diff --git a/core/service/proto/order_service_grpc.pb.go b/core/service/proto/order_service_grpc.pb.go index 0bb06b95a..264b20ce0 100644 --- a/core/service/proto/order_service_grpc.pb.go +++ b/core/service/proto/order_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: order_service.proto package proto @@ -18,6 +18,25 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + OrderService_SubmitOrder_FullMethodName = "/OrderService/SubmitOrder" + OrderService_PrepareOrder_FullMethodName = "/OrderService/PrepareOrder" + OrderService_GetParentOrder_FullMethodName = "/OrderService/GetParentOrder" + OrderService_GetOrder_FullMethodName = "/OrderService/GetOrder" + OrderService_TradeOrderCashPay_FullMethodName = "/OrderService/TradeOrderCashPay" + OrderService_TradeOrderUpdateTicket_FullMethodName = "/OrderService/TradeOrderUpdateTicket" + OrderService_PrepareOrderWithCoupon__FullMethodName = "/OrderService/PrepareOrderWithCoupon_" + OrderService_CancelOrder_FullMethodName = "/OrderService/CancelOrder" + OrderService_ConfirmOrder_FullMethodName = "/OrderService/ConfirmOrder" + OrderService_ChangeShipmentAddress_FullMethodName = "/OrderService/ChangeShipmentAddress" + OrderService_PickUp_FullMethodName = "/OrderService/PickUp" + OrderService_Ship_FullMethodName = "/OrderService/Ship" + OrderService_BuyerReceived_FullMethodName = "/OrderService/BuyerReceived" + OrderService_Forbid_FullMethodName = "/OrderService/forbid" + OrderService_LogBytes_FullMethodName = "/OrderService/LogBytes" + OrderService_QueryRebateListList_FullMethodName = "/OrderService/QueryRebateListList" +) + // OrderServiceClient is the client API for OrderService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -66,7 +85,7 @@ func NewOrderServiceClient(cc grpc.ClientConnInterface) OrderServiceClient { func (c *orderServiceClient) SubmitOrder(ctx context.Context, in *SubmitOrderRequest, opts ...grpc.CallOption) (*OrderSubmitResponse, error) { out := new(OrderSubmitResponse) - err := c.cc.Invoke(ctx, "/OrderService/SubmitOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_SubmitOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -75,7 +94,7 @@ func (c *orderServiceClient) SubmitOrder(ctx context.Context, in *SubmitOrderReq func (c *orderServiceClient) PrepareOrder(ctx context.Context, in *PrepareOrderRequest, opts ...grpc.CallOption) (*PrepareOrderResponse, error) { out := new(PrepareOrderResponse) - err := c.cc.Invoke(ctx, "/OrderService/PrepareOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_PrepareOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,7 +103,7 @@ func (c *orderServiceClient) PrepareOrder(ctx context.Context, in *PrepareOrderR func (c *orderServiceClient) GetParentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SParentOrder, error) { out := new(SParentOrder) - err := c.cc.Invoke(ctx, "/OrderService/GetParentOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_GetParentOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,7 +112,7 @@ func (c *orderServiceClient) GetParentOrder(ctx context.Context, in *OrderNoV2, func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderRequest, opts ...grpc.CallOption) (*SSingleOrder, error) { out := new(SSingleOrder) - err := c.cc.Invoke(ctx, "/OrderService/GetOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_GetOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -102,7 +121,7 @@ func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderRequest, opt func (c *orderServiceClient) TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/TradeOrderCashPay", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_TradeOrderCashPay_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -111,7 +130,7 @@ func (c *orderServiceClient) TradeOrderCashPay(ctx context.Context, in *Int64, o func (c *orderServiceClient) TradeOrderUpdateTicket(ctx context.Context, in *TradeOrderTicketRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/TradeOrderUpdateTicket", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_TradeOrderUpdateTicket_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -120,7 +139,7 @@ func (c *orderServiceClient) TradeOrderUpdateTicket(ctx context.Context, in *Tra func (c *orderServiceClient) PrepareOrderWithCoupon_(ctx context.Context, in *PrepareOrderRequest, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, "/OrderService/PrepareOrderWithCoupon_", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_PrepareOrderWithCoupon__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -129,7 +148,7 @@ func (c *orderServiceClient) PrepareOrderWithCoupon_(ctx context.Context, in *Pr func (c *orderServiceClient) CancelOrder(ctx context.Context, in *CancelOrderRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/CancelOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_CancelOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -138,7 +157,7 @@ func (c *orderServiceClient) CancelOrder(ctx context.Context, in *CancelOrderReq func (c *orderServiceClient) ConfirmOrder(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/ConfirmOrder", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_ConfirmOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -147,7 +166,7 @@ func (c *orderServiceClient) ConfirmOrder(ctx context.Context, in *OrderNo, opts func (c *orderServiceClient) ChangeShipmentAddress(ctx context.Context, in *ChangeOrderAddressRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/ChangeShipmentAddress", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_ChangeShipmentAddress_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -156,7 +175,7 @@ func (c *orderServiceClient) ChangeShipmentAddress(ctx context.Context, in *Chan func (c *orderServiceClient) PickUp(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/PickUp", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_PickUp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -165,7 +184,7 @@ func (c *orderServiceClient) PickUp(ctx context.Context, in *OrderNo, opts ...gr func (c *orderServiceClient) Ship(ctx context.Context, in *OrderShipmentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/Ship", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_Ship_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -174,7 +193,7 @@ func (c *orderServiceClient) Ship(ctx context.Context, in *OrderShipmentRequest, func (c *orderServiceClient) BuyerReceived(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/BuyerReceived", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_BuyerReceived_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -183,7 +202,7 @@ func (c *orderServiceClient) BuyerReceived(ctx context.Context, in *OrderNo, opt func (c *orderServiceClient) Forbid(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/OrderService/forbid", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_Forbid_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -192,7 +211,7 @@ func (c *orderServiceClient) Forbid(ctx context.Context, in *OrderNo, opts ...gr func (c *orderServiceClient) LogBytes(ctx context.Context, in *OrderNo, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/OrderService/LogBytes", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_LogBytes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -201,7 +220,7 @@ func (c *orderServiceClient) LogBytes(ctx context.Context, in *OrderNo, opts ... func (c *orderServiceClient) QueryRebateListList(ctx context.Context, in *QueryRebateListRequest, opts ...grpc.CallOption) (*QueryRebateListResponse, error) { out := new(QueryRebateListResponse) - err := c.cc.Invoke(ctx, "/OrderService/QueryRebateListList", in, out, opts...) + err := c.cc.Invoke(ctx, OrderService_QueryRebateListList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -322,7 +341,7 @@ func _OrderService_SubmitOrder_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/SubmitOrder", + FullMethod: OrderService_SubmitOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).SubmitOrder(ctx, req.(*SubmitOrderRequest)) @@ -340,7 +359,7 @@ func _OrderService_PrepareOrder_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/PrepareOrder", + FullMethod: OrderService_PrepareOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PrepareOrder(ctx, req.(*PrepareOrderRequest)) @@ -358,7 +377,7 @@ func _OrderService_GetParentOrder_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/GetParentOrder", + FullMethod: OrderService_GetParentOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).GetParentOrder(ctx, req.(*OrderNoV2)) @@ -376,7 +395,7 @@ func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/GetOrder", + FullMethod: OrderService_GetOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).GetOrder(ctx, req.(*OrderRequest)) @@ -394,7 +413,7 @@ func _OrderService_TradeOrderCashPay_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/TradeOrderCashPay", + FullMethod: OrderService_TradeOrderCashPay_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).TradeOrderCashPay(ctx, req.(*Int64)) @@ -412,7 +431,7 @@ func _OrderService_TradeOrderUpdateTicket_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/TradeOrderUpdateTicket", + FullMethod: OrderService_TradeOrderUpdateTicket_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).TradeOrderUpdateTicket(ctx, req.(*TradeOrderTicketRequest)) @@ -430,7 +449,7 @@ func _OrderService_PrepareOrderWithCoupon__Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/PrepareOrderWithCoupon_", + FullMethod: OrderService_PrepareOrderWithCoupon__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PrepareOrderWithCoupon_(ctx, req.(*PrepareOrderRequest)) @@ -448,7 +467,7 @@ func _OrderService_CancelOrder_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/CancelOrder", + FullMethod: OrderService_CancelOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).CancelOrder(ctx, req.(*CancelOrderRequest)) @@ -466,7 +485,7 @@ func _OrderService_ConfirmOrder_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/ConfirmOrder", + FullMethod: OrderService_ConfirmOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).ConfirmOrder(ctx, req.(*OrderNo)) @@ -484,7 +503,7 @@ func _OrderService_ChangeShipmentAddress_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/ChangeShipmentAddress", + FullMethod: OrderService_ChangeShipmentAddress_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).ChangeShipmentAddress(ctx, req.(*ChangeOrderAddressRequest)) @@ -502,7 +521,7 @@ func _OrderService_PickUp_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/PickUp", + FullMethod: OrderService_PickUp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).PickUp(ctx, req.(*OrderNo)) @@ -520,7 +539,7 @@ func _OrderService_Ship_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/Ship", + FullMethod: OrderService_Ship_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).Ship(ctx, req.(*OrderShipmentRequest)) @@ -538,7 +557,7 @@ func _OrderService_BuyerReceived_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/BuyerReceived", + FullMethod: OrderService_BuyerReceived_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).BuyerReceived(ctx, req.(*OrderNo)) @@ -556,7 +575,7 @@ func _OrderService_Forbid_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/forbid", + FullMethod: OrderService_Forbid_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).Forbid(ctx, req.(*OrderNo)) @@ -574,7 +593,7 @@ func _OrderService_LogBytes_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/LogBytes", + FullMethod: OrderService_LogBytes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).LogBytes(ctx, req.(*OrderNo)) @@ -592,7 +611,7 @@ func _OrderService_QueryRebateListList_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OrderService/QueryRebateListList", + FullMethod: OrderService_QueryRebateListList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(OrderServiceServer).QueryRebateListList(ctx, req.(*QueryRebateListRequest)) diff --git a/core/service/proto/payment_dto.pb.go b/core/service/proto/payment_dto.pb.go index f55269c1c..3ffd55ec7 100644 --- a/core/service/proto/payment_dto.pb.go +++ b/core/service/proto/payment_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/payment_dto.proto package proto diff --git a/core/service/proto/payment_service.pb.go b/core/service/proto/payment_service.pb.go index 02134a904..1e2d7d813 100644 --- a/core/service/proto/payment_service.pb.go +++ b/core/service/proto/payment_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: payment_service.proto package proto diff --git a/core/service/proto/payment_service_grpc.pb.go b/core/service/proto/payment_service_grpc.pb.go index 196c70106..8dd13c82f 100644 --- a/core/service/proto/payment_service_grpc.pb.go +++ b/core/service/proto/payment_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: payment_service.proto package proto @@ -18,6 +18,25 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + PaymentService_SubmitPaymentOrder_FullMethodName = "/PaymentService/SubmitPaymentOrder" + PaymentService_GetPaymentOrder_FullMethodName = "/PaymentService/GetPaymentOrder" + PaymentService_AdjustOrder_FullMethodName = "/PaymentService/AdjustOrder" + PaymentService_DiscountByBalance_FullMethodName = "/PaymentService/DiscountByBalance" + PaymentService_DiscountByIntegral_FullMethodName = "/PaymentService/DiscountByIntegral" + PaymentService_PaymentByWallet_FullMethodName = "/PaymentService/PaymentByWallet" + PaymentService_HybridPayment_FullMethodName = "/PaymentService/HybridPayment" + PaymentService_FinishPayment_FullMethodName = "/PaymentService/FinishPayment" + PaymentService_GatewayV1_FullMethodName = "/PaymentService/GatewayV1" + PaymentService_GetPreparePaymentInfo_FullMethodName = "/PaymentService/GetPreparePaymentInfo" + PaymentService_GatewayV2_FullMethodName = "/PaymentService/GatewayV2" + PaymentService_MixedPayment_FullMethodName = "/PaymentService/MixedPayment" + PaymentService_SaveIntegrateApp_FullMethodName = "/PaymentService/SaveIntegrateApp" + PaymentService_QueryIntegrateAppList_FullMethodName = "/PaymentService/QueryIntegrateAppList" + PaymentService_PrepareIntegrateParams_FullMethodName = "/PaymentService/PrepareIntegrateParams" + PaymentService_DeleteIntegrateApp_FullMethodName = "/PaymentService/DeleteIntegrateApp" +) + // PaymentServiceClient is the client API for PaymentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -72,7 +91,7 @@ func NewPaymentServiceClient(cc grpc.ClientConnInterface) PaymentServiceClient { func (c *paymentServiceClient) SubmitPaymentOrder(ctx context.Context, in *SPaymentOrder, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/SubmitPaymentOrder", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_SubmitPaymentOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -81,7 +100,7 @@ func (c *paymentServiceClient) SubmitPaymentOrder(ctx context.Context, in *SPaym func (c *paymentServiceClient) GetPaymentOrder(ctx context.Context, in *PaymentOrderRequest, opts ...grpc.CallOption) (*SPaymentOrder, error) { out := new(SPaymentOrder) - err := c.cc.Invoke(ctx, "/PaymentService/GetPaymentOrder", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_GetPaymentOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -90,7 +109,7 @@ func (c *paymentServiceClient) GetPaymentOrder(ctx context.Context, in *PaymentO func (c *paymentServiceClient) AdjustOrder(ctx context.Context, in *AdjustOrderRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/AdjustOrder", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_AdjustOrder_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -99,7 +118,7 @@ func (c *paymentServiceClient) AdjustOrder(ctx context.Context, in *AdjustOrderR func (c *paymentServiceClient) DiscountByBalance(ctx context.Context, in *DiscountBalanceRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/DiscountByBalance", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_DiscountByBalance_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -108,7 +127,7 @@ func (c *paymentServiceClient) DiscountByBalance(ctx context.Context, in *Discou func (c *paymentServiceClient) DiscountByIntegral(ctx context.Context, in *DiscountIntegralRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/DiscountByIntegral", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_DiscountByIntegral_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -117,7 +136,7 @@ func (c *paymentServiceClient) DiscountByIntegral(ctx context.Context, in *Disco func (c *paymentServiceClient) PaymentByWallet(ctx context.Context, in *WalletPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/PaymentByWallet", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_PaymentByWallet_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -126,7 +145,7 @@ func (c *paymentServiceClient) PaymentByWallet(ctx context.Context, in *WalletPa func (c *paymentServiceClient) HybridPayment(ctx context.Context, in *HyperPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/HybridPayment", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_HybridPayment_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -135,7 +154,7 @@ func (c *paymentServiceClient) HybridPayment(ctx context.Context, in *HyperPayme func (c *paymentServiceClient) FinishPayment(ctx context.Context, in *FinishPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/FinishPayment", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_FinishPayment_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -144,7 +163,7 @@ func (c *paymentServiceClient) FinishPayment(ctx context.Context, in *FinishPaym func (c *paymentServiceClient) GatewayV1(ctx context.Context, in *PayGatewayRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/GatewayV1", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_GatewayV1_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -153,7 +172,7 @@ func (c *paymentServiceClient) GatewayV1(ctx context.Context, in *PayGatewayRequ func (c *paymentServiceClient) GetPreparePaymentInfo(ctx context.Context, in *OrderInfoRequest, opts ...grpc.CallOption) (*SPrepareTradeData, error) { out := new(SPrepareTradeData) - err := c.cc.Invoke(ctx, "/PaymentService/GetPreparePaymentInfo", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_GetPreparePaymentInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -162,7 +181,7 @@ func (c *paymentServiceClient) GetPreparePaymentInfo(ctx context.Context, in *Or func (c *paymentServiceClient) GatewayV2(ctx context.Context, in *PayGatewayV2Request, opts ...grpc.CallOption) (*PayGatewayResponse, error) { out := new(PayGatewayResponse) - err := c.cc.Invoke(ctx, "/PaymentService/GatewayV2", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_GatewayV2_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -171,7 +190,7 @@ func (c *paymentServiceClient) GatewayV2(ctx context.Context, in *PayGatewayV2Re func (c *paymentServiceClient) MixedPayment(ctx context.Context, in *MixedPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/MixedPayment", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_MixedPayment_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -180,7 +199,7 @@ func (c *paymentServiceClient) MixedPayment(ctx context.Context, in *MixedPaymen func (c *paymentServiceClient) SaveIntegrateApp(ctx context.Context, in *SIntegrateApp, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/SaveIntegrateApp", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_SaveIntegrateApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -189,7 +208,7 @@ func (c *paymentServiceClient) SaveIntegrateApp(ctx context.Context, in *SIntegr func (c *paymentServiceClient) QueryIntegrateAppList(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*QueryIntegrateAppResponse, error) { out := new(QueryIntegrateAppResponse) - err := c.cc.Invoke(ctx, "/PaymentService/QueryIntegrateAppList", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_QueryIntegrateAppList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -198,7 +217,7 @@ func (c *paymentServiceClient) QueryIntegrateAppList(ctx context.Context, in *Em func (c *paymentServiceClient) PrepareIntegrateParams(ctx context.Context, in *IntegrateParamsRequest, opts ...grpc.CallOption) (*IntegrateParamsResponse, error) { out := new(IntegrateParamsResponse) - err := c.cc.Invoke(ctx, "/PaymentService/PrepareIntegrateParams", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_PrepareIntegrateParams_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -207,7 +226,7 @@ func (c *paymentServiceClient) PrepareIntegrateParams(ctx context.Context, in *I func (c *paymentServiceClient) DeleteIntegrateApp(ctx context.Context, in *PayIntegrateAppId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PaymentService/DeleteIntegrateApp", in, out, opts...) + err := c.cc.Invoke(ctx, PaymentService_DeleteIntegrateApp_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -334,7 +353,7 @@ func _PaymentService_SubmitPaymentOrder_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/SubmitPaymentOrder", + FullMethod: PaymentService_SubmitPaymentOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).SubmitPaymentOrder(ctx, req.(*SPaymentOrder)) @@ -352,7 +371,7 @@ func _PaymentService_GetPaymentOrder_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/GetPaymentOrder", + FullMethod: PaymentService_GetPaymentOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GetPaymentOrder(ctx, req.(*PaymentOrderRequest)) @@ -370,7 +389,7 @@ func _PaymentService_AdjustOrder_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/AdjustOrder", + FullMethod: PaymentService_AdjustOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).AdjustOrder(ctx, req.(*AdjustOrderRequest)) @@ -388,7 +407,7 @@ func _PaymentService_DiscountByBalance_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/DiscountByBalance", + FullMethod: PaymentService_DiscountByBalance_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DiscountByBalance(ctx, req.(*DiscountBalanceRequest)) @@ -406,7 +425,7 @@ func _PaymentService_DiscountByIntegral_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/DiscountByIntegral", + FullMethod: PaymentService_DiscountByIntegral_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DiscountByIntegral(ctx, req.(*DiscountIntegralRequest)) @@ -424,7 +443,7 @@ func _PaymentService_PaymentByWallet_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/PaymentByWallet", + FullMethod: PaymentService_PaymentByWallet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).PaymentByWallet(ctx, req.(*WalletPaymentRequest)) @@ -442,7 +461,7 @@ func _PaymentService_HybridPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/HybridPayment", + FullMethod: PaymentService_HybridPayment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).HybridPayment(ctx, req.(*HyperPaymentRequest)) @@ -460,7 +479,7 @@ func _PaymentService_FinishPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/FinishPayment", + FullMethod: PaymentService_FinishPayment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).FinishPayment(ctx, req.(*FinishPaymentRequest)) @@ -478,7 +497,7 @@ func _PaymentService_GatewayV1_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/GatewayV1", + FullMethod: PaymentService_GatewayV1_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GatewayV1(ctx, req.(*PayGatewayRequest)) @@ -496,7 +515,7 @@ func _PaymentService_GetPreparePaymentInfo_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/GetPreparePaymentInfo", + FullMethod: PaymentService_GetPreparePaymentInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GetPreparePaymentInfo(ctx, req.(*OrderInfoRequest)) @@ -514,7 +533,7 @@ func _PaymentService_GatewayV2_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/GatewayV2", + FullMethod: PaymentService_GatewayV2_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).GatewayV2(ctx, req.(*PayGatewayV2Request)) @@ -532,7 +551,7 @@ func _PaymentService_MixedPayment_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/MixedPayment", + FullMethod: PaymentService_MixedPayment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).MixedPayment(ctx, req.(*MixedPaymentRequest)) @@ -550,7 +569,7 @@ func _PaymentService_SaveIntegrateApp_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/SaveIntegrateApp", + FullMethod: PaymentService_SaveIntegrateApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).SaveIntegrateApp(ctx, req.(*SIntegrateApp)) @@ -568,7 +587,7 @@ func _PaymentService_QueryIntegrateAppList_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/QueryIntegrateAppList", + FullMethod: PaymentService_QueryIntegrateAppList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).QueryIntegrateAppList(ctx, req.(*Empty)) @@ -586,7 +605,7 @@ func _PaymentService_PrepareIntegrateParams_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/PrepareIntegrateParams", + FullMethod: PaymentService_PrepareIntegrateParams_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).PrepareIntegrateParams(ctx, req.(*IntegrateParamsRequest)) @@ -604,7 +623,7 @@ func _PaymentService_DeleteIntegrateApp_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PaymentService/DeleteIntegrateApp", + FullMethod: PaymentService_DeleteIntegrateApp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PaymentServiceServer).DeleteIntegrateApp(ctx, req.(*PayIntegrateAppId)) diff --git a/core/service/proto/portal_service.pb.go b/core/service/proto/portal_service.pb.go index 98cb78b03..5333c5927 100644 --- a/core/service/proto/portal_service.pb.go +++ b/core/service/proto/portal_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: portal_service.proto package proto diff --git a/core/service/proto/portal_service_grpc.pb.go b/core/service/proto/portal_service_grpc.pb.go index 490c12d38..92ccebaf7 100644 --- a/core/service/proto/portal_service_grpc.pb.go +++ b/core/service/proto/portal_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: portal_service.proto package proto @@ -18,6 +18,20 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + PortalService_SaveNav_FullMethodName = "/PortalService/SaveNav" + PortalService_GetNav_FullMethodName = "/PortalService/GetNav" + PortalService_QueryNavList_FullMethodName = "/PortalService/QueryNavList" + PortalService_DeleteNav_FullMethodName = "/PortalService/DeleteNav" + PortalService_SaveNavGroup_FullMethodName = "/PortalService/SaveNavGroup" + PortalService_QueryNavGroupList_FullMethodName = "/PortalService/QueryNavGroupList" + PortalService_DeleteNavGroup_FullMethodName = "/PortalService/DeleteNavGroup" + PortalService_SaveSearchWord_FullMethodName = "/PortalService/SaveSearchWord" + PortalService_GetSearchWord_FullMethodName = "/PortalService/GetSearchWord" + PortalService_QuerySearchWordList_FullMethodName = "/PortalService/QuerySearchWordList" + PortalService_DeleteSearchWord_FullMethodName = "/PortalService/DeleteSearchWord" +) + // PortalServiceClient is the client API for PortalService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -56,7 +70,7 @@ func NewPortalServiceClient(cc grpc.ClientConnInterface) PortalServiceClient { func (c *portalServiceClient) SaveNav(ctx context.Context, in *SaveNavRequest, opts ...grpc.CallOption) (*SaveNavResponse, error) { out := new(SaveNavResponse) - err := c.cc.Invoke(ctx, "/PortalService/SaveNav", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_SaveNav_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -65,7 +79,7 @@ func (c *portalServiceClient) SaveNav(ctx context.Context, in *SaveNavRequest, o func (c *portalServiceClient) GetNav(ctx context.Context, in *PortalNavId, opts ...grpc.CallOption) (*SNav, error) { out := new(SNav) - err := c.cc.Invoke(ctx, "/PortalService/GetNav", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_GetNav_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -74,7 +88,7 @@ func (c *portalServiceClient) GetNav(ctx context.Context, in *PortalNavId, opts func (c *portalServiceClient) QueryNavList(ctx context.Context, in *QueryNavRequest, opts ...grpc.CallOption) (*QueryNavResponse, error) { out := new(QueryNavResponse) - err := c.cc.Invoke(ctx, "/PortalService/QueryNavList", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_QueryNavList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -83,7 +97,7 @@ func (c *portalServiceClient) QueryNavList(ctx context.Context, in *QueryNavRequ func (c *portalServiceClient) DeleteNav(ctx context.Context, in *PortalNavId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PortalService/DeleteNav", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_DeleteNav_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -92,7 +106,7 @@ func (c *portalServiceClient) DeleteNav(ctx context.Context, in *PortalNavId, op func (c *portalServiceClient) SaveNavGroup(ctx context.Context, in *SaveNavGroupRequest, opts ...grpc.CallOption) (*SaveNavGroupResponse, error) { out := new(SaveNavGroupResponse) - err := c.cc.Invoke(ctx, "/PortalService/SaveNavGroup", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_SaveNavGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -101,7 +115,7 @@ func (c *portalServiceClient) SaveNavGroup(ctx context.Context, in *SaveNavGroup func (c *portalServiceClient) QueryNavGroupList(ctx context.Context, in *QueryNavGroupRequest, opts ...grpc.CallOption) (*QueryNavGroupResponse, error) { out := new(QueryNavGroupResponse) - err := c.cc.Invoke(ctx, "/PortalService/QueryNavGroupList", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_QueryNavGroupList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -110,7 +124,7 @@ func (c *portalServiceClient) QueryNavGroupList(ctx context.Context, in *QueryNa func (c *portalServiceClient) DeleteNavGroup(ctx context.Context, in *PortalNavGroupId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PortalService/DeleteNavGroup", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_DeleteNavGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -119,7 +133,7 @@ func (c *portalServiceClient) DeleteNavGroup(ctx context.Context, in *PortalNavG func (c *portalServiceClient) SaveSearchWord(ctx context.Context, in *SaveSearchWordRequest, opts ...grpc.CallOption) (*SaveSearchWordResponse, error) { out := new(SaveSearchWordResponse) - err := c.cc.Invoke(ctx, "/PortalService/SaveSearchWord", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_SaveSearchWord_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -128,7 +142,7 @@ func (c *portalServiceClient) SaveSearchWord(ctx context.Context, in *SaveSearch func (c *portalServiceClient) GetSearchWord(ctx context.Context, in *SysSearchWordId, opts ...grpc.CallOption) (*SSearchWord, error) { out := new(SSearchWord) - err := c.cc.Invoke(ctx, "/PortalService/GetSearchWord", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_GetSearchWord_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -137,7 +151,7 @@ func (c *portalServiceClient) GetSearchWord(ctx context.Context, in *SysSearchWo func (c *portalServiceClient) QuerySearchWordList(ctx context.Context, in *QuerySearchWordRequest, opts ...grpc.CallOption) (*QuerySearchWordResponse, error) { out := new(QuerySearchWordResponse) - err := c.cc.Invoke(ctx, "/PortalService/QuerySearchWordList", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_QuerySearchWordList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -146,7 +160,7 @@ func (c *portalServiceClient) QuerySearchWordList(ctx context.Context, in *Query func (c *portalServiceClient) DeleteSearchWord(ctx context.Context, in *SysSearchWordId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/PortalService/DeleteSearchWord", in, out, opts...) + err := c.cc.Invoke(ctx, PortalService_DeleteSearchWord_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -242,7 +256,7 @@ func _PortalService_SaveNav_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/SaveNav", + FullMethod: PortalService_SaveNav_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveNav(ctx, req.(*SaveNavRequest)) @@ -260,7 +274,7 @@ func _PortalService_GetNav_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/GetNav", + FullMethod: PortalService_GetNav_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).GetNav(ctx, req.(*PortalNavId)) @@ -278,7 +292,7 @@ func _PortalService_QueryNavList_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/QueryNavList", + FullMethod: PortalService_QueryNavList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QueryNavList(ctx, req.(*QueryNavRequest)) @@ -296,7 +310,7 @@ func _PortalService_DeleteNav_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/DeleteNav", + FullMethod: PortalService_DeleteNav_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteNav(ctx, req.(*PortalNavId)) @@ -314,7 +328,7 @@ func _PortalService_SaveNavGroup_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/SaveNavGroup", + FullMethod: PortalService_SaveNavGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveNavGroup(ctx, req.(*SaveNavGroupRequest)) @@ -332,7 +346,7 @@ func _PortalService_QueryNavGroupList_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/QueryNavGroupList", + FullMethod: PortalService_QueryNavGroupList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QueryNavGroupList(ctx, req.(*QueryNavGroupRequest)) @@ -350,7 +364,7 @@ func _PortalService_DeleteNavGroup_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/DeleteNavGroup", + FullMethod: PortalService_DeleteNavGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteNavGroup(ctx, req.(*PortalNavGroupId)) @@ -368,7 +382,7 @@ func _PortalService_SaveSearchWord_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/SaveSearchWord", + FullMethod: PortalService_SaveSearchWord_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).SaveSearchWord(ctx, req.(*SaveSearchWordRequest)) @@ -386,7 +400,7 @@ func _PortalService_GetSearchWord_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/GetSearchWord", + FullMethod: PortalService_GetSearchWord_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).GetSearchWord(ctx, req.(*SysSearchWordId)) @@ -404,7 +418,7 @@ func _PortalService_QuerySearchWordList_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/QuerySearchWordList", + FullMethod: PortalService_QuerySearchWordList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).QuerySearchWordList(ctx, req.(*QuerySearchWordRequest)) @@ -422,7 +436,7 @@ func _PortalService_DeleteSearchWord_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/PortalService/DeleteSearchWord", + FullMethod: PortalService_DeleteSearchWord_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(PortalServiceServer).DeleteSearchWord(ctx, req.(*SysSearchWordId)) diff --git a/core/service/proto/product_service.pb.go b/core/service/proto/product_service.pb.go index c5c84b125..64146241d 100644 --- a/core/service/proto/product_service.pb.go +++ b/core/service/proto/product_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: product_service.proto package proto diff --git a/core/service/proto/product_service_grpc.pb.go b/core/service/proto/product_service_grpc.pb.go index 63f829660..b29cf6e7b 100644 --- a/core/service/proto/product_service_grpc.pb.go +++ b/core/service/proto/product_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: product_service.proto package proto @@ -18,6 +18,28 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ProductService_GetProductModel_FullMethodName = "/ProductService/GetProductModel" + ProductService_GetModels_FullMethodName = "/ProductService/GetModels" + ProductService_GetAttr_FullMethodName = "/ProductService/GetAttr" + ProductService_GetAttrItem_FullMethodName = "/ProductService/GetAttrItem" + ProductService_SaveProductModel_FullMethodName = "/ProductService/SaveProductModel" + ProductService_DeleteModel__FullMethodName = "/ProductService/DeleteModel_" + ProductService_GetBrand_FullMethodName = "/ProductService/GetBrand" + ProductService_SaveBrand_FullMethodName = "/ProductService/SaveBrand" + ProductService_DeleteBrand_FullMethodName = "/ProductService/DeleteBrand" + ProductService_GetBrands_FullMethodName = "/ProductService/GetBrands" + ProductService_GetCategory_FullMethodName = "/ProductService/GetCategory" + ProductService_DeleteCategory_FullMethodName = "/ProductService/DeleteCategory" + ProductService_SaveCategory_FullMethodName = "/ProductService/SaveCategory" + ProductService_GetCategoryTreeNode_FullMethodName = "/ProductService/GetCategoryTreeNode" + ProductService_FindParentCategory_FullMethodName = "/ProductService/FindParentCategory" + ProductService_GetProduct_FullMethodName = "/ProductService/GetProduct" + ProductService_SaveProduct_FullMethodName = "/ProductService/SaveProduct" + ProductService_DeleteProduct_FullMethodName = "/ProductService/DeleteProduct" + ProductService_SaveProductInfo_FullMethodName = "/ProductService/SaveProductInfo" +) + // ProductServiceClient is the client API for ProductService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -74,7 +96,7 @@ func NewProductServiceClient(cc grpc.ClientConnInterface) ProductServiceClient { func (c *productServiceClient) GetProductModel(ctx context.Context, in *ProductModelId, opts ...grpc.CallOption) (*SProductModel, error) { out := new(SProductModel) - err := c.cc.Invoke(ctx, "/ProductService/GetProductModel", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetProductModel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -83,7 +105,7 @@ func (c *productServiceClient) GetProductModel(ctx context.Context, in *ProductM func (c *productServiceClient) GetModels(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ProductModelListResponse, error) { out := new(ProductModelListResponse) - err := c.cc.Invoke(ctx, "/ProductService/GetModels", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetModels_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -92,7 +114,7 @@ func (c *productServiceClient) GetModels(ctx context.Context, in *Empty, opts .. func (c *productServiceClient) GetAttr(ctx context.Context, in *ProductAttrId, opts ...grpc.CallOption) (*SProductAttr, error) { out := new(SProductAttr) - err := c.cc.Invoke(ctx, "/ProductService/GetAttr", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetAttr_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -101,7 +123,7 @@ func (c *productServiceClient) GetAttr(ctx context.Context, in *ProductAttrId, o func (c *productServiceClient) GetAttrItem(ctx context.Context, in *ProductAttrItemId, opts ...grpc.CallOption) (*SProductAttrItem, error) { out := new(SProductAttrItem) - err := c.cc.Invoke(ctx, "/ProductService/GetAttrItem", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetAttrItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -110,7 +132,7 @@ func (c *productServiceClient) GetAttrItem(ctx context.Context, in *ProductAttrI func (c *productServiceClient) SaveProductModel(ctx context.Context, in *SaveProductModelRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/SaveProductModel", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_SaveProductModel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -119,7 +141,7 @@ func (c *productServiceClient) SaveProductModel(ctx context.Context, in *SavePro func (c *productServiceClient) DeleteModel_(ctx context.Context, in *ProductModelId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/DeleteModel_", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_DeleteModel__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -128,7 +150,7 @@ func (c *productServiceClient) DeleteModel_(ctx context.Context, in *ProductMode func (c *productServiceClient) GetBrand(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SProductBrand, error) { out := new(SProductBrand) - err := c.cc.Invoke(ctx, "/ProductService/GetBrand", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetBrand_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -137,7 +159,7 @@ func (c *productServiceClient) GetBrand(ctx context.Context, in *Int64, opts ... func (c *productServiceClient) SaveBrand(ctx context.Context, in *SProductBrand, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/SaveBrand", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_SaveBrand_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -146,7 +168,7 @@ func (c *productServiceClient) SaveBrand(ctx context.Context, in *SProductBrand, func (c *productServiceClient) DeleteBrand(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/DeleteBrand", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_DeleteBrand_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -155,7 +177,7 @@ func (c *productServiceClient) DeleteBrand(ctx context.Context, in *Int64, opts func (c *productServiceClient) GetBrands(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ProductBrandListResponse, error) { out := new(ProductBrandListResponse) - err := c.cc.Invoke(ctx, "/ProductService/GetBrands", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetBrands_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -164,7 +186,7 @@ func (c *productServiceClient) GetBrands(ctx context.Context, in *Empty, opts .. func (c *productServiceClient) GetCategory(ctx context.Context, in *GetCategoryRequest, opts ...grpc.CallOption) (*SProductCategory, error) { out := new(SProductCategory) - err := c.cc.Invoke(ctx, "/ProductService/GetCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -173,7 +195,7 @@ func (c *productServiceClient) GetCategory(ctx context.Context, in *GetCategoryR func (c *productServiceClient) DeleteCategory(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/DeleteCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_DeleteCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -182,7 +204,7 @@ func (c *productServiceClient) DeleteCategory(ctx context.Context, in *Int64, op func (c *productServiceClient) SaveCategory(ctx context.Context, in *SaveProductCategoryRequest, opts ...grpc.CallOption) (*SaveProductCategoryResponse, error) { out := new(SaveProductCategoryResponse) - err := c.cc.Invoke(ctx, "/ProductService/SaveCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_SaveCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -191,7 +213,7 @@ func (c *productServiceClient) SaveCategory(ctx context.Context, in *SaveProduct func (c *productServiceClient) GetCategoryTreeNode(ctx context.Context, in *CategoryTreeRequest, opts ...grpc.CallOption) (*CategoryTreeResponse, error) { out := new(CategoryTreeResponse) - err := c.cc.Invoke(ctx, "/ProductService/GetCategoryTreeNode", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetCategoryTreeNode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -200,7 +222,7 @@ func (c *productServiceClient) GetCategoryTreeNode(ctx context.Context, in *Cate func (c *productServiceClient) FindParentCategory(ctx context.Context, in *CategoryIdRequest, opts ...grpc.CallOption) (*CategoriesResponse, error) { out := new(CategoriesResponse) - err := c.cc.Invoke(ctx, "/ProductService/FindParentCategory", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_FindParentCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -209,7 +231,7 @@ func (c *productServiceClient) FindParentCategory(ctx context.Context, in *Categ func (c *productServiceClient) GetProduct(ctx context.Context, in *ProductId, opts ...grpc.CallOption) (*SProduct, error) { out := new(SProduct) - err := c.cc.Invoke(ctx, "/ProductService/GetProduct", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_GetProduct_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -218,7 +240,7 @@ func (c *productServiceClient) GetProduct(ctx context.Context, in *ProductId, op func (c *productServiceClient) SaveProduct(ctx context.Context, in *SaveProductRequest, opts ...grpc.CallOption) (*SaveProductResponse, error) { out := new(SaveProductResponse) - err := c.cc.Invoke(ctx, "/ProductService/SaveProduct", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_SaveProduct_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -227,7 +249,7 @@ func (c *productServiceClient) SaveProduct(ctx context.Context, in *SaveProductR func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/DeleteProduct", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_DeleteProduct_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -236,7 +258,7 @@ func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProd func (c *productServiceClient) SaveProductInfo(ctx context.Context, in *ProductInfoRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ProductService/SaveProductInfo", in, out, opts...) + err := c.cc.Invoke(ctx, ProductService_SaveProductInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -374,7 +396,7 @@ func _ProductService_GetProductModel_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetProductModel", + FullMethod: ProductService_GetProductModel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetProductModel(ctx, req.(*ProductModelId)) @@ -392,7 +414,7 @@ func _ProductService_GetModels_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetModels", + FullMethod: ProductService_GetModels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetModels(ctx, req.(*Empty)) @@ -410,7 +432,7 @@ func _ProductService_GetAttr_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetAttr", + FullMethod: ProductService_GetAttr_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetAttr(ctx, req.(*ProductAttrId)) @@ -428,7 +450,7 @@ func _ProductService_GetAttrItem_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetAttrItem", + FullMethod: ProductService_GetAttrItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetAttrItem(ctx, req.(*ProductAttrItemId)) @@ -446,7 +468,7 @@ func _ProductService_SaveProductModel_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/SaveProductModel", + FullMethod: ProductService_SaveProductModel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProductModel(ctx, req.(*SaveProductModelRequest)) @@ -464,7 +486,7 @@ func _ProductService_DeleteModel__Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/DeleteModel_", + FullMethod: ProductService_DeleteModel__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteModel_(ctx, req.(*ProductModelId)) @@ -482,7 +504,7 @@ func _ProductService_GetBrand_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetBrand", + FullMethod: ProductService_GetBrand_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetBrand(ctx, req.(*Int64)) @@ -500,7 +522,7 @@ func _ProductService_SaveBrand_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/SaveBrand", + FullMethod: ProductService_SaveBrand_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveBrand(ctx, req.(*SProductBrand)) @@ -518,7 +540,7 @@ func _ProductService_DeleteBrand_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/DeleteBrand", + FullMethod: ProductService_DeleteBrand_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteBrand(ctx, req.(*Int64)) @@ -536,7 +558,7 @@ func _ProductService_GetBrands_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetBrands", + FullMethod: ProductService_GetBrands_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetBrands(ctx, req.(*Empty)) @@ -554,7 +576,7 @@ func _ProductService_GetCategory_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetCategory", + FullMethod: ProductService_GetCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetCategory(ctx, req.(*GetCategoryRequest)) @@ -572,7 +594,7 @@ func _ProductService_DeleteCategory_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/DeleteCategory", + FullMethod: ProductService_DeleteCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteCategory(ctx, req.(*Int64)) @@ -590,7 +612,7 @@ func _ProductService_SaveCategory_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/SaveCategory", + FullMethod: ProductService_SaveCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveCategory(ctx, req.(*SaveProductCategoryRequest)) @@ -608,7 +630,7 @@ func _ProductService_GetCategoryTreeNode_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetCategoryTreeNode", + FullMethod: ProductService_GetCategoryTreeNode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetCategoryTreeNode(ctx, req.(*CategoryTreeRequest)) @@ -626,7 +648,7 @@ func _ProductService_FindParentCategory_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/FindParentCategory", + FullMethod: ProductService_FindParentCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).FindParentCategory(ctx, req.(*CategoryIdRequest)) @@ -644,7 +666,7 @@ func _ProductService_GetProduct_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/GetProduct", + FullMethod: ProductService_GetProduct_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).GetProduct(ctx, req.(*ProductId)) @@ -662,7 +684,7 @@ func _ProductService_SaveProduct_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/SaveProduct", + FullMethod: ProductService_SaveProduct_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProduct(ctx, req.(*SaveProductRequest)) @@ -680,7 +702,7 @@ func _ProductService_DeleteProduct_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/DeleteProduct", + FullMethod: ProductService_DeleteProduct_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).DeleteProduct(ctx, req.(*DeleteProductRequest)) @@ -698,7 +720,7 @@ func _ProductService_SaveProductInfo_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ProductService/SaveProductInfo", + FullMethod: ProductService_SaveProductInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ProductServiceServer).SaveProductInfo(ctx, req.(*ProductInfoRequest)) diff --git a/core/service/proto/query_dto.pb.go b/core/service/proto/query_dto.pb.go index 7275cde15..05c09d49b 100644 --- a/core/service/proto/query_dto.pb.go +++ b/core/service/proto/query_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/query_dto.proto package proto diff --git a/core/service/proto/query_service.pb.go b/core/service/proto/query_service.pb.go index 96d73e3e6..0e421b1cd 100644 --- a/core/service/proto/query_service.pb.go +++ b/core/service/proto/query_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: query_service.proto package proto diff --git a/core/service/proto/query_service_grpc.pb.go b/core/service/proto/query_service_grpc.pb.go index 55b340556..48e309096 100644 --- a/core/service/proto/query_service_grpc.pb.go +++ b/core/service/proto/query_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: query_service.proto package proto @@ -18,6 +18,23 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + QueryService_SummaryStatistics_FullMethodName = "/QueryService/SummaryStatistics" + QueryService_MemberStatistics_FullMethodName = "/QueryService/MemberStatistics" + QueryService_PagingShops_FullMethodName = "/QueryService/PagingShops" + QueryService_MemberNormalOrders_FullMethodName = "/QueryService/MemberNormalOrders" + QueryService_QueryWholesaleOrders_FullMethodName = "/QueryService/QueryWholesaleOrders" + QueryService_QueryTradeOrders_FullMethodName = "/QueryService/QueryTradeOrders" + QueryService_QueryMemberList_FullMethodName = "/QueryService/QueryMemberList" + QueryService_SearchMembers_FullMethodName = "/QueryService/SearchMembers" + QueryService_QueryMemberFavoriteShops_FullMethodName = "/QueryService/QueryMemberFavoriteShops" + QueryService_QueryMemberFavoriteGoods_FullMethodName = "/QueryService/QueryMemberFavoriteGoods" + QueryService_PagingMemberAccountLog_FullMethodName = "/QueryService/PagingMemberAccountLog" + QueryService_PagingOnShelvesGoods_FullMethodName = "/QueryService/PagingOnShelvesGoods" + QueryService_QueryItemSalesHistory_FullMethodName = "/QueryService/QueryItemSalesHistory" + QueryService_SearchItem_FullMethodName = "/QueryService/SearchItem" +) + // QueryServiceClient is the client API for QueryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -62,7 +79,7 @@ func NewQueryServiceClient(cc grpc.ClientConnInterface) QueryServiceClient { func (c *queryServiceClient) SummaryStatistics(ctx context.Context, in *SummaryStatisticsRequest, opts ...grpc.CallOption) (*SummaryStatisticsResponse, error) { out := new(SummaryStatisticsResponse) - err := c.cc.Invoke(ctx, "/QueryService/SummaryStatistics", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_SummaryStatistics_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -71,7 +88,7 @@ func (c *queryServiceClient) SummaryStatistics(ctx context.Context, in *SummaryS func (c *queryServiceClient) MemberStatistics(ctx context.Context, in *MemberStatisticsRequest, opts ...grpc.CallOption) (*MemberStatisticsResponse, error) { out := new(MemberStatisticsResponse) - err := c.cc.Invoke(ctx, "/QueryService/MemberStatistics", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_MemberStatistics_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -80,7 +97,7 @@ func (c *queryServiceClient) MemberStatistics(ctx context.Context, in *MemberSta func (c *queryServiceClient) PagingShops(ctx context.Context, in *QueryPagingShopRequest, opts ...grpc.CallOption) (*QueryPagingShopsResponse, error) { out := new(QueryPagingShopsResponse) - err := c.cc.Invoke(ctx, "/QueryService/PagingShops", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_PagingShops_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -89,7 +106,7 @@ func (c *queryServiceClient) PagingShops(ctx context.Context, in *QueryPagingSho func (c *queryServiceClient) MemberNormalOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, "/QueryService/MemberNormalOrders", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_MemberNormalOrders_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -98,7 +115,7 @@ func (c *queryServiceClient) MemberNormalOrders(ctx context.Context, in *MemberO func (c *queryServiceClient) QueryWholesaleOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryWholesaleOrders", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryWholesaleOrders_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -107,7 +124,7 @@ func (c *queryServiceClient) QueryWholesaleOrders(ctx context.Context, in *Membe func (c *queryServiceClient) QueryTradeOrders(ctx context.Context, in *MemberOrderPagingRequest, opts ...grpc.CallOption) (*MemberOrderPagingResponse, error) { out := new(MemberOrderPagingResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryTradeOrders", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryTradeOrders_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -116,7 +133,7 @@ func (c *queryServiceClient) QueryTradeOrders(ctx context.Context, in *MemberOrd func (c *queryServiceClient) QueryMemberList(ctx context.Context, in *MemberListRequest, opts ...grpc.CallOption) (*MemberListResponse, error) { out := new(MemberListResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryMemberList", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryMemberList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -125,7 +142,7 @@ func (c *queryServiceClient) QueryMemberList(ctx context.Context, in *MemberList func (c *queryServiceClient) SearchMembers(ctx context.Context, in *MemberSearchRequest, opts ...grpc.CallOption) (*MemberListResponse, error) { out := new(MemberListResponse) - err := c.cc.Invoke(ctx, "/QueryService/SearchMembers", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_SearchMembers_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -134,7 +151,7 @@ func (c *queryServiceClient) SearchMembers(ctx context.Context, in *MemberSearch func (c *queryServiceClient) QueryMemberFavoriteShops(ctx context.Context, in *FavoriteQueryRequest, opts ...grpc.CallOption) (*PagingShopFavoriteResponse, error) { out := new(PagingShopFavoriteResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryMemberFavoriteShops", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryMemberFavoriteShops_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -143,7 +160,7 @@ func (c *queryServiceClient) QueryMemberFavoriteShops(ctx context.Context, in *F func (c *queryServiceClient) QueryMemberFavoriteGoods(ctx context.Context, in *FavoriteQueryRequest, opts ...grpc.CallOption) (*PagingGoodsFavoriteResponse, error) { out := new(PagingGoodsFavoriteResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryMemberFavoriteGoods", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryMemberFavoriteGoods_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -152,7 +169,7 @@ func (c *queryServiceClient) QueryMemberFavoriteGoods(ctx context.Context, in *F func (c *queryServiceClient) PagingMemberAccountLog(ctx context.Context, in *PagingAccountLogRequest, opts ...grpc.CallOption) (*MemberAccountPagingLogResponse, error) { out := new(MemberAccountPagingLogResponse) - err := c.cc.Invoke(ctx, "/QueryService/PagingMemberAccountLog", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_PagingMemberAccountLog_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -161,7 +178,7 @@ func (c *queryServiceClient) PagingMemberAccountLog(ctx context.Context, in *Pag func (c *queryServiceClient) PagingOnShelvesGoods(ctx context.Context, in *PagingShopGoodsRequest, opts ...grpc.CallOption) (*PagingShopGoodsResponse, error) { out := new(PagingShopGoodsResponse) - err := c.cc.Invoke(ctx, "/QueryService/PagingOnShelvesGoods", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_PagingOnShelvesGoods_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -170,7 +187,7 @@ func (c *queryServiceClient) PagingOnShelvesGoods(ctx context.Context, in *Pagin func (c *queryServiceClient) QueryItemSalesHistory(ctx context.Context, in *QueryItemSalesHistoryRequest, opts ...grpc.CallOption) (*QueryItemSalesHistoryResponse, error) { out := new(QueryItemSalesHistoryResponse) - err := c.cc.Invoke(ctx, "/QueryService/QueryItemSalesHistory", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_QueryItemSalesHistory_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -179,7 +196,7 @@ func (c *queryServiceClient) QueryItemSalesHistory(ctx context.Context, in *Quer func (c *queryServiceClient) SearchItem(ctx context.Context, in *SearchItemRequest, opts ...grpc.CallOption) (*SearchItemResponse, error) { out := new(SearchItemResponse) - err := c.cc.Invoke(ctx, "/QueryService/SearchItem", in, out, opts...) + err := c.cc.Invoke(ctx, QueryService_SearchItem_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -290,7 +307,7 @@ func _QueryService_SummaryStatistics_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/SummaryStatistics", + FullMethod: QueryService_SummaryStatistics_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SummaryStatistics(ctx, req.(*SummaryStatisticsRequest)) @@ -308,7 +325,7 @@ func _QueryService_MemberStatistics_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/MemberStatistics", + FullMethod: QueryService_MemberStatistics_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).MemberStatistics(ctx, req.(*MemberStatisticsRequest)) @@ -326,7 +343,7 @@ func _QueryService_PagingShops_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/PagingShops", + FullMethod: QueryService_PagingShops_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingShops(ctx, req.(*QueryPagingShopRequest)) @@ -344,7 +361,7 @@ func _QueryService_MemberNormalOrders_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/MemberNormalOrders", + FullMethod: QueryService_MemberNormalOrders_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).MemberNormalOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -362,7 +379,7 @@ func _QueryService_QueryWholesaleOrders_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryWholesaleOrders", + FullMethod: QueryService_QueryWholesaleOrders_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryWholesaleOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -380,7 +397,7 @@ func _QueryService_QueryTradeOrders_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryTradeOrders", + FullMethod: QueryService_QueryTradeOrders_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryTradeOrders(ctx, req.(*MemberOrderPagingRequest)) @@ -398,7 +415,7 @@ func _QueryService_QueryMemberList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryMemberList", + FullMethod: QueryService_QueryMemberList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberList(ctx, req.(*MemberListRequest)) @@ -416,7 +433,7 @@ func _QueryService_SearchMembers_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/SearchMembers", + FullMethod: QueryService_SearchMembers_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SearchMembers(ctx, req.(*MemberSearchRequest)) @@ -434,7 +451,7 @@ func _QueryService_QueryMemberFavoriteShops_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryMemberFavoriteShops", + FullMethod: QueryService_QueryMemberFavoriteShops_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberFavoriteShops(ctx, req.(*FavoriteQueryRequest)) @@ -452,7 +469,7 @@ func _QueryService_QueryMemberFavoriteGoods_Handler(srv interface{}, ctx context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryMemberFavoriteGoods", + FullMethod: QueryService_QueryMemberFavoriteGoods_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryMemberFavoriteGoods(ctx, req.(*FavoriteQueryRequest)) @@ -470,7 +487,7 @@ func _QueryService_PagingMemberAccountLog_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/PagingMemberAccountLog", + FullMethod: QueryService_PagingMemberAccountLog_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingMemberAccountLog(ctx, req.(*PagingAccountLogRequest)) @@ -488,7 +505,7 @@ func _QueryService_PagingOnShelvesGoods_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/PagingOnShelvesGoods", + FullMethod: QueryService_PagingOnShelvesGoods_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).PagingOnShelvesGoods(ctx, req.(*PagingShopGoodsRequest)) @@ -506,7 +523,7 @@ func _QueryService_QueryItemSalesHistory_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/QueryItemSalesHistory", + FullMethod: QueryService_QueryItemSalesHistory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).QueryItemSalesHistory(ctx, req.(*QueryItemSalesHistoryRequest)) @@ -524,7 +541,7 @@ func _QueryService_SearchItem_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QueryService/SearchItem", + FullMethod: QueryService_SearchItem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServiceServer).SearchItem(ctx, req.(*SearchItemRequest)) diff --git a/core/service/proto/quick_pay_service.pb.go b/core/service/proto/quick_pay_service.pb.go index aa3327a9c..09f25384b 100644 --- a/core/service/proto/quick_pay_service.pb.go +++ b/core/service/proto/quick_pay_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: quick_pay_service.proto package proto diff --git a/core/service/proto/quick_pay_service_grpc.pb.go b/core/service/proto/quick_pay_service_grpc.pb.go index cf318e3bd..01765d7a9 100644 --- a/core/service/proto/quick_pay_service_grpc.pb.go +++ b/core/service/proto/quick_pay_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: quick_pay_service.proto package proto @@ -18,6 +18,16 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + QuickPayService_QueryCardBin_FullMethodName = "/QuickPayService/QueryCardBin" + QuickPayService_CheckSign_FullMethodName = "/QuickPayService/CheckSign" + QuickPayService_RequestBankSideAuth_FullMethodName = "/QuickPayService/RequestBankSideAuth" + QuickPayService_QueryBankAuthResult_FullMethodName = "/QuickPayService/QueryBankAuthResult" + QuickPayService_DirectPayment_FullMethodName = "/QuickPayService/DirectPayment" + QuickPayService_QueryPaymentStatus_FullMethodName = "/QuickPayService/QueryPaymentStatus" + QuickPayService_BatchTransfer_FullMethodName = "/QuickPayService/BatchTransfer" +) + // QuickPayServiceClient is the client API for QuickPayService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -48,7 +58,7 @@ func NewQuickPayServiceClient(cc grpc.ClientConnInterface) QuickPayServiceClient func (c *quickPayServiceClient) QueryCardBin(ctx context.Context, in *BankCardNo, opts ...grpc.CallOption) (*CardBinQueryResponse, error) { out := new(CardBinQueryResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/QueryCardBin", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_QueryCardBin_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -57,7 +67,7 @@ func (c *quickPayServiceClient) QueryCardBin(ctx context.Context, in *BankCardNo func (c *quickPayServiceClient) CheckSign(ctx context.Context, in *CheckQPaySignRequest, opts ...grpc.CallOption) (*CheckQPaySignResponse, error) { out := new(CheckQPaySignResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/CheckSign", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_CheckSign_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -66,7 +76,7 @@ func (c *quickPayServiceClient) CheckSign(ctx context.Context, in *CheckQPaySign func (c *quickPayServiceClient) RequestBankSideAuth(ctx context.Context, in *BankAuthRequest, opts ...grpc.CallOption) (*BankAuthResponse, error) { out := new(BankAuthResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/RequestBankSideAuth", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_RequestBankSideAuth_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -75,7 +85,7 @@ func (c *quickPayServiceClient) RequestBankSideAuth(ctx context.Context, in *Ban func (c *quickPayServiceClient) QueryBankAuthResult(ctx context.Context, in *BankAuthQueryRequest, opts ...grpc.CallOption) (*BankAuthQueryResponse, error) { out := new(BankAuthQueryResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/QueryBankAuthResult", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_QueryBankAuthResult_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,7 +94,7 @@ func (c *quickPayServiceClient) QueryBankAuthResult(ctx context.Context, in *Ban func (c *quickPayServiceClient) DirectPayment(ctx context.Context, in *QPaymentRequest, opts ...grpc.CallOption) (*QPaymentResponse, error) { out := new(QPaymentResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/DirectPayment", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_DirectPayment_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,7 +103,7 @@ func (c *quickPayServiceClient) DirectPayment(ctx context.Context, in *QPaymentR func (c *quickPayServiceClient) QueryPaymentStatus(ctx context.Context, in *QPaymentQueryRequest, opts ...grpc.CallOption) (*QPaymentQueryResponse, error) { out := new(QPaymentQueryResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/QueryPaymentStatus", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_QueryPaymentStatus_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -102,7 +112,7 @@ func (c *quickPayServiceClient) QueryPaymentStatus(ctx context.Context, in *QPay func (c *quickPayServiceClient) BatchTransfer(ctx context.Context, in *BatchTransferRequest, opts ...grpc.CallOption) (*BatchTransferResponse, error) { out := new(BatchTransferResponse) - err := c.cc.Invoke(ctx, "/QuickPayService/BatchTransfer", in, out, opts...) + err := c.cc.Invoke(ctx, QuickPayService_BatchTransfer_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -178,7 +188,7 @@ func _QuickPayService_QueryCardBin_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/QueryCardBin", + FullMethod: QuickPayService_QueryCardBin_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryCardBin(ctx, req.(*BankCardNo)) @@ -196,7 +206,7 @@ func _QuickPayService_CheckSign_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/CheckSign", + FullMethod: QuickPayService_CheckSign_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).CheckSign(ctx, req.(*CheckQPaySignRequest)) @@ -214,7 +224,7 @@ func _QuickPayService_RequestBankSideAuth_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/RequestBankSideAuth", + FullMethod: QuickPayService_RequestBankSideAuth_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).RequestBankSideAuth(ctx, req.(*BankAuthRequest)) @@ -232,7 +242,7 @@ func _QuickPayService_QueryBankAuthResult_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/QueryBankAuthResult", + FullMethod: QuickPayService_QueryBankAuthResult_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryBankAuthResult(ctx, req.(*BankAuthQueryRequest)) @@ -250,7 +260,7 @@ func _QuickPayService_DirectPayment_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/DirectPayment", + FullMethod: QuickPayService_DirectPayment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).DirectPayment(ctx, req.(*QPaymentRequest)) @@ -268,7 +278,7 @@ func _QuickPayService_QueryPaymentStatus_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/QueryPaymentStatus", + FullMethod: QuickPayService_QueryPaymentStatus_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).QueryPaymentStatus(ctx, req.(*QPaymentQueryRequest)) @@ -286,7 +296,7 @@ func _QuickPayService_BatchTransfer_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/QuickPayService/BatchTransfer", + FullMethod: QuickPayService_BatchTransfer_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QuickPayServiceServer).BatchTransfer(ctx, req.(*BatchTransferRequest)) diff --git a/core/service/proto/rbac_service.pb.go b/core/service/proto/rbac_service.pb.go index 3e8f922b7..4a17140c9 100644 --- a/core/service/proto/rbac_service.pb.go +++ b/core/service/proto/rbac_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: rbac_service.proto package proto diff --git a/core/service/proto/rbac_service_grpc.pb.go b/core/service/proto/rbac_service_grpc.pb.go index 8bf3b9ee2..595235f8e 100644 --- a/core/service/proto/rbac_service_grpc.pb.go +++ b/core/service/proto/rbac_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: rbac_service.proto package proto @@ -18,6 +18,37 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + RbacService_UserLogin_FullMethodName = "/RbacService/UserLogin" + RbacService_CheckRBACToken_FullMethodName = "/RbacService/CheckRBACToken" + RbacService_GetJwtToken_FullMethodName = "/RbacService/GetJwtToken" + RbacService_GetUserResource_FullMethodName = "/RbacService/GetUserResource" + RbacService_QueryResList_FullMethodName = "/RbacService/QueryResList" + RbacService_MoveResOrdinal_FullMethodName = "/RbacService/MoveResOrdinal" + RbacService_DepartTree_FullMethodName = "/RbacService/DepartTree" + RbacService_SavePermDept_FullMethodName = "/RbacService/SavePermDept" + RbacService_GetPermDept_FullMethodName = "/RbacService/GetPermDept" + RbacService_DeletePermDept_FullMethodName = "/RbacService/DeletePermDept" + RbacService_SavePermJob_FullMethodName = "/RbacService/SavePermJob" + RbacService_GetPermJob_FullMethodName = "/RbacService/GetPermJob" + RbacService_QueryPermJobList_FullMethodName = "/RbacService/QueryPermJobList" + RbacService_DeletePermJob_FullMethodName = "/RbacService/DeletePermJob" + RbacService_PagingPermJob_FullMethodName = "/RbacService/PagingPermJob" + RbacService_SavePermUser_FullMethodName = "/RbacService/SavePermUser" + RbacService_GetPermUser_FullMethodName = "/RbacService/GetPermUser" + RbacService_DeletePermUser_FullMethodName = "/RbacService/DeletePermUser" + RbacService_PagingPermUser_FullMethodName = "/RbacService/PagingPermUser" + RbacService_SavePermRole_FullMethodName = "/RbacService/SavePermRole" + RbacService_UpdateRoleResource_FullMethodName = "/RbacService/UpdateRoleResource" + RbacService_GetPermRole_FullMethodName = "/RbacService/GetPermRole" + RbacService_QueryPermRoleList_FullMethodName = "/RbacService/QueryPermRoleList" + RbacService_DeletePermRole_FullMethodName = "/RbacService/DeletePermRole" + RbacService_PagingPermRole_FullMethodName = "/RbacService/PagingPermRole" + RbacService_SavePermRes_FullMethodName = "/RbacService/SavePermRes" + RbacService_GetPermRes_FullMethodName = "/RbacService/GetPermRes" + RbacService_DeletePermRes_FullMethodName = "/RbacService/DeletePermRes" +) + // RbacServiceClient is the client API for RbacService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -90,7 +121,7 @@ func NewRbacServiceClient(cc grpc.ClientConnInterface) RbacServiceClient { func (c *rbacServiceClient) UserLogin(ctx context.Context, in *RbacLoginRequest, opts ...grpc.CallOption) (*RbacLoginResponse, error) { out := new(RbacLoginResponse) - err := c.cc.Invoke(ctx, "/RbacService/UserLogin", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_UserLogin_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -99,7 +130,7 @@ func (c *rbacServiceClient) UserLogin(ctx context.Context, in *RbacLoginRequest, func (c *rbacServiceClient) CheckRBACToken(ctx context.Context, in *CheckRBACTokenRequest, opts ...grpc.CallOption) (*CheckRBACTokenResponse, error) { out := new(CheckRBACTokenResponse) - err := c.cc.Invoke(ctx, "/RbacService/CheckRBACToken", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_CheckRBACToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -108,7 +139,7 @@ func (c *rbacServiceClient) CheckRBACToken(ctx context.Context, in *CheckRBACTok func (c *rbacServiceClient) GetJwtToken(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/RbacService/GetJwtToken", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetJwtToken_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -117,7 +148,7 @@ func (c *rbacServiceClient) GetJwtToken(ctx context.Context, in *Empty, opts ... func (c *rbacServiceClient) GetUserResource(ctx context.Context, in *GetUserResRequest, opts ...grpc.CallOption) (*RbacUserResourceResponse, error) { out := new(RbacUserResourceResponse) - err := c.cc.Invoke(ctx, "/RbacService/GetUserResource", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetUserResource_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -126,7 +157,7 @@ func (c *rbacServiceClient) GetUserResource(ctx context.Context, in *GetUserResR func (c *rbacServiceClient) QueryResList(ctx context.Context, in *QueryPermResRequest, opts ...grpc.CallOption) (*QueryPermResResponse, error) { out := new(QueryPermResResponse) - err := c.cc.Invoke(ctx, "/RbacService/QueryResList", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_QueryResList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -135,7 +166,7 @@ func (c *rbacServiceClient) QueryResList(ctx context.Context, in *QueryPermResRe func (c *rbacServiceClient) MoveResOrdinal(ctx context.Context, in *MoveResOrdinalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/MoveResOrdinal", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_MoveResOrdinal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -144,7 +175,7 @@ func (c *rbacServiceClient) MoveResOrdinal(ctx context.Context, in *MoveResOrdin func (c *rbacServiceClient) DepartTree(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*RbacTree, error) { out := new(RbacTree) - err := c.cc.Invoke(ctx, "/RbacService/DepartTree", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DepartTree_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -153,7 +184,7 @@ func (c *rbacServiceClient) DepartTree(ctx context.Context, in *Empty, opts ...g func (c *rbacServiceClient) SavePermDept(ctx context.Context, in *SavePermDeptRequest, opts ...grpc.CallOption) (*SavePermDeptResponse, error) { out := new(SavePermDeptResponse) - err := c.cc.Invoke(ctx, "/RbacService/SavePermDept", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_SavePermDept_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -162,7 +193,7 @@ func (c *rbacServiceClient) SavePermDept(ctx context.Context, in *SavePermDeptRe func (c *rbacServiceClient) GetPermDept(ctx context.Context, in *PermDeptId, opts ...grpc.CallOption) (*SPermDept, error) { out := new(SPermDept) - err := c.cc.Invoke(ctx, "/RbacService/GetPermDept", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetPermDept_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -171,7 +202,7 @@ func (c *rbacServiceClient) GetPermDept(ctx context.Context, in *PermDeptId, opt func (c *rbacServiceClient) DeletePermDept(ctx context.Context, in *PermDeptId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/DeletePermDept", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DeletePermDept_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -180,7 +211,7 @@ func (c *rbacServiceClient) DeletePermDept(ctx context.Context, in *PermDeptId, func (c *rbacServiceClient) SavePermJob(ctx context.Context, in *SavePermJobRequest, opts ...grpc.CallOption) (*SavePermJobResponse, error) { out := new(SavePermJobResponse) - err := c.cc.Invoke(ctx, "/RbacService/SavePermJob", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_SavePermJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -189,7 +220,7 @@ func (c *rbacServiceClient) SavePermJob(ctx context.Context, in *SavePermJobRequ func (c *rbacServiceClient) GetPermJob(ctx context.Context, in *PermJobId, opts ...grpc.CallOption) (*SPermJob, error) { out := new(SPermJob) - err := c.cc.Invoke(ctx, "/RbacService/GetPermJob", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetPermJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -198,7 +229,7 @@ func (c *rbacServiceClient) GetPermJob(ctx context.Context, in *PermJobId, opts func (c *rbacServiceClient) QueryPermJobList(ctx context.Context, in *QueryPermJobRequest, opts ...grpc.CallOption) (*QueryPermJobResponse, error) { out := new(QueryPermJobResponse) - err := c.cc.Invoke(ctx, "/RbacService/QueryPermJobList", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_QueryPermJobList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -207,7 +238,7 @@ func (c *rbacServiceClient) QueryPermJobList(ctx context.Context, in *QueryPermJ func (c *rbacServiceClient) DeletePermJob(ctx context.Context, in *PermJobId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/DeletePermJob", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DeletePermJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -216,7 +247,7 @@ func (c *rbacServiceClient) DeletePermJob(ctx context.Context, in *PermJobId, op func (c *rbacServiceClient) PagingPermJob(ctx context.Context, in *PermJobPagingRequest, opts ...grpc.CallOption) (*PermJobPagingResponse, error) { out := new(PermJobPagingResponse) - err := c.cc.Invoke(ctx, "/RbacService/PagingPermJob", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_PagingPermJob_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -225,7 +256,7 @@ func (c *rbacServiceClient) PagingPermJob(ctx context.Context, in *PermJobPaging func (c *rbacServiceClient) SavePermUser(ctx context.Context, in *SavePermUserRequest, opts ...grpc.CallOption) (*SavePermUserResponse, error) { out := new(SavePermUserResponse) - err := c.cc.Invoke(ctx, "/RbacService/SavePermUser", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_SavePermUser_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -234,7 +265,7 @@ func (c *rbacServiceClient) SavePermUser(ctx context.Context, in *SavePermUserRe func (c *rbacServiceClient) GetPermUser(ctx context.Context, in *PermUserId, opts ...grpc.CallOption) (*SPermUser, error) { out := new(SPermUser) - err := c.cc.Invoke(ctx, "/RbacService/GetPermUser", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetPermUser_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -243,7 +274,7 @@ func (c *rbacServiceClient) GetPermUser(ctx context.Context, in *PermUserId, opt func (c *rbacServiceClient) DeletePermUser(ctx context.Context, in *PermUserId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/DeletePermUser", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DeletePermUser_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -252,7 +283,7 @@ func (c *rbacServiceClient) DeletePermUser(ctx context.Context, in *PermUserId, func (c *rbacServiceClient) PagingPermUser(ctx context.Context, in *PermUserPagingRequest, opts ...grpc.CallOption) (*PermUserPagingResponse, error) { out := new(PermUserPagingResponse) - err := c.cc.Invoke(ctx, "/RbacService/PagingPermUser", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_PagingPermUser_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -261,7 +292,7 @@ func (c *rbacServiceClient) PagingPermUser(ctx context.Context, in *PermUserPagi func (c *rbacServiceClient) SavePermRole(ctx context.Context, in *SavePermRoleRequest, opts ...grpc.CallOption) (*SavePermRoleResponse, error) { out := new(SavePermRoleResponse) - err := c.cc.Invoke(ctx, "/RbacService/SavePermRole", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_SavePermRole_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -270,7 +301,7 @@ func (c *rbacServiceClient) SavePermRole(ctx context.Context, in *SavePermRoleRe func (c *rbacServiceClient) UpdateRoleResource(ctx context.Context, in *UpdateRoleResRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/UpdateRoleResource", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_UpdateRoleResource_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -279,7 +310,7 @@ func (c *rbacServiceClient) UpdateRoleResource(ctx context.Context, in *UpdateRo func (c *rbacServiceClient) GetPermRole(ctx context.Context, in *PermRoleId, opts ...grpc.CallOption) (*SPermRole, error) { out := new(SPermRole) - err := c.cc.Invoke(ctx, "/RbacService/GetPermRole", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetPermRole_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -288,7 +319,7 @@ func (c *rbacServiceClient) GetPermRole(ctx context.Context, in *PermRoleId, opt func (c *rbacServiceClient) QueryPermRoleList(ctx context.Context, in *QueryPermRoleRequest, opts ...grpc.CallOption) (*QueryPermRoleResponse, error) { out := new(QueryPermRoleResponse) - err := c.cc.Invoke(ctx, "/RbacService/QueryPermRoleList", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_QueryPermRoleList_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -297,7 +328,7 @@ func (c *rbacServiceClient) QueryPermRoleList(ctx context.Context, in *QueryPerm func (c *rbacServiceClient) DeletePermRole(ctx context.Context, in *PermRoleId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/DeletePermRole", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DeletePermRole_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -306,7 +337,7 @@ func (c *rbacServiceClient) DeletePermRole(ctx context.Context, in *PermRoleId, func (c *rbacServiceClient) PagingPermRole(ctx context.Context, in *PermRolePagingRequest, opts ...grpc.CallOption) (*PermRolePagingResponse, error) { out := new(PermRolePagingResponse) - err := c.cc.Invoke(ctx, "/RbacService/PagingPermRole", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_PagingPermRole_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -315,7 +346,7 @@ func (c *rbacServiceClient) PagingPermRole(ctx context.Context, in *PermRolePagi func (c *rbacServiceClient) SavePermRes(ctx context.Context, in *SavePermResRequest, opts ...grpc.CallOption) (*SavePermResResponse, error) { out := new(SavePermResResponse) - err := c.cc.Invoke(ctx, "/RbacService/SavePermRes", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_SavePermRes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -324,7 +355,7 @@ func (c *rbacServiceClient) SavePermRes(ctx context.Context, in *SavePermResRequ func (c *rbacServiceClient) GetPermRes(ctx context.Context, in *PermResId, opts ...grpc.CallOption) (*SPermRes, error) { out := new(SPermRes) - err := c.cc.Invoke(ctx, "/RbacService/GetPermRes", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_GetPermRes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -333,7 +364,7 @@ func (c *rbacServiceClient) GetPermRes(ctx context.Context, in *PermResId, opts func (c *rbacServiceClient) DeletePermRes(ctx context.Context, in *PermResId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RbacService/DeletePermRes", in, out, opts...) + err := c.cc.Invoke(ctx, RbacService_DeletePermRes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -514,7 +545,7 @@ func _RbacService_UserLogin_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/UserLogin", + FullMethod: RbacService_UserLogin_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).UserLogin(ctx, req.(*RbacLoginRequest)) @@ -532,7 +563,7 @@ func _RbacService_CheckRBACToken_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/CheckRBACToken", + FullMethod: RbacService_CheckRBACToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).CheckRBACToken(ctx, req.(*CheckRBACTokenRequest)) @@ -550,7 +581,7 @@ func _RbacService_GetJwtToken_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetJwtToken", + FullMethod: RbacService_GetJwtToken_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetJwtToken(ctx, req.(*Empty)) @@ -568,7 +599,7 @@ func _RbacService_GetUserResource_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetUserResource", + FullMethod: RbacService_GetUserResource_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetUserResource(ctx, req.(*GetUserResRequest)) @@ -586,7 +617,7 @@ func _RbacService_QueryResList_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/QueryResList", + FullMethod: RbacService_QueryResList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryResList(ctx, req.(*QueryPermResRequest)) @@ -604,7 +635,7 @@ func _RbacService_MoveResOrdinal_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/MoveResOrdinal", + FullMethod: RbacService_MoveResOrdinal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).MoveResOrdinal(ctx, req.(*MoveResOrdinalRequest)) @@ -622,7 +653,7 @@ func _RbacService_DepartTree_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DepartTree", + FullMethod: RbacService_DepartTree_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DepartTree(ctx, req.(*Empty)) @@ -640,7 +671,7 @@ func _RbacService_SavePermDept_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/SavePermDept", + FullMethod: RbacService_SavePermDept_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermDept(ctx, req.(*SavePermDeptRequest)) @@ -658,7 +689,7 @@ func _RbacService_GetPermDept_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetPermDept", + FullMethod: RbacService_GetPermDept_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermDept(ctx, req.(*PermDeptId)) @@ -676,7 +707,7 @@ func _RbacService_DeletePermDept_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DeletePermDept", + FullMethod: RbacService_DeletePermDept_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermDept(ctx, req.(*PermDeptId)) @@ -694,7 +725,7 @@ func _RbacService_SavePermJob_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/SavePermJob", + FullMethod: RbacService_SavePermJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermJob(ctx, req.(*SavePermJobRequest)) @@ -712,7 +743,7 @@ func _RbacService_GetPermJob_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetPermJob", + FullMethod: RbacService_GetPermJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermJob(ctx, req.(*PermJobId)) @@ -730,7 +761,7 @@ func _RbacService_QueryPermJobList_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/QueryPermJobList", + FullMethod: RbacService_QueryPermJobList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryPermJobList(ctx, req.(*QueryPermJobRequest)) @@ -748,7 +779,7 @@ func _RbacService_DeletePermJob_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DeletePermJob", + FullMethod: RbacService_DeletePermJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermJob(ctx, req.(*PermJobId)) @@ -766,7 +797,7 @@ func _RbacService_PagingPermJob_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/PagingPermJob", + FullMethod: RbacService_PagingPermJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermJob(ctx, req.(*PermJobPagingRequest)) @@ -784,7 +815,7 @@ func _RbacService_SavePermUser_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/SavePermUser", + FullMethod: RbacService_SavePermUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermUser(ctx, req.(*SavePermUserRequest)) @@ -802,7 +833,7 @@ func _RbacService_GetPermUser_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetPermUser", + FullMethod: RbacService_GetPermUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermUser(ctx, req.(*PermUserId)) @@ -820,7 +851,7 @@ func _RbacService_DeletePermUser_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DeletePermUser", + FullMethod: RbacService_DeletePermUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermUser(ctx, req.(*PermUserId)) @@ -838,7 +869,7 @@ func _RbacService_PagingPermUser_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/PagingPermUser", + FullMethod: RbacService_PagingPermUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermUser(ctx, req.(*PermUserPagingRequest)) @@ -856,7 +887,7 @@ func _RbacService_SavePermRole_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/SavePermRole", + FullMethod: RbacService_SavePermRole_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermRole(ctx, req.(*SavePermRoleRequest)) @@ -874,7 +905,7 @@ func _RbacService_UpdateRoleResource_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/UpdateRoleResource", + FullMethod: RbacService_UpdateRoleResource_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).UpdateRoleResource(ctx, req.(*UpdateRoleResRequest)) @@ -892,7 +923,7 @@ func _RbacService_GetPermRole_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetPermRole", + FullMethod: RbacService_GetPermRole_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermRole(ctx, req.(*PermRoleId)) @@ -910,7 +941,7 @@ func _RbacService_QueryPermRoleList_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/QueryPermRoleList", + FullMethod: RbacService_QueryPermRoleList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).QueryPermRoleList(ctx, req.(*QueryPermRoleRequest)) @@ -928,7 +959,7 @@ func _RbacService_DeletePermRole_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DeletePermRole", + FullMethod: RbacService_DeletePermRole_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermRole(ctx, req.(*PermRoleId)) @@ -946,7 +977,7 @@ func _RbacService_PagingPermRole_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/PagingPermRole", + FullMethod: RbacService_PagingPermRole_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).PagingPermRole(ctx, req.(*PermRolePagingRequest)) @@ -964,7 +995,7 @@ func _RbacService_SavePermRes_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/SavePermRes", + FullMethod: RbacService_SavePermRes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).SavePermRes(ctx, req.(*SavePermResRequest)) @@ -982,7 +1013,7 @@ func _RbacService_GetPermRes_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/GetPermRes", + FullMethod: RbacService_GetPermRes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).GetPermRes(ctx, req.(*PermResId)) @@ -1000,7 +1031,7 @@ func _RbacService_DeletePermRes_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RbacService/DeletePermRes", + FullMethod: RbacService_DeletePermRes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RbacServiceServer).DeletePermRes(ctx, req.(*PermResId)) diff --git a/core/service/proto/registry_service.pb.go b/core/service/proto/registry_service.pb.go index df4f58956..f0bdbfbaa 100644 --- a/core/service/proto/registry_service.pb.go +++ b/core/service/proto/registry_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: registry_service.proto package proto diff --git a/core/service/proto/registry_service_grpc.pb.go b/core/service/proto/registry_service_grpc.pb.go index 40b6d849d..8ade408f5 100644 --- a/core/service/proto/registry_service_grpc.pb.go +++ b/core/service/proto/registry_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: registry_service.proto package proto @@ -18,6 +18,19 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + RegistryService_GetGroups_FullMethodName = "/RegistryService/GetGroups" + RegistryService_GetRegistry_FullMethodName = "/RegistryService/GetRegistry" + RegistryService_GetValue_FullMethodName = "/RegistryService/GetValue" + RegistryService_UpdateValue_FullMethodName = "/RegistryService/UpdateValue" + RegistryService_GetValues_FullMethodName = "/RegistryService/GetValues" + RegistryService_UpdateValues_FullMethodName = "/RegistryService/UpdateValues" + RegistryService_Search_FullMethodName = "/RegistryService/Search" + RegistryService_FindRegistries_FullMethodName = "/RegistryService/FindRegistries" + RegistryService_SearchRegistry_FullMethodName = "/RegistryService/SearchRegistry" + RegistryService_CreateRegistry_FullMethodName = "/RegistryService/CreateRegistry" +) + // RegistryServiceClient is the client API for RegistryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -54,7 +67,7 @@ func NewRegistryServiceClient(cc grpc.ClientConnInterface) RegistryServiceClient func (c *registryServiceClient) GetGroups(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*RegistryGroupResponse, error) { out := new(RegistryGroupResponse) - err := c.cc.Invoke(ctx, "/RegistryService/GetGroups", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_GetGroups_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -63,7 +76,7 @@ func (c *registryServiceClient) GetGroups(ctx context.Context, in *Empty, opts . func (c *registryServiceClient) GetRegistry(ctx context.Context, in *String, opts ...grpc.CallOption) (*SRegistry, error) { out := new(SRegistry) - err := c.cc.Invoke(ctx, "/RegistryService/GetRegistry", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_GetRegistry_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -72,7 +85,7 @@ func (c *registryServiceClient) GetRegistry(ctx context.Context, in *String, opt func (c *registryServiceClient) GetValue(ctx context.Context, in *String, opts ...grpc.CallOption) (*RegistryValueResponse, error) { out := new(RegistryValueResponse) - err := c.cc.Invoke(ctx, "/RegistryService/GetValue", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_GetValue_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -81,7 +94,7 @@ func (c *registryServiceClient) GetValue(ctx context.Context, in *String, opts . func (c *registryServiceClient) UpdateValue(ctx context.Context, in *RegistryPair, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RegistryService/UpdateValue", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_UpdateValue_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -90,7 +103,7 @@ func (c *registryServiceClient) UpdateValue(ctx context.Context, in *RegistryPai func (c *registryServiceClient) GetValues(ctx context.Context, in *StringArray, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, "/RegistryService/GetValues", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_GetValues_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -99,7 +112,7 @@ func (c *registryServiceClient) GetValues(ctx context.Context, in *StringArray, func (c *registryServiceClient) UpdateValues(ctx context.Context, in *StringMap, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RegistryService/UpdateValues", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_UpdateValues_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -108,7 +121,7 @@ func (c *registryServiceClient) UpdateValues(ctx context.Context, in *StringMap, func (c *registryServiceClient) Search(ctx context.Context, in *RegistrySearchRequest, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, "/RegistryService/Search", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_Search_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -117,7 +130,7 @@ func (c *registryServiceClient) Search(ctx context.Context, in *RegistrySearchRe func (c *registryServiceClient) FindRegistries(ctx context.Context, in *String, opts ...grpc.CallOption) (*StringMap, error) { out := new(StringMap) - err := c.cc.Invoke(ctx, "/RegistryService/FindRegistries", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_FindRegistries_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -126,7 +139,7 @@ func (c *registryServiceClient) FindRegistries(ctx context.Context, in *String, func (c *registryServiceClient) SearchRegistry(ctx context.Context, in *String, opts ...grpc.CallOption) (*RegistriesResponse, error) { out := new(RegistriesResponse) - err := c.cc.Invoke(ctx, "/RegistryService/SearchRegistry", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_SearchRegistry_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -135,7 +148,7 @@ func (c *registryServiceClient) SearchRegistry(ctx context.Context, in *String, func (c *registryServiceClient) CreateRegistry(ctx context.Context, in *RegistryCreateRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/RegistryService/CreateRegistry", in, out, opts...) + err := c.cc.Invoke(ctx, RegistryService_CreateRegistry_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -226,7 +239,7 @@ func _RegistryService_GetGroups_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/GetGroups", + FullMethod: RegistryService_GetGroups_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetGroups(ctx, req.(*Empty)) @@ -244,7 +257,7 @@ func _RegistryService_GetRegistry_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/GetRegistry", + FullMethod: RegistryService_GetRegistry_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetRegistry(ctx, req.(*String)) @@ -262,7 +275,7 @@ func _RegistryService_GetValue_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/GetValue", + FullMethod: RegistryService_GetValue_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetValue(ctx, req.(*String)) @@ -280,7 +293,7 @@ func _RegistryService_UpdateValue_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/UpdateValue", + FullMethod: RegistryService_UpdateValue_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).UpdateValue(ctx, req.(*RegistryPair)) @@ -298,7 +311,7 @@ func _RegistryService_GetValues_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/GetValues", + FullMethod: RegistryService_GetValues_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).GetValues(ctx, req.(*StringArray)) @@ -316,7 +329,7 @@ func _RegistryService_UpdateValues_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/UpdateValues", + FullMethod: RegistryService_UpdateValues_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).UpdateValues(ctx, req.(*StringMap)) @@ -334,7 +347,7 @@ func _RegistryService_Search_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/Search", + FullMethod: RegistryService_Search_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).Search(ctx, req.(*RegistrySearchRequest)) @@ -352,7 +365,7 @@ func _RegistryService_FindRegistries_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/FindRegistries", + FullMethod: RegistryService_FindRegistries_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).FindRegistries(ctx, req.(*String)) @@ -370,7 +383,7 @@ func _RegistryService_SearchRegistry_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/SearchRegistry", + FullMethod: RegistryService_SearchRegistry_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).SearchRegistry(ctx, req.(*String)) @@ -388,7 +401,7 @@ func _RegistryService_CreateRegistry_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/RegistryService/CreateRegistry", + FullMethod: RegistryService_CreateRegistry_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(RegistryServiceServer).CreateRegistry(ctx, req.(*RegistryCreateRequest)) diff --git a/core/service/proto/shipment_dto.pb.go b/core/service/proto/shipment_dto.pb.go index 8678fd4a6..98e8b9d20 100644 --- a/core/service/proto/shipment_dto.pb.go +++ b/core/service/proto/shipment_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/shipment_dto.proto package proto diff --git a/core/service/proto/shipment_service.pb.go b/core/service/proto/shipment_service.pb.go index 822726103..84c1daa01 100644 --- a/core/service/proto/shipment_service.pb.go +++ b/core/service/proto/shipment_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: shipment_service.proto package proto diff --git a/core/service/proto/shipment_service_grpc.pb.go b/core/service/proto/shipment_service_grpc.pb.go index 1d759a5e2..3d3afba11 100644 --- a/core/service/proto/shipment_service_grpc.pb.go +++ b/core/service/proto/shipment_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: shipment_service.proto package proto @@ -18,6 +18,13 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ShipmentService_CreateCoverageArea__FullMethodName = "/ShipmentService/CreateCoverageArea_" + ShipmentService_GetOrderShipments_FullMethodName = "/ShipmentService/GetOrderShipments" + ShipmentService_GetLogisticFlowTrack_FullMethodName = "/ShipmentService/GetLogisticFlowTrack" + ShipmentService_ShipOrderLogisticTrack_FullMethodName = "/ShipmentService/ShipOrderLogisticTrack" +) + // ShipmentServiceClient is the client API for ShipmentService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -42,7 +49,7 @@ func NewShipmentServiceClient(cc grpc.ClientConnInterface) ShipmentServiceClient func (c *shipmentServiceClient) CreateCoverageArea_(ctx context.Context, in *SCoverageValue, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ShipmentService/CreateCoverageArea_", in, out, opts...) + err := c.cc.Invoke(ctx, ShipmentService_CreateCoverageArea__FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -51,7 +58,7 @@ func (c *shipmentServiceClient) CreateCoverageArea_(ctx context.Context, in *SCo func (c *shipmentServiceClient) GetOrderShipments(ctx context.Context, in *OrderId, opts ...grpc.CallOption) (*ShipmentOrderListResponse, error) { out := new(ShipmentOrderListResponse) - err := c.cc.Invoke(ctx, "/ShipmentService/GetOrderShipments", in, out, opts...) + err := c.cc.Invoke(ctx, ShipmentService_GetOrderShipments_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -60,7 +67,7 @@ func (c *shipmentServiceClient) GetOrderShipments(ctx context.Context, in *Order func (c *shipmentServiceClient) GetLogisticFlowTrack(ctx context.Context, in *LogisticFlowTrackRequest, opts ...grpc.CallOption) (*SShipOrderTrack, error) { out := new(SShipOrderTrack) - err := c.cc.Invoke(ctx, "/ShipmentService/GetLogisticFlowTrack", in, out, opts...) + err := c.cc.Invoke(ctx, ShipmentService_GetLogisticFlowTrack_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -69,7 +76,7 @@ func (c *shipmentServiceClient) GetLogisticFlowTrack(ctx context.Context, in *Lo func (c *shipmentServiceClient) ShipOrderLogisticTrack(ctx context.Context, in *OrderLogisticTrackRequest, opts ...grpc.CallOption) (*SShipOrderTrack, error) { out := new(SShipOrderTrack) - err := c.cc.Invoke(ctx, "/ShipmentService/ShipOrderLogisticTrack", in, out, opts...) + err := c.cc.Invoke(ctx, ShipmentService_ShipOrderLogisticTrack_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -130,7 +137,7 @@ func _ShipmentService_CreateCoverageArea__Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShipmentService/CreateCoverageArea_", + FullMethod: ShipmentService_CreateCoverageArea__FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).CreateCoverageArea_(ctx, req.(*SCoverageValue)) @@ -148,7 +155,7 @@ func _ShipmentService_GetOrderShipments_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShipmentService/GetOrderShipments", + FullMethod: ShipmentService_GetOrderShipments_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).GetOrderShipments(ctx, req.(*OrderId)) @@ -166,7 +173,7 @@ func _ShipmentService_GetLogisticFlowTrack_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShipmentService/GetLogisticFlowTrack", + FullMethod: ShipmentService_GetLogisticFlowTrack_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).GetLogisticFlowTrack(ctx, req.(*LogisticFlowTrackRequest)) @@ -184,7 +191,7 @@ func _ShipmentService_ShipOrderLogisticTrack_Handler(srv interface{}, ctx contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShipmentService/ShipOrderLogisticTrack", + FullMethod: ShipmentService_ShipOrderLogisticTrack_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShipmentServiceServer).ShipOrderLogisticTrack(ctx, req.(*OrderLogisticTrackRequest)) diff --git a/core/service/proto/shop_service.pb.go b/core/service/proto/shop_service.pb.go index 2f6bd75af..34d6cbf87 100644 --- a/core/service/proto/shop_service.pb.go +++ b/core/service/proto/shop_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: shop_service.proto package proto diff --git a/core/service/proto/shop_service_grpc.pb.go b/core/service/proto/shop_service_grpc.pb.go index 64c5270d0..ac0f2a96f 100644 --- a/core/service/proto/shop_service_grpc.pb.go +++ b/core/service/proto/shop_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: shop_service.proto package proto @@ -18,6 +18,19 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + ShopService_GetShop_FullMethodName = "/ShopService/GetShop" + ShopService_GetSelfSupportShops_FullMethodName = "/ShopService/GetSelfSupportShops" + ShopService_QueryShopId_FullMethodName = "/ShopService/QueryShopId" + ShopService_CheckMerchantShopState_FullMethodName = "/ShopService/CheckMerchantShopState" + ShopService_GetStore_FullMethodName = "/ShopService/GetStore" + ShopService_QueryShopByHost_FullMethodName = "/ShopService/QueryShopByHost" + ShopService_TurnShop_FullMethodName = "/ShopService/TurnShop" + ShopService_SaveShop_FullMethodName = "/ShopService/SaveShop" + ShopService_SaveOfflineShop_FullMethodName = "/ShopService/SaveOfflineShop" + ShopService_DeleteStore_FullMethodName = "/ShopService/DeleteStore" +) + // ShopServiceClient is the client API for ShopService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -57,7 +70,7 @@ func NewShopServiceClient(cc grpc.ClientConnInterface) ShopServiceClient { func (c *shopServiceClient) GetShop(ctx context.Context, in *GetShopIdRequest, opts ...grpc.CallOption) (*SShop, error) { out := new(SShop) - err := c.cc.Invoke(ctx, "/ShopService/GetShop", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_GetShop_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -66,7 +79,7 @@ func (c *shopServiceClient) GetShop(ctx context.Context, in *GetShopIdRequest, o func (c *shopServiceClient) GetSelfSupportShops(ctx context.Context, in *SelfSupportShopRequest, opts ...grpc.CallOption) (*ShopListResponse, error) { out := new(ShopListResponse) - err := c.cc.Invoke(ctx, "/ShopService/GetSelfSupportShops", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_GetSelfSupportShops_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -75,7 +88,7 @@ func (c *shopServiceClient) GetSelfSupportShops(ctx context.Context, in *SelfSup func (c *shopServiceClient) QueryShopId(ctx context.Context, in *ShopAliasRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/ShopService/QueryShopId", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_QueryShopId_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,7 +97,7 @@ func (c *shopServiceClient) QueryShopId(ctx context.Context, in *ShopAliasReques func (c *shopServiceClient) CheckMerchantShopState(ctx context.Context, in *MerchantId, opts ...grpc.CallOption) (*CheckShopResponse, error) { out := new(CheckShopResponse) - err := c.cc.Invoke(ctx, "/ShopService/CheckMerchantShopState", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_CheckMerchantShopState_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -93,7 +106,7 @@ func (c *shopServiceClient) CheckMerchantShopState(ctx context.Context, in *Merc func (c *shopServiceClient) GetStore(ctx context.Context, in *StoreId, opts ...grpc.CallOption) (*SStore, error) { out := new(SStore) - err := c.cc.Invoke(ctx, "/ShopService/GetStore", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_GetStore_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -102,7 +115,7 @@ func (c *shopServiceClient) GetStore(ctx context.Context, in *StoreId, opts ...g func (c *shopServiceClient) QueryShopByHost(ctx context.Context, in *String, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/ShopService/QueryShopByHost", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_QueryShopByHost_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -111,7 +124,7 @@ func (c *shopServiceClient) QueryShopByHost(ctx context.Context, in *String, opt func (c *shopServiceClient) TurnShop(ctx context.Context, in *TurnShopRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ShopService/TurnShop", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_TurnShop_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -120,7 +133,7 @@ func (c *shopServiceClient) TurnShop(ctx context.Context, in *TurnShopRequest, o func (c *shopServiceClient) SaveShop(ctx context.Context, in *SShop, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ShopService/SaveShop", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_SaveShop_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -129,7 +142,7 @@ func (c *shopServiceClient) SaveShop(ctx context.Context, in *SShop, opts ...grp func (c *shopServiceClient) SaveOfflineShop(ctx context.Context, in *SStore, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ShopService/SaveOfflineShop", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_SaveOfflineShop_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -138,7 +151,7 @@ func (c *shopServiceClient) SaveOfflineShop(ctx context.Context, in *SStore, opt func (c *shopServiceClient) DeleteStore(ctx context.Context, in *StoreId, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/ShopService/DeleteStore", in, out, opts...) + err := c.cc.Invoke(ctx, ShopService_DeleteStore_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -232,7 +245,7 @@ func _ShopService_GetShop_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/GetShop", + FullMethod: ShopService_GetShop_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetShop(ctx, req.(*GetShopIdRequest)) @@ -250,7 +263,7 @@ func _ShopService_GetSelfSupportShops_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/GetSelfSupportShops", + FullMethod: ShopService_GetSelfSupportShops_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetSelfSupportShops(ctx, req.(*SelfSupportShopRequest)) @@ -268,7 +281,7 @@ func _ShopService_QueryShopId_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/QueryShopId", + FullMethod: ShopService_QueryShopId_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).QueryShopId(ctx, req.(*ShopAliasRequest)) @@ -286,7 +299,7 @@ func _ShopService_CheckMerchantShopState_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/CheckMerchantShopState", + FullMethod: ShopService_CheckMerchantShopState_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).CheckMerchantShopState(ctx, req.(*MerchantId)) @@ -304,7 +317,7 @@ func _ShopService_GetStore_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/GetStore", + FullMethod: ShopService_GetStore_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).GetStore(ctx, req.(*StoreId)) @@ -322,7 +335,7 @@ func _ShopService_QueryShopByHost_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/QueryShopByHost", + FullMethod: ShopService_QueryShopByHost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).QueryShopByHost(ctx, req.(*String)) @@ -340,7 +353,7 @@ func _ShopService_TurnShop_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/TurnShop", + FullMethod: ShopService_TurnShop_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).TurnShop(ctx, req.(*TurnShopRequest)) @@ -358,7 +371,7 @@ func _ShopService_SaveShop_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/SaveShop", + FullMethod: ShopService_SaveShop_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).SaveShop(ctx, req.(*SShop)) @@ -376,7 +389,7 @@ func _ShopService_SaveOfflineShop_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/SaveOfflineShop", + FullMethod: ShopService_SaveOfflineShop_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).SaveOfflineShop(ctx, req.(*SStore)) @@ -394,7 +407,7 @@ func _ShopService_DeleteStore_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/ShopService/DeleteStore", + FullMethod: ShopService_DeleteStore_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ShopServiceServer).DeleteStore(ctx, req.(*StoreId)) diff --git a/core/service/proto/status_service.pb.go b/core/service/proto/status_service.pb.go index 77fe2b311..471261e84 100644 --- a/core/service/proto/status_service.pb.go +++ b/core/service/proto/status_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: status_service.proto package proto diff --git a/core/service/proto/status_service_grpc.pb.go b/core/service/proto/status_service_grpc.pb.go index 11f1419c2..a828d53cf 100644 --- a/core/service/proto/status_service_grpc.pb.go +++ b/core/service/proto/status_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: status_service.proto package proto @@ -18,6 +18,10 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + StatusService_Ping_FullMethodName = "/StatusService/Ping" +) + // StatusServiceClient is the client API for StatusService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -36,7 +40,7 @@ func NewStatusServiceClient(cc grpc.ClientConnInterface) StatusServiceClient { func (c *statusServiceClient) Ping(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*String, error) { out := new(String) - err := c.cc.Invoke(ctx, "/StatusService/Ping", in, out, opts...) + err := c.cc.Invoke(ctx, StatusService_Ping_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -82,7 +86,7 @@ func _StatusService_Ping_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/StatusService/Ping", + FullMethod: StatusService_Ping_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(StatusServiceServer).Ping(ctx, req.(*Empty)) diff --git a/core/service/proto/test.pb.go b/core/service/proto/test.pb.go index 4967385d7..d0aae8dfe 100644 --- a/core/service/proto/test.pb.go +++ b/core/service/proto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: test.proto package proto diff --git a/core/service/proto/test_grpc.pb.go b/core/service/proto/test_grpc.pb.go index ae30afae9..ab2a91427 100644 --- a/core/service/proto/test_grpc.pb.go +++ b/core/service/proto/test_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: test.proto package proto @@ -18,6 +18,10 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + GreeterService_Hello_FullMethodName = "/GreeterService/Hello" +) + // GreeterServiceClient is the client API for GreeterService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -35,7 +39,7 @@ func NewGreeterServiceClient(cc grpc.ClientConnInterface) GreeterServiceClient { func (c *greeterServiceClient) Hello(ctx context.Context, in *User1, opts ...grpc.CallOption) (*UserResponse, error) { out := new(UserResponse) - err := c.cc.Invoke(ctx, "/GreeterService/Hello", in, out, opts...) + err := c.cc.Invoke(ctx, GreeterService_Hello_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -80,7 +84,7 @@ func _GreeterService_Hello_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/GreeterService/Hello", + FullMethod: GreeterService_Hello_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(GreeterServiceServer).Hello(ctx, req.(*User1)) diff --git a/core/service/proto/wallet_dto.pb.go b/core/service/proto/wallet_dto.pb.go index 0333ebc93..70fc85c5e 100644 --- a/core/service/proto/wallet_dto.pb.go +++ b/core/service/proto/wallet_dto.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: message/wallet_dto.proto package proto diff --git a/core/service/proto/wallet_service.pb.go b/core/service/proto/wallet_service.pb.go index 3fdb0a8e9..4494d247f 100644 --- a/core/service/proto/wallet_service.pb.go +++ b/core/service/proto/wallet_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.21.12 +// protoc v3.12.4 // source: wallet_service.proto package proto diff --git a/core/service/proto/wallet_service_grpc.pb.go b/core/service/proto/wallet_service_grpc.pb.go index 9907c1ed0..856f3da7d 100644 --- a/core/service/proto/wallet_service_grpc.pb.go +++ b/core/service/proto/wallet_service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.21.12 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.12.4 // source: wallet_service.proto package proto @@ -18,6 +18,24 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + WalletService_CreateWallet_FullMethodName = "/WalletService/CreateWallet" + WalletService_GetWalletId_FullMethodName = "/WalletService/GetWalletId" + WalletService_GetWallet_FullMethodName = "/WalletService/GetWallet" + WalletService_GetWalletByCode_FullMethodName = "/WalletService/GetWalletByCode" + WalletService_GetWalletLog_FullMethodName = "/WalletService/GetWalletLog" + WalletService_Adjust_FullMethodName = "/WalletService/Adjust" + WalletService_Discount_FullMethodName = "/WalletService/Discount" + WalletService_Freeze_FullMethodName = "/WalletService/Freeze" + WalletService_Unfreeze_FullMethodName = "/WalletService/Unfreeze" + WalletService_Charge_FullMethodName = "/WalletService/Charge" + WalletService_Transfer_FullMethodName = "/WalletService/Transfer" + WalletService_RequestWithdrawal_FullMethodName = "/WalletService/RequestWithdrawal" + WalletService_ReviewTakeOut_FullMethodName = "/WalletService/ReviewTakeOut" + WalletService_FinishWithdrawal_FullMethodName = "/WalletService/FinishWithdrawal" + WalletService_PagingWalletLog_FullMethodName = "/WalletService/PagingWalletLog" +) + // WalletServiceClient is the client API for WalletService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -64,7 +82,7 @@ func NewWalletServiceClient(cc grpc.ClientConnInterface) WalletServiceClient { func (c *walletServiceClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/CreateWallet", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_CreateWallet_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -73,7 +91,7 @@ func (c *walletServiceClient) CreateWallet(ctx context.Context, in *CreateWallet func (c *walletServiceClient) GetWalletId(ctx context.Context, in *GetWalletRequest, opts ...grpc.CallOption) (*Int64, error) { out := new(Int64) - err := c.cc.Invoke(ctx, "/WalletService/GetWalletId", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_GetWalletId_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -82,7 +100,7 @@ func (c *walletServiceClient) GetWalletId(ctx context.Context, in *GetWalletRequ func (c *walletServiceClient) GetWallet(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*SWallet, error) { out := new(SWallet) - err := c.cc.Invoke(ctx, "/WalletService/GetWallet", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_GetWallet_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -91,7 +109,7 @@ func (c *walletServiceClient) GetWallet(ctx context.Context, in *Int64, opts ... func (c *walletServiceClient) GetWalletByCode(ctx context.Context, in *String, opts ...grpc.CallOption) (*SWallet, error) { out := new(SWallet) - err := c.cc.Invoke(ctx, "/WalletService/GetWalletByCode", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_GetWalletByCode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -100,7 +118,7 @@ func (c *walletServiceClient) GetWalletByCode(ctx context.Context, in *String, o func (c *walletServiceClient) GetWalletLog(ctx context.Context, in *WalletLogIDRequest, opts ...grpc.CallOption) (*SWalletLog, error) { out := new(SWalletLog) - err := c.cc.Invoke(ctx, "/WalletService/GetWalletLog", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_GetWalletLog_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -109,7 +127,7 @@ func (c *walletServiceClient) GetWalletLog(ctx context.Context, in *WalletLogIDR func (c *walletServiceClient) Adjust(ctx context.Context, in *AdjustRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/Adjust", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Adjust_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -118,7 +136,7 @@ func (c *walletServiceClient) Adjust(ctx context.Context, in *AdjustRequest, opt func (c *walletServiceClient) Discount(ctx context.Context, in *DiscountRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/Discount", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Discount_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -127,7 +145,7 @@ func (c *walletServiceClient) Discount(ctx context.Context, in *DiscountRequest, func (c *walletServiceClient) Freeze(ctx context.Context, in *FreezeRequest, opts ...grpc.CallOption) (*FreezeResponse, error) { out := new(FreezeResponse) - err := c.cc.Invoke(ctx, "/WalletService/Freeze", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Freeze_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -136,7 +154,7 @@ func (c *walletServiceClient) Freeze(ctx context.Context, in *FreezeRequest, opt func (c *walletServiceClient) Unfreeze(ctx context.Context, in *UnfreezeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/Unfreeze", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Unfreeze_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -145,7 +163,7 @@ func (c *walletServiceClient) Unfreeze(ctx context.Context, in *UnfreezeRequest, func (c *walletServiceClient) Charge(ctx context.Context, in *ChargeRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/Charge", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Charge_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -154,7 +172,7 @@ func (c *walletServiceClient) Charge(ctx context.Context, in *ChargeRequest, opt func (c *walletServiceClient) Transfer(ctx context.Context, in *TransferRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/Transfer", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_Transfer_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -163,7 +181,7 @@ func (c *walletServiceClient) Transfer(ctx context.Context, in *TransferRequest, func (c *walletServiceClient) RequestWithdrawal(ctx context.Context, in *RequestWithdrawalRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/RequestWithdrawal", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_RequestWithdrawal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -172,7 +190,7 @@ func (c *walletServiceClient) RequestWithdrawal(ctx context.Context, in *Request func (c *walletServiceClient) ReviewTakeOut(ctx context.Context, in *ReviewTakeOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/ReviewTakeOut", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_ReviewTakeOut_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -181,7 +199,7 @@ func (c *walletServiceClient) ReviewTakeOut(ctx context.Context, in *ReviewTakeO func (c *walletServiceClient) FinishWithdrawal(ctx context.Context, in *FinishTakeOutRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) - err := c.cc.Invoke(ctx, "/WalletService/FinishWithdrawal", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_FinishWithdrawal_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -190,7 +208,7 @@ func (c *walletServiceClient) FinishWithdrawal(ctx context.Context, in *FinishTa func (c *walletServiceClient) PagingWalletLog(ctx context.Context, in *PagingWalletLogRequest, opts ...grpc.CallOption) (*SPagingResult, error) { out := new(SPagingResult) - err := c.cc.Invoke(ctx, "/WalletService/PagingWalletLog", in, out, opts...) + err := c.cc.Invoke(ctx, WalletService_PagingWalletLog_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -306,7 +324,7 @@ func _WalletService_CreateWallet_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/CreateWallet", + FullMethod: WalletService_CreateWallet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).CreateWallet(ctx, req.(*CreateWalletRequest)) @@ -324,7 +342,7 @@ func _WalletService_GetWalletId_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/GetWalletId", + FullMethod: WalletService_GetWalletId_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletId(ctx, req.(*GetWalletRequest)) @@ -342,7 +360,7 @@ func _WalletService_GetWallet_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/GetWallet", + FullMethod: WalletService_GetWallet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWallet(ctx, req.(*Int64)) @@ -360,7 +378,7 @@ func _WalletService_GetWalletByCode_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/GetWalletByCode", + FullMethod: WalletService_GetWalletByCode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletByCode(ctx, req.(*String)) @@ -378,7 +396,7 @@ func _WalletService_GetWalletLog_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/GetWalletLog", + FullMethod: WalletService_GetWalletLog_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).GetWalletLog(ctx, req.(*WalletLogIDRequest)) @@ -396,7 +414,7 @@ func _WalletService_Adjust_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Adjust", + FullMethod: WalletService_Adjust_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Adjust(ctx, req.(*AdjustRequest)) @@ -414,7 +432,7 @@ func _WalletService_Discount_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Discount", + FullMethod: WalletService_Discount_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Discount(ctx, req.(*DiscountRequest)) @@ -432,7 +450,7 @@ func _WalletService_Freeze_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Freeze", + FullMethod: WalletService_Freeze_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Freeze(ctx, req.(*FreezeRequest)) @@ -450,7 +468,7 @@ func _WalletService_Unfreeze_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Unfreeze", + FullMethod: WalletService_Unfreeze_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Unfreeze(ctx, req.(*UnfreezeRequest)) @@ -468,7 +486,7 @@ func _WalletService_Charge_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Charge", + FullMethod: WalletService_Charge_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Charge(ctx, req.(*ChargeRequest)) @@ -486,7 +504,7 @@ func _WalletService_Transfer_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/Transfer", + FullMethod: WalletService_Transfer_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).Transfer(ctx, req.(*TransferRequest)) @@ -504,7 +522,7 @@ func _WalletService_RequestWithdrawal_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/RequestWithdrawal", + FullMethod: WalletService_RequestWithdrawal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).RequestWithdrawal(ctx, req.(*RequestWithdrawalRequest)) @@ -522,7 +540,7 @@ func _WalletService_ReviewTakeOut_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/ReviewTakeOut", + FullMethod: WalletService_ReviewTakeOut_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).ReviewTakeOut(ctx, req.(*ReviewTakeOutRequest)) @@ -540,7 +558,7 @@ func _WalletService_FinishWithdrawal_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/FinishWithdrawal", + FullMethod: WalletService_FinishWithdrawal_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).FinishWithdrawal(ctx, req.(*FinishTakeOutRequest)) @@ -558,7 +576,7 @@ func _WalletService_PagingWalletLog_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/WalletService/PagingWalletLog", + FullMethod: WalletService_PagingWalletLog_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WalletServiceServer).PagingWalletLog(ctx, req.(*PagingWalletLogRequest)) diff --git a/tests/domain/order_test.go b/tests/domain/order_test.go index 007f2d014..32ceacb9f 100755 --- a/tests/domain/order_test.go +++ b/tests/domain/order_test.go @@ -233,7 +233,7 @@ func TestSubmitNormalOrder(t *testing.T) { // 测试从订单重新创建订单并提交付款 func TestRebuildSubmitNormalOrder(t *testing.T) { - orderNo := "1230124001810642" + orderNo := "1230322000620396" repo := ti.Factory.GetOrderRepo() memRepo := ti.Factory.GetMemberRepo() payRepo := ti.Factory.GetPaymentRepo() @@ -260,7 +260,11 @@ func TestRebuildSubmitNormalOrder(t *testing.T) { t.FailNow() } t.Logf("提交的订单号为：%s", nio.OrderNo()) + ipo := payRepo.GetPaymentOrderByOrderNo(int(order.TRetail), nio.OrderNo()) + t.Logf("提交的支付单号为：%s", ipo.TradeNo()) + + return err = ipo.PaymentFinish("alipay", "1233535080808wr") if err == nil { t.Logf("支付的交易号为：%s,最终金额:%d", nio.OrderNo(), ipo.Get().FinalAmount) From 74df9ddd2f8f245cf2db0a0bd7c42facb856d47e Mon Sep 17 00:00:00 2001 From: jarrysix Date: Wed, 22 Mar 2023 19:01:00 +0800 Subject: [PATCH 14/25] fix: submit order response --- core/domain/interface/order/normal_order.go | 3 + core/domain/order/normal_order.go | 84 ++++++++++++++------- core/service/impl/2.order_service.go | 16 ++++ tests/service/order_service_test.go | 22 ++++-- 4 files changed, 91 insertions(+), 34 deletions(-) diff --git a/core/domain/interface/order/normal_order.go b/core/domain/interface/order/normal_order.go index ecedf2ad4..276235785 100755 --- a/core/domain/interface/order/normal_order.go +++ b/core/domain/interface/order/normal_order.go @@ -2,6 +2,7 @@ package order import ( "github.com/ixre/go2o/core/domain/interface/cart" + "github.com/ixre/go2o/core/domain/interface/payment" "github.com/ixre/go2o/core/domain/interface/promotion" ) @@ -16,6 +17,8 @@ type ( OnlinePaymentTradeFinish() error // Submit 提交订单。如遇拆单,需均摊优惠抵扣金额到商品 Submit() error + // BreakPaymentOrder 拆分支付单 + BreakPaymentOrder() ([]payment.IPaymentOrder, error) // Cancel 取消订单 Cancel(buyerCancel bool, reason string) error diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index c21ef4d94..aea72389a 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -471,6 +471,28 @@ func (o *normalOrderImpl) GetPaymentOrder() payment.IPaymentOrder { return o._payOrder } +// BreakPaymentOrder implements order.INormalOrder +func (o *normalOrderImpl) BreakPaymentOrder() ([]payment.IPaymentOrder, error) { + ip := o.GetPaymentOrder() + if ip == nil { + return nil, errors.New("payment order has been breaked") + } + subOrders := o.GetSubOrders() + if len(subOrders) < 2 { + return nil, errors.New("payment order not nesseary break") + } + ipv := ip.Get() + arr := make([]payment.IPaymentOrder, 0) + for _, v := range subOrders { + sp, err := o.createSubPaymentOrder(&ipv, v) + if err != nil { + return nil, err + } + arr = append(arr, sp) + } + return arr, nil +} + // BuildCart 通过订单创建购物车 func (o *normalOrderImpl) BuildCart() cart.ICart { bv := o.baseOrderImpl.baseValue @@ -868,35 +890,41 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { return list, nil } -// createPaymentSubOrder 生成一个用于合并支付的子订单 //todo: 删除 -func (o *normalOrderImpl) createPaymentSubOrder() (order.ISubOrder, error) { - orderNo := o.OrderNo() - breakStatus := order.BreakDefault - vo := o.baseValue - v := &order.NormalSubOrder{ - OrderNo: orderNo, - BuyerId: o.baseValue.BuyerId, - VendorId: 0, - OrderId: o.GetAggregateRootId(), - Subject: "支付子订单", - ShopId: 0, - ShopName: "", - ItemCount: vo.ItemCount, - // 总金额 - ItemAmount: vo.ItemAmount, - // 减免金额(包含优惠券金额) - DiscountAmount: vo.DiscountAmount, - ExpressFee: vo.ExpressFee, - PackageFee: vo.PackageFee, - FinalAmount: vo.FinalAmount, - BuyerComment: "", - Remark: "", - Status: order.StatAwaitingPayment, - BreakStatus: breakStatus, - UpdateTime: o.baseValue.UpdateTime, +// createSubPaymentOrder 生成一个子订单的支付单 +func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISubOrder) (payment.IPaymentOrder, error) { + no := o.baseValue + so := iso.GetValue() + deductAmount := int(math.Round(float64(po.DeductAmount)/100*(float64(so.FinalAmount)/float64(no.FinalAmount))) * 100) + v := &payment.Order{ + Id: 0, + SellerId: int(so.VendorId), + TradeType: "", + TradeNo: so.OrderNo, + OrderType: int(order.TRetail), + SubOrder: 1, + OutOrderNo: so.OrderNo, + Subject: "支付单#拆分子订单", + BuyerId: o.baseValue.BuyerId, + PayerId: 0, + ItemAmount: so.ItemAmount, + DiscountAmount: so.DiscountAmount, + AdjustAmount: 0, + TotalAmount: so.ItemAmount, + DeductAmount: int64(deductAmount), + ProcedureFee: 0, + PaidAmount: 0, + PayFlag: po.PayFlag, + FinalFlag: po.FinalFlag, + State: po.State, + SubmitTime: po.SubmitTime, + ExpiresTime: po.ExpiresTime, + UpdateTime: time.Now().Unix(), + TradeMethods: []*payment.TradeMethodData{}, } - isp := o.repo.CreateNormalSubOrder(v) - _, err := isp.Submit() + v.FinalAmount = v.ItemAmount - v.DeductAmount + v.ProcedureFee + v.AdjustAmount + + isp := o.payRepo.CreatePaymentOrder(v) + err := isp.Submit() return isp, err } diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 324aae13c..c0574e885 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -13,6 +13,7 @@ import ( "bytes" "context" "errors" + "log" "github.com/ixre/go2o/core/domain/interface/cart" "github.com/ixre/go2o/core/domain/interface/express" @@ -332,6 +333,21 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* if r.WithDetail { // 获取支付单信息 po := s.payRepo.GetPaymentOrder(r.OrderNo) + // 待支付,且无子订单相关的支付单,则需要拆分支付单 + if po == nil && ret.Status == order.StatAwaitingPayment { + io := s.manager.GetOrderById(c.OrderId) + if io != nil { + poList, err := io.(order.INormalOrder).BreakPaymentOrder() + if err != nil { + log.Printf("[ GO2O][ ERROR]: Break payment order failed, orderNo=%s,error=%s \n", r.OrderNo, err.Error()) + } + for _, v := range poList { + if v.TradeNo() == r.OrderNo { + po = s.payRepo.GetPaymentOrder(r.OrderNo) + } + } + } + } if po != nil { pv := po.Get() ret.DeductAmount = int32(pv.DeductAmount) diff --git a/tests/service/order_service_test.go b/tests/service/order_service_test.go index 462408c1a..ba58e4635 100644 --- a/tests/service/order_service_test.go +++ b/tests/service/order_service_test.go @@ -8,18 +8,20 @@ import ( "github.com/ixre/go2o/core/domain/interface/order" "github.com/ixre/go2o/core/service/impl" "github.com/ixre/go2o/core/service/proto" + "github.com/ixre/gof/types/typeconv" ) +// 测试提交普通订单 func TestSubmitNormalOrder(t *testing.T) { var memberId int64 = 1 ret, err := impl.OrderService.SubmitOrder( context.TODO(), &proto.SubmitOrderRequest{ - BuyerId: memberId, - OrderType: int32(order.TRetail), - AddressId: 1, - Subject: "", - CouponCode: "", + BuyerId: memberId, + OrderType: int32(order.TRetail), + AddressId: 1, + Subject: "", + CouponCode: "", BalanceDeduct: false, }) if err != nil { @@ -37,4 +39,12 @@ func TestSubmitOrderSubjectPostgresInsert(t *testing.T) { t.Log("----", s3) } - +// 测试获取子订单 +func TestGetSubOrder(t *testing.T) { + orderNo := "1230322007642433" + ret, _ := impl.OrderService.GetOrder(context.TODO(), &proto.OrderRequest{ + OrderNo: orderNo, + WithDetail: false, + }) + t.Log(typeconv.MustJson(ret)) +} From ebbaf779d490a0aed19af9a01fa885a444516122 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Fri, 24 Mar 2023 14:09:56 +0800 Subject: [PATCH 15/25] fix: break sub payment order --- core/domain/order/normal_order.go | 2 +- core/service/impl/2.order_service.go | 3 ++- tests/domain/payment_test.go | 19 +++++++++++++++++-- tests/service/order_service_test.go | 8 +++++++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index aea72389a..19a995a42 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -894,7 +894,7 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISubOrder) (payment.IPaymentOrder, error) { no := o.baseValue so := iso.GetValue() - deductAmount := int(math.Round(float64(po.DeductAmount)/100*(float64(so.FinalAmount)/float64(no.FinalAmount))) * 100) + deductAmount := int(math.Round(float64(po.DeductAmount)*(float64(so.FinalAmount)/float64(no.FinalAmount)))) v := &payment.Order{ Id: 0, SellerId: int(so.VendorId), diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index c0574e885..ad004f817 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -330,9 +330,10 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* c := s.manager.Unified(r.OrderNo, true).Complex() if c != nil { ret := parser.OrderDto(c) - if r.WithDetail { + if r.WithDetail { // 获取支付单信息 po := s.payRepo.GetPaymentOrder(r.OrderNo) + po = nil // 待支付,且无子订单相关的支付单,则需要拆分支付单 if po == nil && ret.Status == order.StatAwaitingPayment { io := s.manager.GetOrderById(c.OrderId) diff --git a/tests/domain/payment_test.go b/tests/domain/payment_test.go index 7d8f02b7e..65d93182e 100644 --- a/tests/domain/payment_test.go +++ b/tests/domain/payment_test.go @@ -1,6 +1,7 @@ package domain import ( + "math" "testing" "time" @@ -42,8 +43,6 @@ func TestWalletDeductPaymentOrder(t *testing.T) { } } - - func TestCreateTradeNo(t *testing.T) { for i := 0; i < 10; i++ { println(domain.NewTradeNo(0, i)) @@ -110,3 +109,19 @@ func TestPaymentOrderTradeFinish(t *testing.T) { t.Failed() } } + +// 测试拆分支付单均摊抵扣金额 +func TestBreakPaymentOrderAVGDeductAmount(t *testing.T) { + finalAmount := 10039 + deductAmount := 38 + finalAmount1 := 3021 + finalAmount2 := 7018 + + avgAmount1 := int(math.Round(float64(deductAmount) * (float64(finalAmount1) / float64(finalAmount)))) + avgAmount2 := int(math.Round(float64(deductAmount) * (float64(finalAmount2) / float64(finalAmount)))) + t.Log(avgAmount1, avgAmount2) + + if avgAmount1+avgAmount2 != deductAmount { + t.FailNow() + } +} diff --git a/tests/service/order_service_test.go b/tests/service/order_service_test.go index ba58e4635..61f24aa1a 100644 --- a/tests/service/order_service_test.go +++ b/tests/service/order_service_test.go @@ -41,10 +41,16 @@ func TestSubmitOrderSubjectPostgresInsert(t *testing.T) { // 测试获取子订单 func TestGetSubOrder(t *testing.T) { + // -- 更新状态 + // update sale_sub_order set status = 1 WHERE order_no IN('1230322007642433','1230322001642486') + // -- 更新deductAmount + // update pay_order set deduct_amount = deduct_amount+1000,final_amount = final_amount-1000 where id=670 + // -- 删除已生成的支付单 + // delete FROM pay_order where out_order_no IN('1230322007642433','1230322001642486') orderNo := "1230322007642433" ret, _ := impl.OrderService.GetOrder(context.TODO(), &proto.OrderRequest{ OrderNo: orderNo, - WithDetail: false, + WithDetail: true, }) t.Log(typeconv.MustJson(ret)) } From 8b6627a7cd7e179def0876ad95ee154a1baeeae0 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Fri, 24 Mar 2023 14:38:45 +0800 Subject: [PATCH 16/25] fix: break sub payment order --- core/domain/interface/payment/payment.go | 2 + core/domain/order/normal_order.go | 4 +- core/repos/payment_repo.go | 8 ++ core/service/idl/order_service.proto | 2 + core/service/impl/2.order_service.go | 63 ++++++--- core/service/proto/order_service.pb.go | 143 ++++++++++---------- core/service/proto/order_service_grpc.pb.go | 39 ++++++ 7 files changed, 172 insertions(+), 89 deletions(-) diff --git a/core/domain/interface/payment/payment.go b/core/domain/interface/payment/payment.go index ce9361790..bee4e43b8 100755 --- a/core/domain/interface/payment/payment.go +++ b/core/domain/interface/payment/payment.go @@ -163,6 +163,8 @@ type ( IPaymentRepo interface { // GetPaymentOrderById 根据编号获取支付单 GetPaymentOrderById(id int) IPaymentOrder + // DeletePaymentOrder 拆分后删除父支付单 + DeletePaymentOrder(id int) error // GetPaymentOrder 根据支付单号获取支付单 GetPaymentOrder(paymenOrderNo string) IPaymentOrder // GetPaymentBySalesOrderId 根据订单号获取支付单 diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index 19a995a42..d6141d211 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -490,6 +490,8 @@ func (o *normalOrderImpl) BreakPaymentOrder() ([]payment.IPaymentOrder, error) { } arr = append(arr, sp) } + o.payRepo.DeletePaymentOrder(ip.GetAggregateRootId()) + o._payOrder = nil return arr, nil } @@ -894,7 +896,7 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISubOrder) (payment.IPaymentOrder, error) { no := o.baseValue so := iso.GetValue() - deductAmount := int(math.Round(float64(po.DeductAmount)*(float64(so.FinalAmount)/float64(no.FinalAmount)))) + deductAmount := int(math.Round(float64(po.DeductAmount) * (float64(so.FinalAmount) / float64(no.FinalAmount)))) v := &payment.Order{ Id: 0, SellerId: int(so.VendorId), diff --git a/core/repos/payment_repo.go b/core/repos/payment_repo.go index 1d4f0ad4a..b6ec38b2c 100755 --- a/core/repos/payment_repo.go +++ b/core/repos/payment_repo.go @@ -82,6 +82,14 @@ func (p *paymentRepoImpl) getPaymentOrderCkByNo(orderNO string) string { return fmt.Sprintf("go2o:repo:pay:order:%s", orderNO) } + +// DeletePaymentOrder 拆分后删除父支付单 +func (p *paymentRepoImpl) DeletePaymentOrder(id int) error { + key := p.getPaymentOrderCk(id) + p.Storage.Delete(key) + return p._orm.DeleteByPk(payment.Order{}, id) +} + // 根据编号获取支付单 func (p *paymentRepoImpl) GetPaymentOrderById(id int) payment.IPaymentOrder { if id <= 0 { diff --git a/core/service/idl/order_service.proto b/core/service/idl/order_service.proto index f87068f05..e8bf30bae 100755 --- a/core/service/idl/order_service.proto +++ b/core/service/idl/order_service.proto @@ -22,6 +22,8 @@ service OrderService { // 获取子订单,orderId rpc GetOrder (OrderRequest) returns (SSingleOrder) { } + // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) + rpc BreakPaymentOrder(OrderNoV2)returns(Result){} // 交易单现金支付,orderId rpc TradeOrderCashPay (Int64) returns (Result) { } diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index ad004f817..e89ccecde 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -322,6 +322,31 @@ func (s *orderServiceImpl) GetParentOrder(c context.Context, req *proto.OrderNoV return parser.ParentOrderDto(ord), nil } +// breakPaymentOrder 拆分支付单,返回拆分结果和子支付单 +func (s *orderServiceImpl) breakPaymentOrder(orderNo string, state int, parentOrderId int) (bool, payment.IPaymentOrder, error) { + // 获取支付单信息 + po := s.payRepo.GetPaymentOrder(orderNo) + // 待支付,且无子订单相关的支付单,则需要拆分支付单 + if po == nil && state != order.StatAwaitingPayment { + if parentOrderId <= 0 { + return false, po, nil + } + io := s.manager.GetOrderById(int64(parentOrderId)) + if io != nil { + poList, err := io.(order.INormalOrder).BreakPaymentOrder() + if err != nil { + log.Printf("[ GO2O][ ERROR]: Break payment order failed, orderNo=%s,error=%s \n", orderNo, err.Error()) + } + for _, v := range poList { + if v.TradeNo() == orderNo { + return true, v, nil + } + } + } + } + return false, po, nil +} + // GetOrder 获取订单和商品项信息 func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (*proto.SSingleOrder, error) { if len(r.OrderNo) == 0 { @@ -330,25 +355,8 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* c := s.manager.Unified(r.OrderNo, true).Complex() if c != nil { ret := parser.OrderDto(c) - if r.WithDetail { - // 获取支付单信息 - po := s.payRepo.GetPaymentOrder(r.OrderNo) - po = nil - // 待支付,且无子订单相关的支付单,则需要拆分支付单 - if po == nil && ret.Status == order.StatAwaitingPayment { - io := s.manager.GetOrderById(c.OrderId) - if io != nil { - poList, err := io.(order.INormalOrder).BreakPaymentOrder() - if err != nil { - log.Printf("[ GO2O][ ERROR]: Break payment order failed, orderNo=%s,error=%s \n", r.OrderNo, err.Error()) - } - for _, v := range poList { - if v.TradeNo() == r.OrderNo { - po = s.payRepo.GetPaymentOrder(r.OrderNo) - } - } - } - } + if r.WithDetail { + _, po, _ := s.breakPaymentOrder(r.OrderNo, int(ret.Status), int(c.OrderId)) if po != nil { pv := po.Get() ret.DeductAmount = int32(pv.DeductAmount) @@ -383,6 +391,23 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* return nil, order.ErrNoSuchOrder } +// BreakPaymentOrder 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) +func (s *orderServiceImpl) BreakPaymentOrder(_ context.Context, r *proto.OrderNoV2) (*proto.Result, error) { + iso := s.repo.GetSubOrderByOrderNo(r.Value) + if iso == nil { + return s.error(order.ErrNoSuchOrder), nil + } + rv := iso.GetValue() + ret, _, err := s.breakPaymentOrder(rv.OrderNo, int(rv.Status), int(rv.OrderId)) + if err != nil { + return s.error(err), nil + } + if !ret { + return &proto.Result{ErrCode: 2, ErrMsg: "支付单无需拆分或已拆分"}, nil + } + return &proto.Result{ErrMsg: "拆分成功"}, nil +} + func (s *orderServiceImpl) parseTradeMethodDataDto(src *payment.TradeMethodData) *proto.SOrderPayChanData { return &proto.SOrderPayChanData{ ChanId: int32(src.Method), diff --git a/core/service/proto/order_service.pb.go b/core/service/proto/order_service.pb.go index 7d97155d2..ee150b7cd 100644 --- a/core/service/proto/order_service.pb.go +++ b/core/service/proto/order_service.pb.go @@ -89,7 +89,7 @@ var file_order_service_proto_rawDesc = []byte{ 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, - 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x32, 0x99, 0x06, 0x0a, 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x32, 0xc5, 0x06, 0x0a, 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x4f, 0x72, @@ -103,45 +103,48 @@ var file_order_service_proto_rawDesc = []byte{ 0x1a, 0x0d, 0x2e, 0x53, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x2a, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0d, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x53, - 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x26, 0x0a, - 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x61, 0x73, 0x68, 0x50, - 0x61, 0x79, 0x12, 0x06, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, - 0x18, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x5f, 0x12, - 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, - 0x70, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x12, 0x13, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x00, 0x12, 0x23, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x12, 0x1a, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x50, 0x69, 0x63, 0x6b, 0x55, - 0x70, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, 0x68, 0x69, 0x70, 0x12, 0x15, - 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x2a, 0x0a, + 0x11, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x1a, 0x07, + 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x26, 0x0a, 0x11, 0x54, 0x72, 0x61, + 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x61, 0x73, 0x68, 0x50, 0x61, 0x79, 0x12, 0x06, + 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, + 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x2e, 0x54, 0x72, + 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, - 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x62, 0x69, 0x64, - 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x42, 0x79, 0x74, 0x65, - 0x73, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x53, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, - 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x17, 0x2e, - 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, - 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x5f, 0x12, 0x14, 0x2e, 0x50, 0x72, + 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x22, 0x00, 0x12, + 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, + 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x23, + 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, + 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, + 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x69, + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x2e, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, + 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x50, 0x69, 0x63, 0x6b, 0x55, 0x70, 0x12, 0x08, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, 0x68, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x24, 0x0a, 0x0d, + 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x08, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x62, 0x69, 0x64, 0x12, 0x08, 0x2e, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, + 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x08, 0x2e, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x17, 0x2e, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x1f, + 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, + 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -183,36 +186,38 @@ var file_order_service_proto_depIdxs = []int32{ 2, // 1: OrderService.PrepareOrder:input_type -> PrepareOrderRequest 3, // 2: OrderService.GetParentOrder:input_type -> OrderNoV2 0, // 3: OrderService.GetOrder:input_type -> OrderRequest - 4, // 4: OrderService.TradeOrderCashPay:input_type -> Int64 - 5, // 5: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest - 2, // 6: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest - 6, // 7: OrderService.CancelOrder:input_type -> CancelOrderRequest - 7, // 8: OrderService.ConfirmOrder:input_type -> OrderNo - 8, // 9: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest - 7, // 10: OrderService.PickUp:input_type -> OrderNo - 9, // 11: OrderService.Ship:input_type -> OrderShipmentRequest - 7, // 12: OrderService.BuyerReceived:input_type -> OrderNo - 7, // 13: OrderService.forbid:input_type -> OrderNo - 7, // 14: OrderService.LogBytes:input_type -> OrderNo - 10, // 15: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest - 11, // 16: OrderService.SubmitOrder:output_type -> OrderSubmitResponse - 12, // 17: OrderService.PrepareOrder:output_type -> PrepareOrderResponse - 13, // 18: OrderService.GetParentOrder:output_type -> SParentOrder - 14, // 19: OrderService.GetOrder:output_type -> SSingleOrder - 15, // 20: OrderService.TradeOrderCashPay:output_type -> Result - 15, // 21: OrderService.TradeOrderUpdateTicket:output_type -> Result - 16, // 22: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap - 15, // 23: OrderService.CancelOrder:output_type -> Result - 15, // 24: OrderService.ConfirmOrder:output_type -> Result - 15, // 25: OrderService.ChangeShipmentAddress:output_type -> Result - 15, // 26: OrderService.PickUp:output_type -> Result - 15, // 27: OrderService.Ship:output_type -> Result - 15, // 28: OrderService.BuyerReceived:output_type -> Result - 15, // 29: OrderService.forbid:output_type -> Result - 17, // 30: OrderService.LogBytes:output_type -> String - 18, // 31: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse - 16, // [16:32] is the sub-list for method output_type - 0, // [0:16] is the sub-list for method input_type + 3, // 4: OrderService.BreakPaymentOrder:input_type -> OrderNoV2 + 4, // 5: OrderService.TradeOrderCashPay:input_type -> Int64 + 5, // 6: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest + 2, // 7: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest + 6, // 8: OrderService.CancelOrder:input_type -> CancelOrderRequest + 7, // 9: OrderService.ConfirmOrder:input_type -> OrderNo + 8, // 10: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest + 7, // 11: OrderService.PickUp:input_type -> OrderNo + 9, // 12: OrderService.Ship:input_type -> OrderShipmentRequest + 7, // 13: OrderService.BuyerReceived:input_type -> OrderNo + 7, // 14: OrderService.forbid:input_type -> OrderNo + 7, // 15: OrderService.LogBytes:input_type -> OrderNo + 10, // 16: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest + 11, // 17: OrderService.SubmitOrder:output_type -> OrderSubmitResponse + 12, // 18: OrderService.PrepareOrder:output_type -> PrepareOrderResponse + 13, // 19: OrderService.GetParentOrder:output_type -> SParentOrder + 14, // 20: OrderService.GetOrder:output_type -> SSingleOrder + 15, // 21: OrderService.BreakPaymentOrder:output_type -> Result + 15, // 22: OrderService.TradeOrderCashPay:output_type -> Result + 15, // 23: OrderService.TradeOrderUpdateTicket:output_type -> Result + 16, // 24: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap + 15, // 25: OrderService.CancelOrder:output_type -> Result + 15, // 26: OrderService.ConfirmOrder:output_type -> Result + 15, // 27: OrderService.ChangeShipmentAddress:output_type -> Result + 15, // 28: OrderService.PickUp:output_type -> Result + 15, // 29: OrderService.Ship:output_type -> Result + 15, // 30: OrderService.BuyerReceived:output_type -> Result + 15, // 31: OrderService.forbid:output_type -> Result + 17, // 32: OrderService.LogBytes:output_type -> String + 18, // 33: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse + 17, // [17:34] is the sub-list for method output_type + 0, // [0:17] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name diff --git a/core/service/proto/order_service_grpc.pb.go b/core/service/proto/order_service_grpc.pb.go index 264b20ce0..200a3304c 100644 --- a/core/service/proto/order_service_grpc.pb.go +++ b/core/service/proto/order_service_grpc.pb.go @@ -23,6 +23,7 @@ const ( OrderService_PrepareOrder_FullMethodName = "/OrderService/PrepareOrder" OrderService_GetParentOrder_FullMethodName = "/OrderService/GetParentOrder" OrderService_GetOrder_FullMethodName = "/OrderService/GetOrder" + OrderService_BreakPaymentOrder_FullMethodName = "/OrderService/BreakPaymentOrder" OrderService_TradeOrderCashPay_FullMethodName = "/OrderService/TradeOrderCashPay" OrderService_TradeOrderUpdateTicket_FullMethodName = "/OrderService/TradeOrderUpdateTicket" OrderService_PrepareOrderWithCoupon__FullMethodName = "/OrderService/PrepareOrderWithCoupon_" @@ -49,6 +50,8 @@ type OrderServiceClient interface { GetParentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*SParentOrder, error) // 获取子订单,orderId GetOrder(ctx context.Context, in *OrderRequest, opts ...grpc.CallOption) (*SSingleOrder, error) + // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) + BreakPaymentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*Result, error) // 交易单现金支付,orderId TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) // 上传交易单发票 @@ -119,6 +122,15 @@ func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderRequest, opt return out, nil } +func (c *orderServiceClient) BreakPaymentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*Result, error) { + out := new(Result) + err := c.cc.Invoke(ctx, OrderService_BreakPaymentOrder_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *orderServiceClient) TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) { out := new(Result) err := c.cc.Invoke(ctx, OrderService_TradeOrderCashPay_FullMethodName, in, out, opts...) @@ -239,6 +251,8 @@ type OrderServiceServer interface { GetParentOrder(context.Context, *OrderNoV2) (*SParentOrder, error) // 获取子订单,orderId GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) + // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) + BreakPaymentOrder(context.Context, *OrderNoV2) (*Result, error) // 交易单现金支付,orderId TradeOrderCashPay(context.Context, *Int64) (*Result, error) // 上传交易单发票 @@ -282,6 +296,9 @@ func (UnimplementedOrderServiceServer) GetParentOrder(context.Context, *OrderNoV func (UnimplementedOrderServiceServer) GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) { return nil, status.Errorf(codes.Unimplemented, "method GetOrder not implemented") } +func (UnimplementedOrderServiceServer) BreakPaymentOrder(context.Context, *OrderNoV2) (*Result, error) { + return nil, status.Errorf(codes.Unimplemented, "method BreakPaymentOrder not implemented") +} func (UnimplementedOrderServiceServer) TradeOrderCashPay(context.Context, *Int64) (*Result, error) { return nil, status.Errorf(codes.Unimplemented, "method TradeOrderCashPay not implemented") } @@ -403,6 +420,24 @@ func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _OrderService_BreakPaymentOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(OrderNoV2) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServiceServer).BreakPaymentOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: OrderService_BreakPaymentOrder_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServiceServer).BreakPaymentOrder(ctx, req.(*OrderNoV2)) + } + return interceptor(ctx, in, info, handler) +} + func _OrderService_TradeOrderCashPay_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(Int64) if err := dec(in); err != nil { @@ -642,6 +677,10 @@ var OrderService_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetOrder", Handler: _OrderService_GetOrder_Handler, }, + { + MethodName: "BreakPaymentOrder", + Handler: _OrderService_BreakPaymentOrder_Handler, + }, { MethodName: "TradeOrderCashPay", Handler: _OrderService_TradeOrderCashPay_Handler, From 6eef6134df1a7923da79ece30b06bc588f09d2ea Mon Sep 17 00:00:00 2001 From: jarrysix Date: Fri, 24 Mar 2023 15:03:16 +0800 Subject: [PATCH 17/25] fix: break sub payment order --- core/domain/order/normal_order.go | 6 +- core/service/idl/order_service.proto | 8 +- core/service/impl/2.order_service.go | 30 ++- core/service/proto/order_service.pb.go | 284 ++++++++++++-------- core/service/proto/order_service_grpc.pb.go | 12 +- tests/service/order_service_test.go | 9 + 6 files changed, 220 insertions(+), 129 deletions(-) diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index d6141d211..b4de4a959 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -894,8 +894,12 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { // createSubPaymentOrder 生成一个子订单的支付单 func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISubOrder) (payment.IPaymentOrder, error) { - no := o.baseValue so := iso.GetValue() + sp := o.payRepo.GetPaymentOrder(so.OrderNo) + if sp != nil { + return sp, errors.New("子订单已拆分支付单") + } + no := o.baseValue deductAmount := int(math.Round(float64(po.DeductAmount) * (float64(so.FinalAmount) / float64(no.FinalAmount)))) v := &payment.Order{ Id: 0, diff --git a/core/service/idl/order_service.proto b/core/service/idl/order_service.proto index e8bf30bae..6b8bbf9b9 100755 --- a/core/service/idl/order_service.proto +++ b/core/service/idl/order_service.proto @@ -23,7 +23,7 @@ service OrderService { rpc GetOrder (OrderRequest) returns (SSingleOrder) { } // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) - rpc BreakPaymentOrder(OrderNoV2)returns(Result){} + rpc BreakPaymentOrder(BreakPaymentRequest)returns(Result){} // 交易单现金支付,orderId rpc TradeOrderCashPay (Int64) returns (Result) { } @@ -66,4 +66,10 @@ message OrderRequest{ string orderNo = 1; // 是否返回详细信息 bool withDetail = 2; +} + +// 拆分支付单请求 +message BreakPaymentRequest{ + // 支付单 + string paymentOrderNo = 1; } \ No newline at end of file diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index e89ccecde..3b689e6d4 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -392,20 +392,26 @@ func (s *orderServiceImpl) GetOrder(_ context.Context, r *proto.OrderRequest) (* } // BreakPaymentOrder 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) -func (s *orderServiceImpl) BreakPaymentOrder(_ context.Context, r *proto.OrderNoV2) (*proto.Result, error) { - iso := s.repo.GetSubOrderByOrderNo(r.Value) - if iso == nil { - return s.error(order.ErrNoSuchOrder), nil - } - rv := iso.GetValue() - ret, _, err := s.breakPaymentOrder(rv.OrderNo, int(rv.Status), int(rv.OrderId)) - if err != nil { - return s.error(err), nil +func (s *orderServiceImpl) BreakPaymentOrder(_ context.Context, r *proto.BreakPaymentRequest) (*proto.Result, error) { + ip := s.payRepo.GetPaymentOrder(r.PaymentOrderNo) + if ip == nil { + return s.error(payment.ErrNoSuchPaymentOrder), nil } - if !ret { - return &proto.Result{ErrCode: 2, ErrMsg: "支付单无需拆分或已拆分"}, nil + rv := ip.Get() + io := s.manager.GetOrderByNo(rv.OutOrderNo) + if io == nil { + return s.error(order.ErrNoSuchOrder), nil + } else { + ino := io.(order.INormalOrder) + if ino == nil { + return &proto.Result{ErrCode: 2, ErrMsg: "订单不支持拆分支付单"}, nil + } + _, err := ino.BreakPaymentOrder() + if err != nil { + return s.error(err), nil + } } - return &proto.Result{ErrMsg: "拆分成功"}, nil + return &proto.Result{}, nil } func (s *orderServiceImpl) parseTradeMethodDataDto(src *payment.TradeMethodData) *proto.SOrderPayChanData { diff --git a/core/service/proto/order_service.pb.go b/core/service/proto/order_service.pb.go index ee150b7cd..319a94d8c 100644 --- a/core/service/proto/order_service.pb.go +++ b/core/service/proto/order_service.pb.go @@ -78,6 +78,55 @@ func (x *OrderRequest) GetWithDetail() bool { return false } +// 拆分支付单请求 +type BreakPaymentRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // 支付单 + PaymentOrderNo string `protobuf:"bytes,1,opt,name=paymentOrderNo,proto3" json:"paymentOrderNo"` +} + +func (x *BreakPaymentRequest) Reset() { + *x = BreakPaymentRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_order_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *BreakPaymentRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BreakPaymentRequest) ProtoMessage() {} + +func (x *BreakPaymentRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_service_proto_msgTypes[1] + 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 BreakPaymentRequest.ProtoReflect.Descriptor instead. +func (*BreakPaymentRequest) Descriptor() ([]byte, []int) { + return file_order_service_proto_rawDescGZIP(), []int{1} +} + +func (x *BreakPaymentRequest) GetPaymentOrderNo() string { + if x != nil { + return x.PaymentOrderNo + } + return "" +} + var File_order_service_proto protoreflect.FileDescriptor var file_order_service_proto_rawDesc = []byte{ @@ -89,62 +138,66 @@ var file_order_service_proto_rawDesc = []byte{ 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x77, 0x69, 0x74, 0x68, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x77, 0x69, 0x74, 0x68, - 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x32, 0xc5, 0x06, 0x0a, 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x6d, 0x69, - 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x50, 0x72, 0x65, 0x70, - 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, - 0x1a, 0x0d, 0x2e, 0x53, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, - 0x00, 0x12, 0x2a, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0d, 0x2e, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x53, - 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x2a, 0x0a, - 0x11, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x1a, 0x07, - 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x26, 0x0a, 0x11, 0x54, 0x72, 0x61, - 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x61, 0x73, 0x68, 0x50, 0x61, 0x79, 0x12, 0x06, - 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x2e, 0x54, 0x72, - 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, - 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x5f, 0x12, 0x14, 0x2e, 0x50, 0x72, - 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x22, 0x00, 0x12, - 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, - 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x23, - 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, - 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x69, - 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x2e, 0x43, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x50, 0x69, 0x63, 0x6b, 0x55, 0x70, 0x12, 0x08, 0x2e, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, 0x68, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x24, 0x0a, 0x0d, - 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x08, 0x2e, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x62, 0x69, 0x64, 0x12, 0x08, 0x2e, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x08, 0x2e, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, 0x07, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, - 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, - 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x17, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x1f, - 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, - 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x22, 0x3d, 0x0a, 0x13, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x50, + 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, + 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x32, 0xcf, 0x06, 0x0a, 0x0c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0c, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, + 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x2d, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x12, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x56, 0x32, 0x1a, + 0x0d, 0x2e, 0x53, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, + 0x12, 0x2a, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0d, 0x2e, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x53, 0x53, + 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x34, 0x0a, 0x11, + 0x42, 0x72, 0x65, 0x61, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x12, 0x14, 0x2e, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x22, 0x00, 0x12, 0x26, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x43, 0x61, 0x73, 0x68, 0x50, 0x61, 0x79, 0x12, 0x06, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x1a, + 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x16, 0x54, 0x72, + 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x12, 0x18, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, + 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x17, 0x50, 0x72, 0x65, + 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, + 0x70, 0x6f, 0x6e, 0x5f, 0x12, 0x14, 0x2e, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0a, 0x2e, 0x53, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, + 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x23, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x72, 0x6d, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x15, + 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, + 0x50, 0x69, 0x63, 0x6b, 0x55, 0x70, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, + 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x28, 0x0a, 0x04, 0x53, + 0x68, 0x69, 0x70, 0x12, 0x15, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x68, 0x69, 0x70, 0x6d, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x75, 0x79, 0x65, 0x72, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, + 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1d, 0x0a, 0x06, 0x66, + 0x6f, 0x72, 0x62, 0x69, 0x64, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x1a, + 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x1f, 0x0a, 0x08, 0x4c, 0x6f, + 0x67, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x08, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, + 0x1a, 0x07, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x13, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x12, 0x17, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x62, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, + 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -159,63 +212,64 @@ func file_order_service_proto_rawDescGZIP() []byte { return file_order_service_proto_rawDescData } -var file_order_service_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_order_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_order_service_proto_goTypes = []interface{}{ (*OrderRequest)(nil), // 0: OrderRequest - (*SubmitOrderRequest)(nil), // 1: SubmitOrderRequest - (*PrepareOrderRequest)(nil), // 2: PrepareOrderRequest - (*OrderNoV2)(nil), // 3: OrderNoV2 - (*Int64)(nil), // 4: Int64 - (*TradeOrderTicketRequest)(nil), // 5: TradeOrderTicketRequest - (*CancelOrderRequest)(nil), // 6: CancelOrderRequest - (*OrderNo)(nil), // 7: OrderNo - (*ChangeOrderAddressRequest)(nil), // 8: ChangeOrderAddressRequest - (*OrderShipmentRequest)(nil), // 9: OrderShipmentRequest - (*QueryRebateListRequest)(nil), // 10: QueryRebateListRequest - (*OrderSubmitResponse)(nil), // 11: OrderSubmitResponse - (*PrepareOrderResponse)(nil), // 12: PrepareOrderResponse - (*SParentOrder)(nil), // 13: SParentOrder - (*SSingleOrder)(nil), // 14: SSingleOrder - (*Result)(nil), // 15: Result - (*StringMap)(nil), // 16: StringMap - (*String)(nil), // 17: String - (*QueryRebateListResponse)(nil), // 18: QueryRebateListResponse + (*BreakPaymentRequest)(nil), // 1: BreakPaymentRequest + (*SubmitOrderRequest)(nil), // 2: SubmitOrderRequest + (*PrepareOrderRequest)(nil), // 3: PrepareOrderRequest + (*OrderNoV2)(nil), // 4: OrderNoV2 + (*Int64)(nil), // 5: Int64 + (*TradeOrderTicketRequest)(nil), // 6: TradeOrderTicketRequest + (*CancelOrderRequest)(nil), // 7: CancelOrderRequest + (*OrderNo)(nil), // 8: OrderNo + (*ChangeOrderAddressRequest)(nil), // 9: ChangeOrderAddressRequest + (*OrderShipmentRequest)(nil), // 10: OrderShipmentRequest + (*QueryRebateListRequest)(nil), // 11: QueryRebateListRequest + (*OrderSubmitResponse)(nil), // 12: OrderSubmitResponse + (*PrepareOrderResponse)(nil), // 13: PrepareOrderResponse + (*SParentOrder)(nil), // 14: SParentOrder + (*SSingleOrder)(nil), // 15: SSingleOrder + (*Result)(nil), // 16: Result + (*StringMap)(nil), // 17: StringMap + (*String)(nil), // 18: String + (*QueryRebateListResponse)(nil), // 19: QueryRebateListResponse } var file_order_service_proto_depIdxs = []int32{ - 1, // 0: OrderService.SubmitOrder:input_type -> SubmitOrderRequest - 2, // 1: OrderService.PrepareOrder:input_type -> PrepareOrderRequest - 3, // 2: OrderService.GetParentOrder:input_type -> OrderNoV2 + 2, // 0: OrderService.SubmitOrder:input_type -> SubmitOrderRequest + 3, // 1: OrderService.PrepareOrder:input_type -> PrepareOrderRequest + 4, // 2: OrderService.GetParentOrder:input_type -> OrderNoV2 0, // 3: OrderService.GetOrder:input_type -> OrderRequest - 3, // 4: OrderService.BreakPaymentOrder:input_type -> OrderNoV2 - 4, // 5: OrderService.TradeOrderCashPay:input_type -> Int64 - 5, // 6: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest - 2, // 7: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest - 6, // 8: OrderService.CancelOrder:input_type -> CancelOrderRequest - 7, // 9: OrderService.ConfirmOrder:input_type -> OrderNo - 8, // 10: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest - 7, // 11: OrderService.PickUp:input_type -> OrderNo - 9, // 12: OrderService.Ship:input_type -> OrderShipmentRequest - 7, // 13: OrderService.BuyerReceived:input_type -> OrderNo - 7, // 14: OrderService.forbid:input_type -> OrderNo - 7, // 15: OrderService.LogBytes:input_type -> OrderNo - 10, // 16: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest - 11, // 17: OrderService.SubmitOrder:output_type -> OrderSubmitResponse - 12, // 18: OrderService.PrepareOrder:output_type -> PrepareOrderResponse - 13, // 19: OrderService.GetParentOrder:output_type -> SParentOrder - 14, // 20: OrderService.GetOrder:output_type -> SSingleOrder - 15, // 21: OrderService.BreakPaymentOrder:output_type -> Result - 15, // 22: OrderService.TradeOrderCashPay:output_type -> Result - 15, // 23: OrderService.TradeOrderUpdateTicket:output_type -> Result - 16, // 24: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap - 15, // 25: OrderService.CancelOrder:output_type -> Result - 15, // 26: OrderService.ConfirmOrder:output_type -> Result - 15, // 27: OrderService.ChangeShipmentAddress:output_type -> Result - 15, // 28: OrderService.PickUp:output_type -> Result - 15, // 29: OrderService.Ship:output_type -> Result - 15, // 30: OrderService.BuyerReceived:output_type -> Result - 15, // 31: OrderService.forbid:output_type -> Result - 17, // 32: OrderService.LogBytes:output_type -> String - 18, // 33: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse + 1, // 4: OrderService.BreakPaymentOrder:input_type -> BreakPaymentRequest + 5, // 5: OrderService.TradeOrderCashPay:input_type -> Int64 + 6, // 6: OrderService.TradeOrderUpdateTicket:input_type -> TradeOrderTicketRequest + 3, // 7: OrderService.PrepareOrderWithCoupon_:input_type -> PrepareOrderRequest + 7, // 8: OrderService.CancelOrder:input_type -> CancelOrderRequest + 8, // 9: OrderService.ConfirmOrder:input_type -> OrderNo + 9, // 10: OrderService.ChangeShipmentAddress:input_type -> ChangeOrderAddressRequest + 8, // 11: OrderService.PickUp:input_type -> OrderNo + 10, // 12: OrderService.Ship:input_type -> OrderShipmentRequest + 8, // 13: OrderService.BuyerReceived:input_type -> OrderNo + 8, // 14: OrderService.forbid:input_type -> OrderNo + 8, // 15: OrderService.LogBytes:input_type -> OrderNo + 11, // 16: OrderService.QueryRebateListList:input_type -> QueryRebateListRequest + 12, // 17: OrderService.SubmitOrder:output_type -> OrderSubmitResponse + 13, // 18: OrderService.PrepareOrder:output_type -> PrepareOrderResponse + 14, // 19: OrderService.GetParentOrder:output_type -> SParentOrder + 15, // 20: OrderService.GetOrder:output_type -> SSingleOrder + 16, // 21: OrderService.BreakPaymentOrder:output_type -> Result + 16, // 22: OrderService.TradeOrderCashPay:output_type -> Result + 16, // 23: OrderService.TradeOrderUpdateTicket:output_type -> Result + 17, // 24: OrderService.PrepareOrderWithCoupon_:output_type -> StringMap + 16, // 25: OrderService.CancelOrder:output_type -> Result + 16, // 26: OrderService.ConfirmOrder:output_type -> Result + 16, // 27: OrderService.ChangeShipmentAddress:output_type -> Result + 16, // 28: OrderService.PickUp:output_type -> Result + 16, // 29: OrderService.Ship:output_type -> Result + 16, // 30: OrderService.BuyerReceived:output_type -> Result + 16, // 31: OrderService.forbid:output_type -> Result + 18, // 32: OrderService.LogBytes:output_type -> String + 19, // 33: OrderService.QueryRebateListList:output_type -> QueryRebateListResponse 17, // [17:34] is the sub-list for method output_type 0, // [0:17] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -243,6 +297,18 @@ func file_order_service_proto_init() { return nil } } + file_order_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*BreakPaymentRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -250,7 +316,7 @@ func file_order_service_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_order_service_proto_rawDesc, NumEnums: 0, - NumMessages: 1, + NumMessages: 2, NumExtensions: 0, NumServices: 1, }, diff --git a/core/service/proto/order_service_grpc.pb.go b/core/service/proto/order_service_grpc.pb.go index 200a3304c..9a92db3b5 100644 --- a/core/service/proto/order_service_grpc.pb.go +++ b/core/service/proto/order_service_grpc.pb.go @@ -51,7 +51,7 @@ type OrderServiceClient interface { // 获取子订单,orderId GetOrder(ctx context.Context, in *OrderRequest, opts ...grpc.CallOption) (*SSingleOrder, error) // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) - BreakPaymentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*Result, error) + BreakPaymentOrder(ctx context.Context, in *BreakPaymentRequest, opts ...grpc.CallOption) (*Result, error) // 交易单现金支付,orderId TradeOrderCashPay(ctx context.Context, in *Int64, opts ...grpc.CallOption) (*Result, error) // 上传交易单发票 @@ -122,7 +122,7 @@ func (c *orderServiceClient) GetOrder(ctx context.Context, in *OrderRequest, opt return out, nil } -func (c *orderServiceClient) BreakPaymentOrder(ctx context.Context, in *OrderNoV2, opts ...grpc.CallOption) (*Result, error) { +func (c *orderServiceClient) BreakPaymentOrder(ctx context.Context, in *BreakPaymentRequest, opts ...grpc.CallOption) (*Result, error) { out := new(Result) err := c.cc.Invoke(ctx, OrderService_BreakPaymentOrder_FullMethodName, in, out, opts...) if err != nil { @@ -252,7 +252,7 @@ type OrderServiceServer interface { // 获取子订单,orderId GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) // 拆分支付单(多店下单支付未成功时拆分为每个子订单一个支付单) - BreakPaymentOrder(context.Context, *OrderNoV2) (*Result, error) + BreakPaymentOrder(context.Context, *BreakPaymentRequest) (*Result, error) // 交易单现金支付,orderId TradeOrderCashPay(context.Context, *Int64) (*Result, error) // 上传交易单发票 @@ -296,7 +296,7 @@ func (UnimplementedOrderServiceServer) GetParentOrder(context.Context, *OrderNoV func (UnimplementedOrderServiceServer) GetOrder(context.Context, *OrderRequest) (*SSingleOrder, error) { return nil, status.Errorf(codes.Unimplemented, "method GetOrder not implemented") } -func (UnimplementedOrderServiceServer) BreakPaymentOrder(context.Context, *OrderNoV2) (*Result, error) { +func (UnimplementedOrderServiceServer) BreakPaymentOrder(context.Context, *BreakPaymentRequest) (*Result, error) { return nil, status.Errorf(codes.Unimplemented, "method BreakPaymentOrder not implemented") } func (UnimplementedOrderServiceServer) TradeOrderCashPay(context.Context, *Int64) (*Result, error) { @@ -421,7 +421,7 @@ func _OrderService_GetOrder_Handler(srv interface{}, ctx context.Context, dec fu } func _OrderService_BreakPaymentOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OrderNoV2) + in := new(BreakPaymentRequest) if err := dec(in); err != nil { return nil, err } @@ -433,7 +433,7 @@ func _OrderService_BreakPaymentOrder_Handler(srv interface{}, ctx context.Contex FullMethod: OrderService_BreakPaymentOrder_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServiceServer).BreakPaymentOrder(ctx, req.(*OrderNoV2)) + return srv.(OrderServiceServer).BreakPaymentOrder(ctx, req.(*BreakPaymentRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/tests/service/order_service_test.go b/tests/service/order_service_test.go index 61f24aa1a..989cf26da 100644 --- a/tests/service/order_service_test.go +++ b/tests/service/order_service_test.go @@ -54,3 +54,12 @@ func TestGetSubOrder(t *testing.T) { }) t.Log(typeconv.MustJson(ret)) } + +// 测试拆分支付单 +func TestBreakPaymentOrder(t *testing.T){ + orderNo := "1230322000642437" + ret, _ := impl.OrderService.BreakPaymentOrder(context.TODO(), &proto.BreakPaymentRequest{ + PaymentOrderNo: orderNo, + }) + t.Log(typeconv.MustJson(ret)) +} \ No newline at end of file From 2ec0e00b46023762ebf930a89730e2a2858df229 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Fri, 24 Mar 2023 15:35:54 +0800 Subject: [PATCH 18/25] fix: break sub payment order --- core/domain/payment/payment.go | 3 +-- core/service/impl/2.order_service.go | 2 +- tests/service/order_service_test.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index 2acadd258..845ec0615 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -164,13 +164,12 @@ func (p *paymentOrderImpl) checkOrderFinalAmount() error { p.value.TotalAmount = p.value.ItemAmount - p.value.DiscountAmount + p.value.AdjustAmount // 修正支付单金额 p.value.FinalAmount = p.value.ItemAmount - p.value.DeductAmount + p.value.ProcedureFee - unix := time.Now().Unix() // 如果支付完成,则更新订单状态 if p.value.FinalAmount == 0 { p.value.State = payment.StateFinished p.firstFinishPayment = true + p.value.PaidTime = time.Now().Unix() } - p.value.PaidTime = unix } return nil } diff --git a/core/service/impl/2.order_service.go b/core/service/impl/2.order_service.go index 3b689e6d4..369c1d1e5 100755 --- a/core/service/impl/2.order_service.go +++ b/core/service/impl/2.order_service.go @@ -327,7 +327,7 @@ func (s *orderServiceImpl) breakPaymentOrder(orderNo string, state int, parentOr // 获取支付单信息 po := s.payRepo.GetPaymentOrder(orderNo) // 待支付,且无子订单相关的支付单,则需要拆分支付单 - if po == nil && state != order.StatAwaitingPayment { + if po == nil && state == order.StatAwaitingPayment { if parentOrderId <= 0 { return false, po, nil } diff --git a/tests/service/order_service_test.go b/tests/service/order_service_test.go index 989cf26da..c0b8ad919 100644 --- a/tests/service/order_service_test.go +++ b/tests/service/order_service_test.go @@ -47,7 +47,7 @@ func TestGetSubOrder(t *testing.T) { // update pay_order set deduct_amount = deduct_amount+1000,final_amount = final_amount-1000 where id=670 // -- 删除已生成的支付单 // delete FROM pay_order where out_order_no IN('1230322007642433','1230322001642486') - orderNo := "1230322007642433" + orderNo := "1230324001307478" ret, _ := impl.OrderService.GetOrder(context.TODO(), &proto.OrderRequest{ OrderNo: orderNo, WithDetail: true, From 36d33a945b57ad8517f8e2991be345e6fefacda4 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Fri, 24 Mar 2023 15:54:50 +0800 Subject: [PATCH 19/25] fix: break sub payment order --- core/domain/interface/payment/payment.go | 16 +- core/domain/order/normal_order.go | 101 +++---- core/domain/order/trade_order.go | 2 +- core/domain/order/wholesale_order.go | 2 +- core/domain/payment/payment.go | 6 +- core/service/idl/payment_service.proto | 4 - core/service/impl/2.payment_service.go | 4 - core/service/proto/payment_service.pb.go | 370 +++++++++++------------ upgrade/sql/2023-03.sql | 6 +- 9 files changed, 234 insertions(+), 277 deletions(-) diff --git a/core/domain/interface/payment/payment.go b/core/domain/interface/payment/payment.go index bee4e43b8..236ba41b5 100755 --- a/core/domain/interface/payment/payment.go +++ b/core/domain/interface/payment/payment.go @@ -197,16 +197,6 @@ type ( GetAwaitCloseOrders(lastId int, size int) []IPaymentOrder } - // RequestPayData 请求支付数据 - RequestPayData struct { - // 支付方式 - method int - // 支付方式代码 - code string - // 支付金额 - amount int - } - // Order 支付单 Order struct { // 编号 @@ -229,10 +219,8 @@ type ( BuyerId int64 `db:"buyer_id"` // 支付用户编号 PayerId int64 `db:"payer_id"` - // 商品金额 - ItemAmount int64 `db:"item_amount"` - // 优惠金额 - DiscountAmount int64 `db:"discount_amount"` + // 优惠金额,todo: 删除但目前依赖于优惠券 + DiscountAmount int64 `db:"-"` // 调整金额 AdjustAmount int64 `db:"adjust_amount"` // 共计金额，包含抵扣金额 diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index b4de4a959..8cc7f02d8 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -542,37 +542,35 @@ func (o *normalOrderImpl) avgDiscountToItem() { func (o *normalOrderImpl) createPaymentForOrder() error { v := o.baseOrderImpl.baseValue // 计算订单金额 - itemAmount := v.ItemAmount + v.ExpressFee + v.PackageFee + //itemAmount := v.ItemAmount + v.ExpressFee + v.PackageFee finalAmount := v.FinalAmount - discountAmount := v.DiscountAmount + //discountAmount := v.DiscountAmount // 计算订单超时时间 expiresMiniutes := o.registryRepo.Get(registry.OrderPaymentOverMinutes).IntValue() expiresTime := v.CreateTime + int64(expiresMiniutes)*60 po := &payment.Order{ - SellerId: 0, - TradeNo: v.OrderNo, - SubOrder: 0, - OrderType: int(order.TRetail), - OutOrderNo: v.OrderNo, - Subject: v.Subject, - BuyerId: v.BuyerId, - PayerId: v.BuyerId, - ItemAmount: itemAmount, - DiscountAmount: discountAmount, - AdjustAmount: 0, - FinalAmount: finalAmount, - TotalAmount: finalAmount, - PayFlag: payment.PAllFlag, - TradeChannel: 0, - ExtraData: "", - OutTradeSp: "", - OutTradeNo: "", - State: payment.StateAwaitingPayment, - SubmitTime: v.CreateTime, - ExpiresTime: expiresTime, - PaidTime: 0, - UpdateTime: v.CreateTime, - TradeMethods: []*payment.TradeMethodData{}, + SellerId: 0, + TradeNo: v.OrderNo, + SubOrder: 0, + OrderType: int(order.TRetail), + OutOrderNo: v.OrderNo, + Subject: v.Subject, + BuyerId: v.BuyerId, + PayerId: v.BuyerId, + AdjustAmount: 0, + FinalAmount: finalAmount, + TotalAmount: finalAmount, + PayFlag: payment.PAllFlag, + TradeChannel: 0, + ExtraData: "", + OutTradeSp: "", + OutTradeNo: "", + State: payment.StateAwaitingPayment, + SubmitTime: v.CreateTime, + ExpiresTime: expiresTime, + PaidTime: 0, + UpdateTime: v.CreateTime, + TradeMethods: []*payment.TradeMethodData{}, } o._payOrder = o.payRepo.CreatePaymentOrder(po) err := o._payOrder.Submit() @@ -902,33 +900,30 @@ func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISu no := o.baseValue deductAmount := int(math.Round(float64(po.DeductAmount) * (float64(so.FinalAmount) / float64(no.FinalAmount)))) v := &payment.Order{ - Id: 0, - SellerId: int(so.VendorId), - TradeType: "", - TradeNo: so.OrderNo, - OrderType: int(order.TRetail), - SubOrder: 1, - OutOrderNo: so.OrderNo, - Subject: "支付单#拆分子订单", - BuyerId: o.baseValue.BuyerId, - PayerId: 0, - ItemAmount: so.ItemAmount, - DiscountAmount: so.DiscountAmount, - AdjustAmount: 0, - TotalAmount: so.ItemAmount, - DeductAmount: int64(deductAmount), - ProcedureFee: 0, - PaidAmount: 0, - PayFlag: po.PayFlag, - FinalFlag: po.FinalFlag, - State: po.State, - SubmitTime: po.SubmitTime, - ExpiresTime: po.ExpiresTime, - UpdateTime: time.Now().Unix(), - TradeMethods: []*payment.TradeMethodData{}, - } - v.FinalAmount = v.ItemAmount - v.DeductAmount + v.ProcedureFee + v.AdjustAmount - + Id: 0, + SellerId: int(so.VendorId), + TradeType: "", + TradeNo: so.OrderNo, + OrderType: int(order.TRetail), + SubOrder: 1, + OutOrderNo: so.OrderNo, + Subject: "支付单#拆分子订单", + BuyerId: o.baseValue.BuyerId, + PayerId: 0, + AdjustAmount: 0, + TotalAmount: so.ItemAmount, + DeductAmount: int64(deductAmount), + ProcedureFee: 0, + PaidAmount: 0, + PayFlag: po.PayFlag, + FinalFlag: po.FinalFlag, + State: po.State, + SubmitTime: po.SubmitTime, + ExpiresTime: po.ExpiresTime, + UpdateTime: time.Now().Unix(), + TradeMethods: []*payment.TradeMethodData{}, + } + v.FinalAmount = v.TotalAmount - v.DeductAmount isp := o.payRepo.CreatePaymentOrder(v) err := isp.Submit() return isp, err diff --git a/core/domain/order/trade_order.go b/core/domain/order/trade_order.go index 2d29b3426..9490e8cb1 100755 --- a/core/domain/order/trade_order.go +++ b/core/domain/order/trade_order.go @@ -197,7 +197,7 @@ func (o *tradeOrderImpl) fixFinalAmount() { func (o *tradeOrderImpl) createPaymentForOrder() error { v := o.baseOrderImpl.createPaymentOrder() v.SellerId = int(o.value.VendorId) - v.ItemAmount = o.value.FinalAmount + v.TotalAmount = o.value.FinalAmount o.paymentOrder = o.payRepo.CreatePaymentOrder(v) return o.paymentOrder.Submit() } diff --git a/core/domain/order/wholesale_order.go b/core/domain/order/wholesale_order.go index f66d279e0..af15371a3 100755 --- a/core/domain/order/wholesale_order.go +++ b/core/domain/order/wholesale_order.go @@ -422,7 +422,7 @@ func (o *wholesaleOrderImpl) SetComment(comment string) { func (o *wholesaleOrderImpl) createPaymentForOrder() error { v := o.baseOrderImpl.createPaymentOrder() v.SellerId = int(o.value.VendorId) - v.ItemAmount = o.baseValue.FinalAmount + v.TotalAmount = o.baseValue.FinalAmount o.paymentOrder = o.payRepo.CreatePaymentOrder(v) return o.paymentOrder.Submit() } diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index 845ec0615..d5b3e2043 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -157,13 +157,13 @@ func (p *paymentOrderImpl) CheckPaymentState() error { // 检查是否支付完成, 且返回是否为第一次支付成功, func (p *paymentOrderImpl) checkOrderFinalAmount() error { if p.value.State == payment.StateAwaitingPayment { - if p.value.ItemAmount <= 0 { // 检查支付金额 + if p.value.TotalAmount <= 0 { // 检查支付金额 return payment.ErrItemAmount } // 修正支付单共计金额 - p.value.TotalAmount = p.value.ItemAmount - p.value.DiscountAmount + p.value.AdjustAmount + //p.value.TotalAmount = p.value.ItemAmount - p.value.DiscountAmount + p.value.AdjustAmount // 修正支付单金额 - p.value.FinalAmount = p.value.ItemAmount - p.value.DeductAmount + p.value.ProcedureFee + p.value.FinalAmount = p.value.TotalAmount - p.value.DeductAmount + p.value.ProcedureFee // 如果支付完成,则更新订单状态 if p.value.FinalAmount == 0 { p.value.State = payment.StateFinished diff --git a/core/service/idl/payment_service.proto b/core/service/idl/payment_service.proto index cd36bfed0..6487c5921 100644 --- a/core/service/idl/payment_service.proto +++ b/core/service/idl/payment_service.proto @@ -234,10 +234,6 @@ message SPaymentOrder { int64 buyerId = 9; /** 支付用户编号 */ int64 payerId = 10; - /** 商品金额 */ - int64 itemAmount = 11; - /** 优惠金额 */ - int64 discountAmount = 12; /** 调整金额 */ int64 adjustAmount = 13; /** 抵扣金额 */ diff --git a/core/service/impl/2.payment_service.go b/core/service/impl/2.payment_service.go index 5049f033b..19a9135f1 100755 --- a/core/service/impl/2.payment_service.go +++ b/core/service/impl/2.payment_service.go @@ -286,10 +286,8 @@ func (p *paymentService) parsePaymentOrder(src *proto.SPaymentOrder) *payment.Or BuyerId: src.BuyerId, PayerId: src.PayerId, TotalAmount: src.TotalAmount, - DiscountAmount: src.DiscountAmount, DeductAmount: src.DeductAmount, AdjustAmount: src.AdjustAmount, - ItemAmount: src.ItemAmount, ProcedureFee: src.ProcedureFee, FinalAmount: src.FinalAmount, PaidAmount: src.PaidAmount, @@ -318,10 +316,8 @@ func (p *paymentService) parsePaymentOrderDto(src *payment.Order) *proto.SPaymen BuyerId: src.BuyerId, PayerId: src.PayerId, TotalAmount: src.TotalAmount, - DiscountAmount: src.DiscountAmount, DeductAmount: src.DeductAmount, AdjustAmount: src.AdjustAmount, - ItemAmount: src.ItemAmount, ProcedureFee: src.ProcedureFee, FinalAmount: src.FinalAmount, PaidAmount: src.PaidAmount, diff --git a/core/service/proto/payment_service.pb.go b/core/service/proto/payment_service.pb.go index 1e2d7d813..e14a90f35 100644 --- a/core/service/proto/payment_service.pb.go +++ b/core/service/proto/payment_service.pb.go @@ -1040,10 +1040,6 @@ type SPaymentOrder struct { BuyerId int64 `protobuf:"varint,9,opt,name=buyerId,proto3" json:"buyerId"` // * 支付用户编号 PayerId int64 `protobuf:"varint,10,opt,name=payerId,proto3" json:"payerId"` - // * 商品金额 - ItemAmount int64 `protobuf:"varint,11,opt,name=itemAmount,proto3" json:"itemAmount"` - // * 优惠金额 - DiscountAmount int64 `protobuf:"varint,12,opt,name=discountAmount,proto3" json:"discountAmount"` // * 调整金额 AdjustAmount int64 `protobuf:"varint,13,opt,name=adjustAmount,proto3" json:"adjustAmount"` // * 抵扣金额 @@ -1178,20 +1174,6 @@ func (x *SPaymentOrder) GetPayerId() int64 { return 0 } -func (x *SPaymentOrder) GetItemAmount() int64 { - if x != nil { - return x.ItemAmount - } - return 0 -} - -func (x *SPaymentOrder) GetDiscountAmount() int64 { - if x != nil { - return x.DiscountAmount - } - return 0 -} - func (x *SPaymentOrder) GetAdjustAmount() int64 { if x != nil { return x.AdjustAmount @@ -2040,7 +2022,7 @@ var file_payment_service_proto_rawDesc = []byte{ 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0xd0, 0x06, 0x0a, 0x0d, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, + 0x38, 0x01, 0x22, 0x88, 0x06, 0x0a, 0x0d, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, @@ -2059,183 +2041,179 @@ var file_payment_service_proto_rawDesc = []byte{ 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x70, 0x61, 0x79, - 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x74, 0x65, 0x6d, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x64, 0x69, - 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, - 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, - 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, - 0x70, 0x61, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, - 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, - 0x70, 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, - 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x46, - 0x6c, 0x61, 0x67, 0x18, 0x14, 0x20, 0x01, 0x28, 0x11, 0x52, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, - 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, 0x74, - 0x61, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, - 0x11, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x6d, - 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0a, 0x73, 0x75, - 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x69, - 0x72, 0x65, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, 0x65, - 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, - 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x70, 0x61, - 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x44, - 0x61, 0x74, 0x61, 0x18, 0x1a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x54, 0x72, 0x61, - 0x64, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x74, 0x72, 0x61, 0x64, - 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, - 0x11, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4f, 0x0a, 0x13, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, - 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, - 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x42, - 0x72, 0x65, 0x61, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, - 0x77, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x22, 0x55, 0x0a, 0x0f, 0x53, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x50, 0x61, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, - 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x98, 0x01, - 0x0a, 0x0e, 0x53, 0x54, 0x72, 0x61, 0x64, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, - 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, - 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, - 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x43, 0x6f, 0x64, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x43, 0x6f, 0x64, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x75, 0x74, 0x54, - 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, - 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x22, 0xb7, 0x02, 0x0a, 0x11, 0x53, 0x50, 0x72, - 0x65, 0x70, 0x61, 0x72, 0x65, 0x54, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, - 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, - 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, - 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, - 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, - 0x79, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x07, 0x70, 0x61, 0x79, - 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11, 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x74, - 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, - 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, - 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x22, 0xc1, 0x01, 0x0a, 0x11, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 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, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, - 0x74, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, - 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x29, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x74, - 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x41, 0x0a, 0x19, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, - 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x53, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x53, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, - 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x61, 0x70, 0x70, 0x55, 0x72, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, - 0x67, 0x72, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, - 0x0a, 0x0a, 0x73, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0a, 0x73, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, - 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, - 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x09, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2a, 0x9d, 0x01, 0x0a, 0x0a, 0x45, - 0x50, 0x61, 0x79, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x06, 0x0a, 0x02, 0x5f, 0x34, 0x10, - 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x10, 0x01, 0x12, 0x0a, - 0x0a, 0x06, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6e, - 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, - 0x43, 0x61, 0x72, 0x64, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, - 0x75, 0x70, 0x6f, 0x6e, 0x10, 0x10, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x61, 0x73, 0x68, 0x10, 0x20, - 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x61, 0x6e, 0x6b, 0x43, 0x61, 0x72, 0x64, 0x10, 0x40, 0x12, 0x0a, - 0x0a, 0x05, 0x50, 0x61, 0x79, 0x53, 0x50, 0x10, 0x80, 0x01, 0x12, 0x0e, 0x0a, 0x09, 0x53, 0x65, - 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x61, 0x79, 0x10, 0x80, 0x02, 0x12, 0x0e, 0x0a, 0x09, 0x53, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x50, 0x61, 0x79, 0x10, 0x80, 0x04, 0x32, 0x84, 0x07, 0x0a, 0x0e, 0x50, - 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2f, 0x0a, - 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x12, 0x0e, 0x2e, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x39, - 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x12, 0x14, 0x2e, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, - 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x41, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x13, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x11, 0x44, 0x69, 0x73, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x17, 0x2e, - 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x00, 0x12, 0x39, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x49, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x18, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x0f, - 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x79, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x12, - 0x15, 0x2e, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x00, 0x12, 0x30, 0x0a, 0x0d, 0x48, 0x79, 0x62, 0x72, 0x69, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, - 0x6e, 0x74, 0x12, 0x14, 0x2e, 0x48, 0x79, 0x70, 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x00, 0x12, 0x31, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x15, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x2a, 0x0a, 0x09, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, - 0x79, 0x56, 0x31, 0x12, 0x12, 0x2e, 0x50, 0x61, 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x00, 0x12, 0x40, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, - 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x11, 0x2e, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, - 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x54, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, - 0x74, 0x61, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x09, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x56, - 0x32, 0x12, 0x14, 0x2e, 0x50, 0x61, 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x56, 0x32, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x50, 0x61, 0x79, 0x47, 0x61, 0x74, - 0x65, 0x77, 0x61, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2f, - 0x0a, 0x0c, 0x4d, 0x69, 0x78, 0x65, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, - 0x2e, 0x4d, 0x69, 0x78, 0x65, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, - 0x2d, 0x0a, 0x10, 0x53, 0x61, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, - 0x41, 0x70, 0x70, 0x12, 0x0e, 0x2e, 0x53, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, - 0x41, 0x70, 0x70, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, - 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, - 0x41, 0x70, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x06, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, - 0x1a, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, - 0x41, 0x70, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, - 0x16, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, - 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x17, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, - 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x12, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, - 0x70, 0x70, 0x12, 0x12, 0x2e, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, - 0x65, 0x41, 0x70, 0x70, 0x49, 0x64, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x61, 0x64, 0x6a, 0x75, + 0x73, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x64, 0x75, + 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, + 0x64, 0x65, 0x64, 0x75, 0x63, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, + 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x10, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, + 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x61, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x18, + 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1c, + 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x14, 0x20, 0x01, 0x28, + 0x11, 0x52, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x09, + 0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, 0x74, 0x61, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x11, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, + 0x20, 0x01, 0x28, 0x12, 0x52, 0x0a, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, + 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, + 0x18, 0x20, 0x01, 0x28, 0x12, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x19, + 0x20, 0x01, 0x28, 0x12, 0x52, 0x08, 0x70, 0x61, 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2d, + 0x0a, 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18, 0x1a, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0f, 0x2e, 0x53, 0x54, 0x72, 0x61, 0x64, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x11, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4f, 0x0a, + 0x13, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x12, 0x1e, + 0x0a, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x22, 0x55, + 0x0a, 0x0f, 0x53, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x79, 0x44, 0x61, 0x74, + 0x61, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x11, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x98, 0x01, 0x0a, 0x0e, 0x53, 0x54, 0x72, 0x61, 0x64, 0x65, + 0x43, 0x68, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x49, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x63, 0x68, 0x61, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x63, 0x68, 0x61, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x63, 0x68, 0x61, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x75, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4e, 0x6f, + 0x22, 0xb7, 0x02, 0x0a, 0x11, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x54, 0x72, 0x61, + 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x64, + 0x65, 0x4e, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x64, 0x65, + 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x11, 0x52, 0x07, 0x70, 0x61, 0x79, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, + 0x74, 0x72, 0x61, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11, + 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x34, 0x0a, 0x0b, + 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x12, 0x2e, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, + 0x65, 0x46, 0x65, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x61, + 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x66, + 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xc1, 0x01, 0x0a, 0x11, 0x53, + 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, + 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, 0x18, 0x0a, 0x07, 0x73, 0x75, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x72, 0x61, 0x64, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x11, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, + 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x46, 0x65, 0x65, 0x12, 0x20, 0x0a, 0x0b, + 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0b, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x29, + 0x0a, 0x11, 0x50, 0x61, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, + 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x41, 0x0a, 0x19, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x53, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, + 0x74, 0x65, 0x41, 0x70, 0x70, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xe3, 0x01, 0x0a, + 0x0d, 0x53, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x55, + 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x70, 0x70, 0x55, 0x72, 0x6c, + 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, + 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x6f, 0x72, 0x74, 0x4e, 0x75, + 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x6f, 0x72, 0x74, + 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, + 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x68, 0x69, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, + 0x68, 0x74, 0x2a, 0x9d, 0x01, 0x0a, 0x0a, 0x45, 0x50, 0x61, 0x79, 0x4d, 0x65, 0x74, 0x68, 0x6f, + 0x64, 0x12, 0x06, 0x0a, 0x02, 0x5f, 0x34, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x61, 0x6c, + 0x61, 0x6e, 0x63, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, + 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x10, 0x04, + 0x12, 0x0c, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x43, 0x61, 0x72, 0x64, 0x10, 0x08, 0x12, 0x0e, + 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x70, 0x6f, 0x6e, 0x10, 0x10, 0x12, 0x08, + 0x0a, 0x04, 0x43, 0x61, 0x73, 0x68, 0x10, 0x20, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x61, 0x6e, 0x6b, + 0x43, 0x61, 0x72, 0x64, 0x10, 0x40, 0x12, 0x0a, 0x0a, 0x05, 0x50, 0x61, 0x79, 0x53, 0x50, 0x10, + 0x80, 0x01, 0x12, 0x0e, 0x0a, 0x09, 0x53, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x61, 0x79, 0x10, + 0x80, 0x02, 0x12, 0x0e, 0x0a, 0x09, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x61, 0x79, 0x10, + 0x80, 0x04, 0x32, 0x84, 0x07, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2f, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x50, + 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x2e, 0x53, 0x50, + 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, 0x07, 0x2e, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, + 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x50, 0x61, 0x79, 0x6d, + 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x0e, 0x2e, 0x53, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, + 0x00, 0x12, 0x2d, 0x0a, 0x0b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x12, 0x13, 0x2e, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, + 0x12, 0x37, 0x0a, 0x11, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x42, 0x61, + 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x17, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, + 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x39, 0x0a, 0x12, 0x44, 0x69, 0x73, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, + 0x18, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, + 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x42, + 0x79, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x15, 0x2e, 0x57, 0x61, 0x6c, 0x6c, 0x65, 0x74, + 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, + 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x30, 0x0a, 0x0d, 0x48, 0x79, 0x62, + 0x72, 0x69, 0x64, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x2e, 0x48, 0x79, 0x70, + 0x65, 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x31, 0x0a, 0x0d, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x15, 0x2e, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x2a, + 0x0a, 0x09, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x56, 0x31, 0x12, 0x12, 0x2e, 0x50, 0x61, + 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x07, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x15, 0x47, 0x65, + 0x74, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x49, + 0x6e, 0x66, 0x6f, 0x12, 0x11, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x53, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, + 0x65, 0x54, 0x72, 0x61, 0x64, 0x65, 0x44, 0x61, 0x74, 0x61, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x09, + 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x56, 0x32, 0x12, 0x14, 0x2e, 0x50, 0x61, 0x79, 0x47, + 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x56, 0x32, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x13, 0x2e, 0x50, 0x61, 0x79, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x0c, 0x4d, 0x69, 0x78, 0x65, 0x64, 0x50, + 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x2e, 0x4d, 0x69, 0x78, 0x65, 0x64, 0x50, 0x61, + 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x07, 0x2e, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x2d, 0x0a, 0x10, 0x53, 0x61, 0x76, 0x65, 0x49, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x12, 0x0e, 0x2e, 0x53, 0x49, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x1a, 0x07, 0x2e, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, + 0x06, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x16, 0x50, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, + 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, + 0x17, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x33, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, + 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x12, 0x12, 0x2e, 0x50, 0x61, 0x79, + 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x65, 0x41, 0x70, 0x70, 0x49, 0x64, 0x1a, 0x07, + 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x42, 0x1f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, + 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x67, 0x6f, 0x32, 0x6f, 0x2e, 0x72, 0x70, 0x63, + 0x5a, 0x08, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/upgrade/sql/2023-03.sql b/upgrade/sql/2023-03.sql index 3f33dc2b7..55124d455 100644 --- a/upgrade/sql/2023-03.sql +++ b/upgrade/sql/2023-03.sql @@ -223,4 +223,8 @@ COMMENT ON COLUMN public.ad_hyperlink.link_url IS '链接地址'; /** 删除订单抵扣金额 */ ALTER TABLE IF EXISTS public.order_list - DROP deduct_amount; \ No newline at end of file + DROP deduct_amount; + +/** 2023-03-24 */ +ALTER TABLE IF EXISTS public.pay_order DROP COLUMN IF EXISTS item_amount; +ALTER TABLE IF EXISTS public.pay_order DROP COLUMN IF EXISTS discount_amount; \ No newline at end of file From 84a76cb9655de2e97299af50d07147f2337c6584 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sat, 25 Mar 2023 17:46:52 +0800 Subject: [PATCH 20/25] member_test.go --- tests/domain/member_test.go | 13 +++++++++++++ tests/domain/payment_test.go | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/domain/member_test.go b/tests/domain/member_test.go index 378d0b030..13d220f4f 100644 --- a/tests/domain/member_test.go +++ b/tests/domain/member_test.go @@ -247,6 +247,7 @@ func TestMemberWallet(t *testing.T) { } } +// 测试更改头像 func TestChangeHeadPortrait(t *testing.T) { var memberId int64 = 723 portraitUrl := "a/20230310144156396.jpeg" @@ -257,3 +258,15 @@ func TestChangeHeadPortrait(t *testing.T) { t.FailNow() } } + +// 　测试更改等级 +func TestChangeMemberLevel(t *testing.T) { + memberId := 818 + repo := ti.Factory.GetMemberRepo() + m := repo.GetMember(int64(memberId)) + err := m.ChangeLevel(1, 0, false) + if err != nil { + t.Error(err) + t.FailNow() + } +} diff --git a/tests/domain/payment_test.go b/tests/domain/payment_test.go index 65d93182e..14d49ceb6 100644 --- a/tests/domain/payment_test.go +++ b/tests/domain/payment_test.go @@ -62,7 +62,7 @@ func TestCreateChargePaymentOrder(t *testing.T) { Subject: "充值", BuyerId: 22149, //PayUid: 1, - ItemAmount: 1, + TotalAmount: 1, PayFlag: domain.MathPaymentMethodFlag([]int{ payment.MBankCard, payment.MPaySP, payment.MBalance, payment.MIntegral, payment.MWallet}), From 43df4f4e9e32d346777f42142fed2e38f9aadf92 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 26 Mar 2023 16:47:51 +0800 Subject: [PATCH 21/25] fix: remove table pay_sp_trade --- core/domain/interface/payment/payment.go | 23 +++-------------------- core/domain/order/normal_order.go | 10 +++++++++- core/domain/payment/payment.go | 2 +- core/repos/payment_repo.go | 8 ++++++-- core/service/impl/orm_mapping.go | 1 - docs/data/truncate.sql | 1 - docs/data/upgrade_v0.2.1.sql | 18 ++---------------- tests/domain/member_test.go | 2 +- tests/domain/order_test.go | 2 +- tests/domain/payment_test.go | 9 +++++++++ 10 files changed, 32 insertions(+), 44 deletions(-) diff --git a/core/domain/interface/payment/payment.go b/core/domain/interface/payment/payment.go index 236ba41b5..dbbc83406 100755 --- a/core/domain/interface/payment/payment.go +++ b/core/domain/interface/payment/payment.go @@ -165,6 +165,8 @@ type ( GetPaymentOrderById(id int) IPaymentOrder // DeletePaymentOrder 拆分后删除父支付单 DeletePaymentOrder(id int) error + // DeletePaymentTradeData 删除支付单的支付数据 + DeletePaymentTradeData(orderId int)error // GetPaymentOrder 根据支付单号获取支付单 GetPaymentOrder(paymenOrderNo string) IPaymentOrder // GetPaymentBySalesOrderId 根据订单号获取支付单 @@ -262,7 +264,7 @@ type ( // TradeMethodData 支付单项 TradeMethodData struct { // 编号 - ID int `db:"id" pk:"yes" auto:"yes"` + Id int `db:"id" pk:"yes" auto:"yes"` // 交易单号 TradeNo string `db:"trade_no"` // 支付途径 @@ -291,25 +293,6 @@ type ( SubmitTime int64 `db:"submit_time"` } - // PaySpTrade SP支付交易 - PaySpTrade struct { - // 编号 - ID int `db:"id"` - // 交易SP - TradeSp string `db:"trade_sp"` - // 交易号 - TradeNo string `db:"trade_no"` - // 合并的订单号,交易号用"|"分割 - TradeOrders string `db:"trade_orders"` - // 交易状态 - TradeState int `db:"trade_state"` - // 交易结果 - TradeResult int `db:"trade_result"` - // 交易备注 - TradeRemark string `db:"trade_remark"` - // 交易时间 - TradeTime int `db:"trade_time"` - } // IntegrateApp 集成支付应用 IntegrateApp struct { diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index 8cc7f02d8..f6ae820e5 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -490,11 +490,19 @@ func (o *normalOrderImpl) BreakPaymentOrder() ([]payment.IPaymentOrder, error) { } arr = append(arr, sp) } - o.payRepo.DeletePaymentOrder(ip.GetAggregateRootId()) + o.destoryMergePaymentOrder(ip) o._payOrder = nil return arr, nil } +func (o *normalOrderImpl) destoryMergePaymentOrder(ip payment.IPaymentOrder) error { + err := o.payRepo.DeletePaymentOrder(ip.GetAggregateRootId()) + if err == nil { + err = o.payRepo.DeletePaymentTradeData(ip.GetAggregateRootId()) + } + return err +} + // BuildCart 通过订单创建购物车 func (o *normalOrderImpl) BuildCart() cart.ICart { bv := o.baseOrderImpl.baseValue diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index d5b3e2043..83bb77d5b 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -178,7 +178,7 @@ func (p *paymentOrderImpl) checkOrderFinalAmount() error { func (p *paymentOrderImpl) Cancel() (err error) { // 如果已取消或订单再次回调到支付单取消, 不做任何处理 if p.value.State == payment.StateClosed { - return nil + //return nil } p.value.State = payment.StateClosed if err = p.saveOrder(); err != nil { diff --git a/core/repos/payment_repo.go b/core/repos/payment_repo.go index b6ec38b2c..b1bab1474 100755 --- a/core/repos/payment_repo.go +++ b/core/repos/payment_repo.go @@ -82,7 +82,6 @@ func (p *paymentRepoImpl) getPaymentOrderCkByNo(orderNO string) string { return fmt.Sprintf("go2o:repo:pay:order:%s", orderNO) } - // DeletePaymentOrder 拆分后删除父支付单 func (p *paymentRepoImpl) DeletePaymentOrder(id int) error { key := p.getPaymentOrderCk(id) @@ -90,6 +89,11 @@ func (p *paymentRepoImpl) DeletePaymentOrder(id int) error { return p._orm.DeleteByPk(payment.Order{}, id) } +// DeletePaymentTradeData 删除支付单的支付数据 +func (p *paymentRepoImpl) DeletePaymentTradeData(orderId int) error { + return p._orm.Delete(payment.TradeMethodData{},"", id) +} + // 根据编号获取支付单 func (p *paymentRepoImpl) GetPaymentOrderById(id int) payment.IPaymentOrder { if id <= 0 { @@ -176,7 +180,7 @@ func (p *paymentRepoImpl) GetTradeChannelItems(tradeNo string) []*payment.TradeM func (p *paymentRepoImpl) SavePaymentTradeChan(tradeNo string, tradeChan *payment.TradeMethodData) (int, error) { tradeChan.TradeNo = tradeNo - id, err := orm.Save(p._orm, tradeChan, tradeChan.ID) + id, err := orm.Save(p._orm, tradeChan, tradeChan.Id) if err != nil && err != sql.ErrNoRows { log.Println("[ Orm][ Error]:", err.Error(), "; Entity:PayTradeChan") } diff --git a/core/service/impl/orm_mapping.go b/core/service/impl/orm_mapping.go index e8d37443d..9dfcff436 100644 --- a/core/service/impl/orm_mapping.go +++ b/core/service/impl/orm_mapping.go @@ -156,7 +156,6 @@ func OrmMapping(orm orm.Orm) { orm.Mapping(payment.Order{}, "pay_order") orm.Mapping(payment.TradeMethodData{}, "pay_trade_data") orm.Mapping(payment.MergeOrder{}, "pay_merge_order") - orm.Mapping(payment.PaySpTrade{}, "pay_sp_trade") // 促销 orm.Mapping(promotion.ValueCoupon{}, "pm_coupon") diff --git a/docs/data/truncate.sql b/docs/data/truncate.sql index 773dd9aec..c80e4449d 100755 --- a/docs/data/truncate.sql +++ b/docs/data/truncate.sql @@ -116,7 +116,6 @@ TRUNCATE TABLE "ws_cart_item"; TRUNCATE TABLE "pay_order"; TRUNCATE TABLE "pay_trade_data"; TRUNCATE TABLE "pay_merge_order"; -TRUNCATE TABLE "pay_sp_trade"; TRUNCATE TABLE "pm_coupon"; diff --git a/docs/data/upgrade_v0.2.1.sql b/docs/data/upgrade_v0.2.1.sql index 5412339db..0dd63ad7e 100755 --- a/docs/data/upgrade_v0.2.1.sql +++ b/docs/data/upgrade_v0.2.1.sql @@ -1,15 +1,4 @@ -CREATE TABLE pay_sp_trade -( - id int(10) NOT NULL AUTO_INCREMENT, - trade_sp varchar(20) NOT NULL comment '交易SP', - trade_no varchar(45) NOT NULL comment '交易号', - trade_orders varchar(512) NOT NULL comment '合并的订单号,交易号用"|"分割', - trade_state int(1) NOT NULL comment '交易状态', - trade_result int(1) NOT NULL comment '交易结果', - trade_remark varchar(200) NOT NULL comment '交易备注', - trade_time int(11) NOT NULL comment '交易时间', - PRIMARY KEY (id) -); + CREATE TABLE pay_merge_order ( id int(10) NOT NULL AUTO_INCREMENT comment '编号', @@ -86,7 +75,4 @@ ALTER TABLE pay_merge_order modify column merge_trade_no varchar (40) NOT NULL; ALTER TABLE pay_merge_order modify column order_trade_no varchar (40) NOT NULL; -ALTER TABLE pay_sp_trade - modify column trade_no varchar (40) NOT NULL; -ALTER TABLE pay_sp_trade - modify column sp_trade_no varchar (40) NOT NULL; + diff --git a/tests/domain/member_test.go b/tests/domain/member_test.go index 13d220f4f..05ff9d872 100644 --- a/tests/domain/member_test.go +++ b/tests/domain/member_test.go @@ -261,7 +261,7 @@ func TestChangeHeadPortrait(t *testing.T) { // 　测试更改等级 func TestChangeMemberLevel(t *testing.T) { - memberId := 818 + memberId := 821 repo := ti.Factory.GetMemberRepo() m := repo.GetMember(int64(memberId)) err := m.ChangeLevel(1, 0, false) diff --git a/tests/domain/order_test.go b/tests/domain/order_test.go index 32ceacb9f..645983cf2 100755 --- a/tests/domain/order_test.go +++ b/tests/domain/order_test.go @@ -494,7 +494,7 @@ func TestNotifyTradeOrder(t *testing.T) { conn.Do("RPUSH", variable.KvOrderBusinessQueue, value) } -// 测试获取子订单的支付单信息 +// 测试取消子订单支付单信息 func TestGetSubPaymentOrder(t *testing.T) { orderId := 678 order := ti.Factory.GetOrderRepo().Manager().GetSubOrder(int64(orderId)) diff --git a/tests/domain/payment_test.go b/tests/domain/payment_test.go index 14d49ceb6..9c613bc2c 100644 --- a/tests/domain/payment_test.go +++ b/tests/domain/payment_test.go @@ -125,3 +125,12 @@ func TestBreakPaymentOrderAVGDeductAmount(t *testing.T) { t.FailNow() } } + +func TestCancelPaymentOrder(t *testing.T) { + orderNo := "1230324007307412" + p := ti.Factory.GetPaymentRepo().GetPaymentOrder(orderNo) + if err := p.Cancel(); err != nil { + t.Error(err) + t.FailNow() + } +} From b2486d6e4d70bb701426e3b12125f9e7d8332bf8 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 26 Mar 2023 18:13:47 +0800 Subject: [PATCH 22/25] fix: order payment channel trade data --- core/domain/interface/payment/payment.go | 5 +++-- core/domain/order/normal_order.go | 26 +++++++++++++++++++----- core/domain/payment/payment.go | 12 ++++++++++- core/repos/payment_repo.go | 3 ++- upgrade/sql/2023-03.sql | 18 +++++++++++++++- 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/core/domain/interface/payment/payment.go b/core/domain/interface/payment/payment.go index dbbc83406..14d581f10 100755 --- a/core/domain/interface/payment/payment.go +++ b/core/domain/interface/payment/payment.go @@ -166,7 +166,7 @@ type ( // DeletePaymentOrder 拆分后删除父支付单 DeletePaymentOrder(id int) error // DeletePaymentTradeData 删除支付单的支付数据 - DeletePaymentTradeData(orderId int)error + DeletePaymentTradeData(orderId int) error // GetPaymentOrder 根据支付单号获取支付单 GetPaymentOrder(paymenOrderNo string) IPaymentOrder // GetPaymentBySalesOrderId 根据订单号获取支付单 @@ -265,6 +265,8 @@ type ( TradeMethodData struct { // 编号 Id int `db:"id" pk:"yes" auto:"yes"` + // 支付订单号Id + OrderId int `db:"order_id"` // 交易单号 TradeNo string `db:"trade_no"` // 支付途径 @@ -293,7 +295,6 @@ type ( SubmitTime int64 `db:"submit_time"` } - // IntegrateApp 集成支付应用 IntegrateApp struct { // 编号 diff --git a/core/domain/order/normal_order.go b/core/domain/order/normal_order.go index f6ae820e5..f0d705221 100755 --- a/core/domain/order/normal_order.go +++ b/core/domain/order/normal_order.go @@ -481,10 +481,9 @@ func (o *normalOrderImpl) BreakPaymentOrder() ([]payment.IPaymentOrder, error) { if len(subOrders) < 2 { return nil, errors.New("payment order not nesseary break") } - ipv := ip.Get() arr := make([]payment.IPaymentOrder, 0) for _, v := range subOrders { - sp, err := o.createSubPaymentOrder(&ipv, v) + sp, err := o.createSubPaymentOrder(ip, v) if err != nil { return nil, err } @@ -495,6 +494,7 @@ func (o *normalOrderImpl) BreakPaymentOrder() ([]payment.IPaymentOrder, error) { return arr, nil } +// destoryMergePaymentOrder 销毁合并支付单 func (o *normalOrderImpl) destoryMergePaymentOrder(ip payment.IPaymentOrder) error { err := o.payRepo.DeletePaymentOrder(ip.GetAggregateRootId()) if err == nil { @@ -899,14 +899,19 @@ func (o *normalOrderImpl) breakUpByVendor() ([]order.ISubOrder, error) { } // createSubPaymentOrder 生成一个子订单的支付单 -func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISubOrder) (payment.IPaymentOrder, error) { +func (o *normalOrderImpl) createSubPaymentOrder(ip payment.IPaymentOrder, iso order.ISubOrder) (payment.IPaymentOrder, error) { so := iso.GetValue() + po := ip.Get() sp := o.payRepo.GetPaymentOrder(so.OrderNo) if sp != nil { return sp, errors.New("子订单已拆分支付单") } no := o.baseValue - deductAmount := int(math.Round(float64(po.DeductAmount) * (float64(so.FinalAmount) / float64(no.FinalAmount)))) + // 分摊比例 + rate := float64(so.FinalAmount) / float64(no.FinalAmount) + //　分摊金额 + deductAmount := int(math.Round(float64(po.DeductAmount) * rate)) + // 生成支付单 v := &payment.Order{ Id: 0, SellerId: int(so.VendorId), @@ -931,7 +936,18 @@ func (o *normalOrderImpl) createSubPaymentOrder(po *payment.Order, iso order.ISu UpdateTime: time.Now().Unix(), TradeMethods: []*payment.TradeMethodData{}, } - v.FinalAmount = v.TotalAmount - v.DeductAmount + // 更新支付方式 + for _, tv := range ip.TradeMethods() { + v.TradeMethods = append(v.TradeMethods, &payment.TradeMethodData{ + TradeNo: so.OrderNo, + Method: tv.Method, + Code: tv.Code, + Internal: tv.Internal, + Amount: int64(math.Round(float64(tv.Amount) * rate)), + OutTradeNo: tv.OutTradeNo, + PayTime: tv.PayTime, + }) + } isp := o.payRepo.CreatePaymentOrder(v) err := isp.Submit() return isp, err diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index 83bb77d5b..50d91adae 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -89,7 +89,15 @@ func (p *paymentOrderImpl) Submit() error { if b := p.repo.CheckTradeNoMatch(p.value.TradeNo, p.GetAggregateRootId()); !b { return payment.ErrExistsTradeNo } - return p.saveOrder() + err := p.saveOrder() + if err == nil { + // 保存支付单的支付方式,主要用于拆分子订单提交 + for _, v := range p.value.TradeMethods { + v.OrderId = p.GetAggregateRootId() + v.Id, _ = p.repo.SavePaymentTradeChan(p.TradeNo(), v) + } + } + return err } // MergePay 合并支付 @@ -497,6 +505,7 @@ func (p *paymentOrderImpl) SystemPayment(fee int) error { func (p *paymentOrderImpl) saveTradeChan(amount int, method int, code string, outTradeNo string) error { c := &payment.TradeMethodData{ TradeNo: p.TradeNo(), + OrderId: p.GetAggregateRootId(), Method: method, Internal: 1, Amount: int64(amount), @@ -583,6 +592,7 @@ func (p *paymentOrderImpl) PaymentWithCard(cardCode string, amount int) error { return errors.New("not support") } +// 保存订单 func (p *paymentOrderImpl) saveOrder() error { // 检查支付单 err := p.checkOrderFinalAmount() diff --git a/core/repos/payment_repo.go b/core/repos/payment_repo.go index b1bab1474..e3a57e0e7 100755 --- a/core/repos/payment_repo.go +++ b/core/repos/payment_repo.go @@ -91,7 +91,8 @@ func (p *paymentRepoImpl) DeletePaymentOrder(id int) error { // DeletePaymentTradeData 删除支付单的支付数据 func (p *paymentRepoImpl) DeletePaymentTradeData(orderId int) error { - return p._orm.Delete(payment.TradeMethodData{},"", id) + _, err := p._orm.Delete(payment.TradeMethodData{}, "order_id=$1", orderId) + return err } // 根据编号获取支付单 diff --git a/upgrade/sql/2023-03.sql b/upgrade/sql/2023-03.sql index 55124d455..8db4ef8ed 100644 --- a/upgrade/sql/2023-03.sql +++ b/upgrade/sql/2023-03.sql @@ -227,4 +227,20 @@ ALTER TABLE IF EXISTS public.order_list /** 2023-03-24 */ ALTER TABLE IF EXISTS public.pay_order DROP COLUMN IF EXISTS item_amount; -ALTER TABLE IF EXISTS public.pay_order DROP COLUMN IF EXISTS discount_amount; \ No newline at end of file +ALTER TABLE IF EXISTS public.pay_order DROP COLUMN IF EXISTS discount_amount; + +/** 2023-03-26 */ +DROP TABLE IF EXISTS public.pay_sp_trade; + +DROP TABLE IF EXISTS pay_order_old; +ALTER TABLE IF EXISTS public.pay_trade_data + ADD COLUMN order_id bigint NOT NULL DEFAULT 0; + +COMMENT ON COLUMN public.pay_trade_data.order_id + IS '支付订单编号'; + +-- 给order_id赋值 +update pay_trade_data set order_id=COALESCE(( + SELECT id FROM pay_order WHERE pay_order.trade_no=pay_trade_data.trade_no),0) + WHERE order_id = 0; + From 8f652c51a494b28e3843416fbc63a9ba3c2ea370 Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 26 Mar 2023 18:39:23 +0800 Subject: [PATCH 23/25] fix: order payment channel trade data --- core/domain/payment/payment.go | 2 +- tests/domain/payment_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index 50d91adae..73696058d 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -228,7 +228,7 @@ func (p *paymentOrderImpl) Cancel() (err error) { } if err == nil { err = p.orderManager.Cancel(p.value.OutOrderNo, - false, + p.value.SubOrder == 1, pv.SubOrder == 1, "超时未付款") } diff --git a/tests/domain/payment_test.go b/tests/domain/payment_test.go index 9c613bc2c..b8f16053c 100644 --- a/tests/domain/payment_test.go +++ b/tests/domain/payment_test.go @@ -127,7 +127,7 @@ func TestBreakPaymentOrderAVGDeductAmount(t *testing.T) { } func TestCancelPaymentOrder(t *testing.T) { - orderNo := "1230324007307412" + orderNo := "1230326007400338" p := ti.Factory.GetPaymentRepo().GetPaymentOrder(orderNo) if err := p.Cancel(); err != nil { t.Error(err) From a432a87b9de02c258d7fae04418470e9bb81e47e Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 26 Mar 2023 19:05:10 +0800 Subject: [PATCH 24/25] fix: order payment channel trade data --- core/domain/interface/order/normal_order.go | 2 ++ core/domain/order/sub_order.go | 18 ++++++++++++------ tests/domain/order_test.go | 13 +++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/core/domain/interface/order/normal_order.go b/core/domain/interface/order/normal_order.go index 276235785..d683915ac 100755 --- a/core/domain/interface/order/normal_order.go +++ b/core/domain/interface/order/normal_order.go @@ -52,6 +52,8 @@ type ( Complex() *ComplexOrder // ParentOrder 获取父订单 ParentOrder() IOrder + // GetPaymentOrder 获取支付单 + GetPaymentOrder() payment.IPaymentOrder // Items 获取商品项 Items() []*SubOrderItem // 更改收货人信息 diff --git a/core/domain/order/sub_order.go b/core/domain/order/sub_order.go index 0268a2366..36eca180d 100644 --- a/core/domain/order/sub_order.go +++ b/core/domain/order/sub_order.go @@ -44,6 +44,7 @@ type subOrderImpl struct { valRepo valueobject.IValueRepo mchRepo merchant.IMerchantRepo registryRepo registry.IRegistryRepo + _payOrder payment.IPaymentOrder _stateIsChange bool // 订单状态是否变更，如果变更后将推送信息 } @@ -646,7 +647,8 @@ func (o *subOrderImpl) updateAccountForOrder(m member.IMember) error { // 取消订单 func (o *subOrderImpl) Cancel(buyerCancel bool, reason string) error { if o.value.Status == order.StatCancelled { - return order.ErrOrderCancelled + // 取消支付单也会回调取消订单,故当已取消时返回nil + return nil } // 已发货订单无法取消 if o.value.Status >= order.StatShipped { @@ -696,13 +698,17 @@ func (o *subOrderImpl) cancelGoods() error { return nil } +// GetPaymentOrder 获取支付单 +func (o *subOrderImpl) GetPaymentOrder() payment.IPaymentOrder { + if o._payOrder == nil { + o._payOrder = o.paymentRepo.GetPaymentOrder(o.value.OrderNo) + } + return o._payOrder +} + // 取消支付单 func (o *subOrderImpl) cancelPaymentOrder() error { - od := o.ParentOrder() - if od.Type() != order.TRetail { - panic("not support order type") - } - ip := od.GetPaymentOrder() + ip := o.GetPaymentOrder() if ip != nil { return ip.Cancel() //todo: there have a bug, when other order has shipmented. all sub order will be cancelled. } diff --git a/tests/domain/order_test.go b/tests/domain/order_test.go index 645983cf2..e98a161f7 100755 --- a/tests/domain/order_test.go +++ b/tests/domain/order_test.go @@ -163,20 +163,16 @@ func TestCancelOrder(t *testing.T) { } } +// 测试取消子订单 func TestCancelSubOrderByOrderNo(t *testing.T) { - var orderId int64 = 605 + var orderId int64 = 838 orderRepo := ti.Factory.GetOrderRepo() - manager := orderRepo.Manager() - is := manager.GetSubOrder(orderId) + is := orderRepo.Manager().GetSubOrder(orderId) err := is.Cancel(true, "不想要了") if err != nil { t.Log("取消失败：", err.Error()) t.FailNow() } - ip := is.ParentOrder().GetPaymentOrder() - if ip != nil { - t.Log("支付单状态:", ip.Get().State) - } time.Sleep(3000) } @@ -233,7 +229,7 @@ func TestSubmitNormalOrder(t *testing.T) { // 测试从订单重新创建订单并提交付款 func TestRebuildSubmitNormalOrder(t *testing.T) { - orderNo := "1230322000620396" + orderNo := "1230326001400310" repo := ti.Factory.GetOrderRepo() memRepo := ti.Factory.GetMemberRepo() payRepo := ti.Factory.GetPaymentRepo() @@ -251,6 +247,7 @@ func TestRebuildSubmitNormalOrder(t *testing.T) { AddressId: addressId, CouponCode: "", BalanceDeduct: true, + WalletDeduct: true, AffiliateCode: "", PostedData: nil, } From dc3e46419f831ae6406b295868574fed4cc4708b Mon Sep 17 00:00:00 2001 From: jarrysix Date: Sun, 26 Mar 2023 19:13:10 +0800 Subject: [PATCH 25/25] fix: order payment channel trade data --- core/domain/payment/payment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/domain/payment/payment.go b/core/domain/payment/payment.go index 73696058d..6d073aeb4 100755 --- a/core/domain/payment/payment.go +++ b/core/domain/payment/payment.go @@ -186,7 +186,7 @@ func (p *paymentOrderImpl) checkOrderFinalAmount() error { func (p *paymentOrderImpl) Cancel() (err error) { // 如果已取消或订单再次回调到支付单取消, 不做任何处理 if p.value.State == payment.StateClosed { - //return nil + return nil } p.value.State = payment.StateClosed if err = p.saveOrder(); err != nil {