From d9b64a6a8340927df5608816f8f3b8e21c1c0d45 Mon Sep 17 00:00:00 2001 From: "dc.To" Date: Tue, 22 Apr 2025 14:33:03 +0800 Subject: [PATCH] update protobuf version add `via` field --- orders.pb.go | 108 ++++++++++++++------------ org.pb.go | 203 ++++++++++++++++++++++++++++--------------------- org_grpc.pb.go | 2 + 3 files changed, 176 insertions(+), 137 deletions(-) diff --git a/orders.pb.go b/orders.pb.go index a63b5bb..0e8793b 100644 --- a/orders.pb.go +++ b/orders.pb.go @@ -41,21 +41,22 @@ type Orders struct { TokenNo string `protobuf:"bytes,8,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId DeviceNo string `protobuf:"bytes,9,opt,name=DeviceNo,proto3" json:"DeviceNo,omitempty" dc:"设备编号"` // 设备编号 Via string `protobuf:"bytes,10,opt,name=Via,proto3" json:"Via,omitempty" dc:"支付方式"` // 支付方式 - Ccy string `protobuf:"bytes,11,opt,name=Ccy,proto3" json:"Ccy,omitempty" dc:"币种"` // 币种 - Amount string `protobuf:"bytes,12,opt,name=Amount,proto3" json:"Amount,omitempty" dc:"金额"` // 金额 - Deduct string `protobuf:"bytes,13,opt,name=Deduct,proto3" json:"Deduct,omitempty" dc:"费用/扣款/手续费"` // 费用/扣款/手续费 - Amounted string `protobuf:"bytes,14,opt,name=Amounted,proto3" json:"Amounted,omitempty" dc:"实付金额"` // 实付金额 - Cheque string `protobuf:"bytes,15,opt,name=Cheque,proto3" json:"Cheque,omitempty" dc:"凭证/回单"` // 凭证/回单 - Metadata string `protobuf:"bytes,16,opt,name=Metadata,proto3" json:"Metadata,omitempty" dc:"Meta数据"` // Meta数据 - Description string `protobuf:"bytes,17,opt,name=Description,proto3" json:"Description,omitempty" dc:"订单备注/摘要"` // 订单备注/摘要 - Redirect string `protobuf:"bytes,18,opt,name=Redirect,proto3" json:"Redirect,omitempty" dc:"下一跳>>跳转地址/二维码地址或代码"` // 下一跳>>跳转地址/二维码地址或代码 - Response string `protobuf:"bytes,19,opt,name=Response,proto3" json:"Response,omitempty" dc:"订单响应/回调数据"` // 订单响应/回调数据 - Calls int32 `protobuf:"varint,20,opt,name=Calls,proto3" json:"Calls,omitempty" dc:"回调次数"` // 回调次数 - State int32 `protobuf:"varint,21,opt,name=State,proto3" json:"State,omitempty" dc:"状态:-1=Failure, 0=Pending, 1=Success"` // 状态:-1=Failure, 0=Pending, 1=Success - StateText string `protobuf:"bytes,22,opt,name=StateText,proto3" json:"StateText,omitempty" dc:"状态原文/原因"` // 状态原文/原因 - CreatedAt *timestamppb.Timestamp `protobuf:"bytes,23,opt,name=CreatedAt,proto3" json:"CreatedAt,omitempty"` // - UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,24,opt,name=UpdatedAt,proto3" json:"UpdatedAt,omitempty"` // - SuccessAt *timestamppb.Timestamp `protobuf:"bytes,25,opt,name=SuccessAt,proto3" json:"SuccessAt,omitempty" dc:"支付完成时间"` // 支付完成时间 + Area string `protobuf:"bytes,11,opt,name=Area,proto3" json:"Area,omitempty" dc:"地区"` // 地区 + Ccy string `protobuf:"bytes,12,opt,name=Ccy,proto3" json:"Ccy,omitempty" dc:"币种"` // 币种 + Amount string `protobuf:"bytes,13,opt,name=Amount,proto3" json:"Amount,omitempty" dc:"金额"` // 金额 + Deduct string `protobuf:"bytes,14,opt,name=Deduct,proto3" json:"Deduct,omitempty" dc:"费用/扣款/手续费"` // 费用/扣款/手续费 + Amounted string `protobuf:"bytes,15,opt,name=Amounted,proto3" json:"Amounted,omitempty" dc:"实付金额"` // 实付金额 + Cheque string `protobuf:"bytes,16,opt,name=Cheque,proto3" json:"Cheque,omitempty" dc:"凭证/回单"` // 凭证/回单 + Metadata string `protobuf:"bytes,17,opt,name=Metadata,proto3" json:"Metadata,omitempty" dc:"Meta数据"` // Meta数据 + Description string `protobuf:"bytes,18,opt,name=Description,proto3" json:"Description,omitempty" dc:"订单备注/摘要"` // 订单备注/摘要 + Redirect string `protobuf:"bytes,19,opt,name=Redirect,proto3" json:"Redirect,omitempty" dc:"下一跳>>跳转地址/二维码地址或代码"` // 下一跳>>跳转地址/二维码地址或代码 + Response string `protobuf:"bytes,20,opt,name=Response,proto3" json:"Response,omitempty" dc:"订单响应/回调数据"` // 订单响应/回调数据 + Calls int32 `protobuf:"varint,21,opt,name=Calls,proto3" json:"Calls,omitempty" dc:"回调次数"` // 回调次数 + State int32 `protobuf:"varint,22,opt,name=State,proto3" json:"State,omitempty" dc:"状态:-1=Failure, 0=Pending, 1=Success"` // 状态:-1=Failure, 0=Pending, 1=Success + StateText string `protobuf:"bytes,23,opt,name=StateText,proto3" json:"StateText,omitempty" dc:"状态原文/原因"` // 状态原文/原因 + CreatedAt *timestamppb.Timestamp `protobuf:"bytes,24,opt,name=CreatedAt,proto3" json:"CreatedAt,omitempty"` // + UpdatedAt *timestamppb.Timestamp `protobuf:"bytes,25,opt,name=UpdatedAt,proto3" json:"UpdatedAt,omitempty"` // + SuccessAt *timestamppb.Timestamp `protobuf:"bytes,26,opt,name=SuccessAt,proto3" json:"SuccessAt,omitempty" dc:"支付完成时间"` // 支付完成时间 } func (x *Orders) Reset() { @@ -158,6 +159,13 @@ func (x *Orders) GetVia() string { return "" } +func (x *Orders) GetArea() string { + if x != nil { + return x.Area + } + return "" +} + func (x *Orders) GetCcy() string { if x != nil { return x.Ccy @@ -269,7 +277,7 @@ var file_orders_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x05, 0x0a, 0x06, 0x4f, 0x72, + 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd8, 0x05, 0x0a, 0x06, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x03, 0x20, @@ -283,40 +291,42 @@ var file_orders_proto_rawDesc = []byte{ 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x56, 0x69, - 0x61, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x56, 0x69, 0x61, 0x12, 0x10, 0x0a, 0x03, - 0x43, 0x63, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, 0x63, 0x79, 0x12, 0x16, - 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, - 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x68, - 0x65, 0x71, 0x75, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x43, 0x68, 0x65, 0x71, - 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x10, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, - 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x11, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x12, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x61, 0x6c, 0x6c, - 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x12, 0x14, - 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x65, 0x78, - 0x74, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x54, 0x65, - 0x78, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, - 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x52, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x38, 0x0a, 0x09, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x41, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x61, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x56, 0x69, 0x61, 0x12, 0x12, 0x0a, 0x04, + 0x41, 0x72, 0x65, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x41, 0x72, 0x65, 0x61, + 0x12, 0x10, 0x0a, 0x03, 0x43, 0x63, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, + 0x63, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x65, + 0x64, 0x75, 0x63, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x44, 0x65, 0x64, 0x75, + 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x0f, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x43, 0x68, 0x65, 0x71, 0x75, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x43, 0x68, 0x65, 0x71, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x61, 0x6c, + 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x54, 0x65, 0x78, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x54, 0x65, 0x78, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x64, 0x41, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, - 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x74, - 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x2e, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x69, 0x6f, 0x2e, - 0x63, 0x6e, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x70, 0x61, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, + 0x12, 0x38, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x19, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, + 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x53, 0x75, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x53, 0x75, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x41, 0x74, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x2e, 0x6c, 0x69, 0x6e, 0x6b, + 0x69, 0x69, 0x6f, 0x2e, 0x63, 0x6e, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x70, 0x61, 0x79, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/org.pb.go b/org.pb.go index fdf426d..3317ab1 100644 --- a/org.pb.go +++ b/org.pb.go @@ -389,10 +389,11 @@ type RefundReq struct { OrderNo string `protobuf:"bytes,5,opt,name=OrderNo,proto3" json:"OrderNo,omitempty" dc:"商户订单号"` //商户订单号 TokenNo string `protobuf:"bytes,6,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId RefundNo string `protobuf:"bytes,7,opt,name=RefundNo,proto3" json:"RefundNo,omitempty" dc:"退款订单号"` //退款订单号 - Ccy string `protobuf:"bytes,8,opt,name=Ccy,proto3" json:"Ccy,omitempty" dc:"币种"` // 币种 - Amount string `protobuf:"bytes,9,opt,name=Amount,proto3" json:"Amount,omitempty" dc:"退款金额"` //退款金额 - Deduct string `protobuf:"bytes,10,opt,name=Deduct,proto3" json:"Deduct,omitempty" dc:"费用/扣款/手续费"` // 费用/扣款/手续费 - Amounted string `protobuf:"bytes,11,opt,name=Amounted,proto3" json:"Amounted,omitempty" dc:"实退金额"` // 实退金额 + Via string `protobuf:"bytes,8,opt,name=Via,proto3" json:"Via,omitempty" dc:"支付方式"` // 支付方式 + Ccy string `protobuf:"bytes,9,opt,name=Ccy,proto3" json:"Ccy,omitempty" dc:"币种"` // 币种 + Amount string `protobuf:"bytes,10,opt,name=Amount,proto3" json:"Amount,omitempty" dc:"退款金额"` //退款金额 + Deduct string `protobuf:"bytes,11,opt,name=Deduct,proto3" json:"Deduct,omitempty" dc:"费用/扣款/手续费"` // 费用/扣款/手续费 + Amounted string `protobuf:"bytes,12,opt,name=Amounted,proto3" json:"Amounted,omitempty" dc:"实退金额"` // 实退金额 Metadata map[string]string `protobuf:"bytes,17,rep,name=Metadata,proto3" json:"Metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" dc:"Meta数据"` // Meta数据 Description string `protobuf:"bytes,18,opt,name=Description,proto3" json:"Description,omitempty" dc:"退款备注/摘要"` // 退款备注/摘要 SuccessUrl string `protobuf:"bytes,29,opt,name=SuccessUrl,proto3" json:"SuccessUrl,omitempty" dc:"成功跳转地址"` //成功跳转地址 @@ -478,6 +479,13 @@ func (x *RefundReq) GetRefundNo() string { return "" } +func (x *RefundReq) GetVia() string { + if x != nil { + return x.Via + } + return "" +} + func (x *RefundReq) GetCcy() string { if x != nil { return x.Ccy @@ -542,11 +550,12 @@ type QueryReq struct { Kid uint64 `protobuf:"varint,1,opt,name=Kid,proto3" json:"Kid,omitempty" dc:"主体ID"` // 主体ID Uid string `protobuf:"bytes,2,opt,name=Uid,proto3" json:"Uid,omitempty" dc:"用户ID"` // 用户ID Org string `protobuf:"bytes,3,opt,name=Org,proto3" json:"Org,omitempty" dc:"渠道标识"` //渠道标识 - OrgNo string `protobuf:"bytes,4,opt,name=OrgNo,proto3" json:"OrgNo,omitempty" dc:"渠道订单号"` //渠道订单号 - OrderNo string `protobuf:"bytes,5,opt,name=OrderNo,proto3" json:"OrderNo,omitempty" dc:"商户订单号"` //商户订单号 - TokenNo string `protobuf:"bytes,6,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId - StoreNo string `protobuf:"bytes,7,opt,name=StoreNo,proto3" json:"StoreNo,omitempty" dc:"门店编号"` // 门店编号 - DeviceNo string `protobuf:"bytes,8,opt,name=DeviceNo,proto3" json:"DeviceNo,omitempty" dc:"设备编号"` // 设备编号 + Via string `protobuf:"bytes,4,opt,name=Via,proto3" json:"Via,omitempty" dc:"支付方式"` //支付方式 + OrgNo string `protobuf:"bytes,5,opt,name=OrgNo,proto3" json:"OrgNo,omitempty" dc:"渠道订单号"` //渠道订单号 + OrderNo string `protobuf:"bytes,6,opt,name=OrderNo,proto3" json:"OrderNo,omitempty" dc:"商户订单号"` //商户订单号 + TokenNo string `protobuf:"bytes,7,opt,name=TokenNo,proto3" json:"TokenNo,omitempty" dc:"TokenId"` // TokenId + StoreNo string `protobuf:"bytes,8,opt,name=StoreNo,proto3" json:"StoreNo,omitempty" dc:"门店编号"` // 门店编号 + DeviceNo string `protobuf:"bytes,9,opt,name=DeviceNo,proto3" json:"DeviceNo,omitempty" dc:"设备编号"` // 设备编号 RefundNo string `protobuf:"bytes,10,opt,name=RefundNo,proto3" json:"RefundNo,omitempty" dc:"退款单号"` //退款单号 } @@ -601,6 +610,13 @@ func (x *QueryReq) GetOrg() string { return "" } +func (x *QueryReq) GetVia() string { + if x != nil { + return x.Via + } + return "" +} + func (x *QueryReq) GetOrgNo() string { if x != nil { return x.OrgNo @@ -651,6 +667,7 @@ type CallbackReq struct { Kid uint64 `protobuf:"varint,1,opt,name=Kid,proto3" json:"Kid,omitempty" dc:"主体ID"` // 主体ID Uid string `protobuf:"bytes,2,opt,name=Uid,proto3" json:"Uid,omitempty" dc:"用户ID"` // 用户ID Org string `protobuf:"bytes,3,opt,name=Org,proto3" json:"Org,omitempty" dc:"渠道标识"` //渠道标识 + Via string `protobuf:"bytes,4,opt,name=Via,proto3" json:"Via,omitempty" dc:"支付方式"` //支付方式 Url string `protobuf:"bytes,5,opt,name=Url,proto3" json:"Url,omitempty" dc:"URL"` //URL Action string `protobuf:"bytes,7,opt,name=Action,proto3" json:"Action,omitempty" dc:"Action"` //Action Query map[string]string `protobuf:"bytes,8,rep,name=Query,proto3" json:"Query,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" dc:"Query"` //Query @@ -709,6 +726,13 @@ func (x *CallbackReq) GetOrg() string { return "" } +func (x *CallbackReq) GetVia() string { + if x != nil { + return x.Via + } + return "" +} + func (x *CallbackReq) GetUrl() string { if x != nil { return x.Url @@ -788,7 +812,7 @@ var file_org_proto_rawDesc = []byte{ 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 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, 0xda, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xec, 0x03, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, @@ -799,87 +823,90 @@ var file_org_proto_rawDesc = []byte{ 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x43, 0x63, 0x79, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, 0x63, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x34, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, - 0x64, 0x52, 0x65, 0x71, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, - 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, - 0x0a, 0x0a, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x55, 0x72, 0x6c, 0x18, 0x1d, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x55, 0x72, 0x6c, 0x12, 0x1e, - 0x0a, 0x0a, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x1e, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x55, 0x72, 0x6c, 0x1a, 0x3b, - 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 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, 0xdc, 0x01, 0x0a, 0x08, - 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x4f, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, 0x72, 0x67, 0x12, 0x14, - 0x0a, 0x05, 0x4f, 0x72, 0x67, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, - 0x72, 0x67, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x12, 0x18, - 0x0a, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x4e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x74, 0x6f, 0x72, 0x65, - 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x1a, - 0x0a, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x22, 0xd7, 0x02, 0x0a, 0x0b, 0x43, - 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, + 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x56, 0x69, 0x61, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x56, 0x69, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x43, 0x63, + 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, 0x63, 0x79, 0x12, 0x16, 0x0a, 0x06, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x12, 0x34, 0x0a, 0x08, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x11, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, + 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x12, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x55, 0x72, 0x6c, 0x18, 0x1d, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x55, 0x72, 0x6c, + 0x12, 0x1e, 0x0a, 0x0a, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x1e, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x55, 0x72, 0x6c, + 0x1a, 0x3b, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64, 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, 0xee, 0x01, + 0x0a, 0x08, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, 0x72, 0x67, - 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, - 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x05, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x6c, 0x6c, - 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x30, 0x0a, 0x06, 0x48, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x43, 0x61, 0x6c, 0x6c, - 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x42, - 0x6f, 0x64, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x1a, - 0x38, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x48, 0x65, 0x61, - 0x64, 0x65, 0x72, 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, 0x2a, 0x37, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, - 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x07, 0x46, 0x61, - 0x69, 0x6c, 0x75, 0x72, 0x65, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, - 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x32, 0xf0, 0x01, - 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x12, 0x1a, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x08, 0x2e, - 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, 0x50, 0x6f, 0x6e, 0x67, 0x52, 0x65, - 0x73, 0x12, 0x20, 0x0a, 0x03, 0x50, 0x61, 0x79, 0x12, 0x07, 0x2e, 0x50, 0x61, 0x79, 0x52, 0x65, - 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x12, 0x27, 0x0a, 0x06, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x12, 0x0a, 0x2e, - 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x73, 0x12, 0x2a, 0x0a, 0x08, - 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x12, 0x0c, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x29, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x09, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, - 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x66, 0x75, - 0x6e, 0x64, 0x12, 0x09, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x73, - 0x32, 0x36, 0x0a, 0x03, 0x42, 0x73, 0x73, 0x12, 0x2f, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x73, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x73, 0x28, 0x01, 0x30, 0x01, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x2e, - 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x69, 0x6f, 0x2e, 0x63, 0x6e, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x70, - 0x61, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x10, 0x0a, 0x03, 0x56, 0x69, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x56, + 0x69, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x67, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x4f, 0x72, 0x67, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x4e, 0x6f, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x12, 0x18, 0x0a, 0x07, + 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4e, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, + 0x74, 0x6f, 0x72, 0x65, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x4e, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x4e, 0x6f, 0x22, 0xe9, + 0x02, 0x0a, 0x0b, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, + 0x0a, 0x03, 0x4b, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x4b, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, + 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x4f, 0x72, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x56, 0x69, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x56, 0x69, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x2d, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, + 0x30, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x18, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, + 0x04, 0x42, 0x6f, 0x64, 0x79, 0x1a, 0x38, 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 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, 0x1a, + 0x39, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 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, 0x2a, 0x37, 0x0a, 0x05, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x10, 0x00, + 0x12, 0x14, 0x0a, 0x07, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x10, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x10, 0x01, 0x32, 0xf0, 0x01, 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x12, 0x1a, 0x0a, 0x04, 0x50, + 0x69, 0x6e, 0x67, 0x12, 0x08, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x08, 0x2e, + 0x50, 0x6f, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x03, 0x50, 0x61, 0x79, 0x12, 0x07, + 0x2e, 0x50, 0x61, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x27, 0x0a, 0x06, 0x52, 0x65, 0x66, + 0x75, 0x6e, 0x64, 0x12, 0x0a, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x1a, + 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, + 0x64, 0x73, 0x12, 0x2a, 0x0a, 0x08, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x12, 0x0c, + 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x29, + 0x0a, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x09, 0x2e, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x0b, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x12, 0x09, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, + 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, + 0x65, 0x66, 0x75, 0x6e, 0x64, 0x73, 0x32, 0x36, 0x0a, 0x03, 0x42, 0x73, 0x73, 0x12, 0x2f, 0x0a, + 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x28, 0x01, 0x30, 0x01, 0x42, 0x25, + 0x5a, 0x23, 0x67, 0x69, 0x74, 0x2e, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x69, 0x6f, 0x2e, 0x63, 0x6e, + 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x70, 0x61, 0x79, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/org_grpc.pb.go b/org_grpc.pb.go index 2c8d21c..883316a 100644 --- a/org_grpc.pb.go +++ b/org_grpc.pb.go @@ -321,6 +321,7 @@ const ( // // 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. type BssClient interface { + // rpc Event(stream protobuf.Orders) returns (); //事件通知 Order(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[Orders, Orders], error) } @@ -349,6 +350,7 @@ type Bss_OrderClient = grpc.BidiStreamingClient[Orders, Orders] // All implementations must embed UnimplementedBssServer // for forward compatibility. type BssServer interface { + // rpc Event(stream protobuf.Orders) returns (); //事件通知 Order(grpc.BidiStreamingServer[Orders, Orders]) error mustEmbedUnimplementedBssServer() }