From 8ed0b5b2cfe29a9d82f3e1e614285cb9aec40ac6 Mon Sep 17 00:00:00 2001 From: "dc.To" Date: Thu, 24 Apr 2025 16:00:27 +0800 Subject: [PATCH] add refund id --- org.pb.go | 61 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/org.pb.go b/org.pb.go index f358610..3ae3311 100644 --- a/org.pb.go +++ b/org.pb.go @@ -382,18 +382,19 @@ type RefundReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Kid uint64 `protobuf:"varint,1,opt,name=Kid,proto3" json:"Kid,omitempty" dc:"主体ID v:required"` // 主体ID v:required - 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:"渠道标识 v:required"` //渠道标识 v:required - 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 - RefundNo string `protobuf:"bytes,7,opt,name=RefundNo,proto3" json:"RefundNo,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:"实退金额"` // 实退金额 + Id uint64 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty" dc:"ID v:required"` // ID v:required + Kid uint64 `protobuf:"varint,2,opt,name=Kid,proto3" json:"Kid,omitempty" dc:"主体ID v:required"` // 主体ID v:required + Uid string `protobuf:"bytes,3,opt,name=Uid,proto3" json:"Uid,omitempty" dc:"用户ID"` // 用户ID + Org string `protobuf:"bytes,4,opt,name=Org,proto3" json:"Org,omitempty" dc:"渠道标识 v:required"` //渠道标识 v:required + 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 + RefundNo string `protobuf:"bytes,8,opt,name=RefundNo,proto3" json:"RefundNo,omitempty" dc:"渠道方退单号"` //渠道方退单号 + Via string `protobuf:"bytes,9,opt,name=Via,proto3" json:"Via,omitempty" dc:"支付方式"` // 支付方式 + Ccy string `protobuf:"bytes,10,opt,name=Ccy,proto3" json:"Ccy,omitempty" dc:"币种"` // 币种 + Amount string `protobuf:"bytes,11,opt,name=Amount,proto3" json:"Amount,omitempty" dc:"退款金额"` //退款金额 + Deduct string `protobuf:"bytes,12,opt,name=Deduct,proto3" json:"Deduct,omitempty" dc:"费用/扣款/手续费"` // 费用/扣款/手续费 + Amounted string `protobuf:"bytes,13,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:"成功跳转地址"` //成功跳转地址 @@ -430,6 +431,13 @@ func (*RefundReq) Descriptor() ([]byte, []int) { return file_org_proto_rawDescGZIP(), []int{4} } +func (x *RefundReq) GetId() uint64 { + if x != nil { + return x.Id + } + return 0 +} + func (x *RefundReq) GetKid() uint64 { if x != nil { return x.Kid @@ -907,24 +915,25 @@ 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, 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, - 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, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xfc, + 0x03, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x71, 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, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x4f, 0x72, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4f, + 0x72, 0x67, 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, 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, + 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, 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, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 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, + 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x56, 0x69, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x43, 0x63, + 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, 0x63, 0x79, 0x12, 0x16, 0x0a, 0x06, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x65, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0c, 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, 0x18, 0x0d, 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,