From fb7fb09f9dcb369ceb5a5a5001a5d8f624db2529 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Mon, 15 Aug 2022 04:08:57 +0000 Subject: [PATCH] member, member_bank_account are modified --- proto/c2se/member.proto | 15 ++++++++++++++- proto/c2se/member_bank_account.proto | 6 ++++-- proto/models/member.proto | 26 ++++++++++++++------------ proto/models/member_bank_account.proto | 21 ++++++++++++++++++--- proto/ss/member.proto | 15 ++++++++++++++- proto/ss/member_bank_account.proto | 6 ++++-- 6 files changed, 68 insertions(+), 21 deletions(-) diff --git a/proto/c2se/member.proto b/proto/c2se/member.proto index 77de21a..1e88242 100644 --- a/proto/c2se/member.proto +++ b/proto/c2se/member.proto @@ -8,6 +8,12 @@ import "protobuf/pagination.proto"; import "models/member.proto"; message CreateMemberRequest { + message BankAccount { + string bank_id = 1; + string name = 2; + string account_number = 3; + string exchange_password = 4; + } string site_id = 1; string member_class_id = 2; string member_level_id = 3; @@ -16,7 +22,7 @@ message CreateMemberRequest { string password = 6; string nickname = 7; optional string mobile_phone_number = 8; - bet.beteran.member.MemberState state = 9; + optional BankAccount bank_account = 9; } message CreateMemberResponse { @@ -78,11 +84,18 @@ message GetMemberByUsernameResponse { } message UpdateMemberRequest { + message BankAccount { + string bank_id = 1; + string name = 2; + string account_number = 3; + string exchange_password = 4; + } string id = 1; optional string site_id = 2; optional string member_level_id = 3; optional string password = 4; optional string mobile_phone_number = 5; + optional BankAccount bank_account = 6; } message UpdateMemberResponse { diff --git a/proto/c2se/member_bank_account.proto b/proto/c2se/member_bank_account.proto index 4eef957..6396f94 100644 --- a/proto/c2se/member_bank_account.proto +++ b/proto/c2se/member_bank_account.proto @@ -12,7 +12,8 @@ message CreateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - optional string memo = 5; + string exchange_password = 5; + optional string memo = 6; } message CreateMemberBankAccountResponse { @@ -61,7 +62,8 @@ message UpdateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - optional string memo = 5; + string exchange_password = 5; + optional string memo = 6; } diff --git a/proto/models/member.proto b/proto/models/member.proto index d4d73de..fbf07f0 100644 --- a/proto/models/member.proto +++ b/proto/models/member.proto @@ -4,6 +4,7 @@ package bet.beteran.member; import "models/site.proto"; +import "models/member_bank_account.proto"; import "models/member_class.proto"; import "models/member_level.proto"; @@ -42,16 +43,17 @@ message MemberModel { bet.beteran.site.Site site = 2; bet.beteran.member_class.MemberClass member_class = 3; bet.beteran.member_level.MemberLevel member_level = 4; - optional Member referrer_member = 5; - uint64 referred_count = 6; - string username = 7; - string nickname = 8; - optional string mobile_phone_number = 9; - MemberState state = 10; - optional uint64 state_changed_at = 11; - optional string last_signined_ip = 12; - optional uint64 last_signined_at = 13; - uint64 created_at = 14; - uint64 updated_at = 15; - optional uint64 deleted_at = 16; + optional bet.beteran.member_bank_account.MemberBankAccountModel bank_account = 5; + optional Member referrer_member = 6; + uint64 referred_count = 7; + string username = 8; + string nickname = 9; + optional string mobile_phone_number = 10; + MemberState state = 11; + optional uint64 state_changed_at = 12; + optional string last_signined_ip = 13; + optional uint64 last_signined_at = 14; + uint64 created_at = 15; + uint64 updated_at = 16; + optional uint64 deleted_at = 17; } diff --git a/proto/models/member_bank_account.proto b/proto/models/member_bank_account.proto index 2139e09..aff57e2 100644 --- a/proto/models/member_bank_account.proto +++ b/proto/models/member_bank_account.proto @@ -2,13 +2,28 @@ syntax = "proto3"; package bet.beteran.member_bank_account; +import "models/bank.proto"; + message MemberBankAccount { string id = 1; string member_id = 2; string bank_id = 3; string name = 4; string account_number = 5; - optional string memo = 6; - uint64 created_at = 7; - uint64 updated_at = 8; + string exchange_password = 6; + optional string memo = 7; + uint64 created_at = 8; + uint64 updated_at = 9; +} + +message MemberBankAccountModel { + string id = 1; + string member_id = 2; + bet.beteran.bank.Bank bank = 3; + string name = 4; + string account_number = 5; + string exchange_password = 6; + optional string memo = 7; + uint64 created_at = 8; + uint64 updated_at = 9; } diff --git a/proto/ss/member.proto b/proto/ss/member.proto index c4e9a73..06646f7 100644 --- a/proto/ss/member.proto +++ b/proto/ss/member.proto @@ -11,6 +11,12 @@ import "models/member.proto"; // subject = bet.beteran.ss.member.CreateMember message CreateMemberRequest { message Request { + message BankAccount { + string bank_id = 1; + string name = 2; + string account_number = 3; + string exchange_password = 4; + } string site_id = 1; string member_class_id = 2; string member_level_id = 3; @@ -19,7 +25,7 @@ message CreateMemberRequest { string password = 6; string nickname = 7; optional string mobile_phone_number = 8; - bet.beteran.member.MemberState state = 9; + optional BankAccount bank_account = 9; } bet.beteran.core.network.Client client = 1; Request request = 2; @@ -101,11 +107,18 @@ message GetMemberByUsernameResponse { // subject = bet.beteran.ss.member.UpdateMember message UpdateMemberRequest { message Request { + message BankAccount { + string bank_id = 1; + string name = 2; + string account_number = 3; + string exchange_password = 4; + } string id = 1; optional string site_id = 2; optional string member_level_id = 3; optional string password = 4; optional string mobile_phone_number = 5; + optional BankAccount bank_account = 6; } bet.beteran.core.network.Client client = 1; Request request = 2; diff --git a/proto/ss/member_bank_account.proto b/proto/ss/member_bank_account.proto index 28abcdd..d1e1feb 100644 --- a/proto/ss/member_bank_account.proto +++ b/proto/ss/member_bank_account.proto @@ -14,7 +14,8 @@ message CreateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - optional string memo = 5; + string exchange_password = 5; + optional string memo = 6; } bet.beteran.core.network.Client client = 1; Request request = 2; @@ -78,7 +79,8 @@ message UpdateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - optional string memo = 5; + string exchange_password = 5; + optional string memo = 6; } bet.beteran.core.network.Client client = 1;