From f1a8f586b3fc9595009bfbd17b27b964c5fbc1d0 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Wed, 24 Aug 2022 06:12:21 +0000 Subject: [PATCH] member, member_bank_account are modified --- build.rs | 5 ++++ proto/c2se/backend/member.proto | 2 ++ proto/c2se/backend/member_bank_account.proto | 1 + proto/c2se/frontend/member.proto | 11 +++++++ proto/c2se/frontend/member_bank_account.proto | 8 +++++ proto/c2se/frontend/member_bank_deposit.proto | 9 ++++++ .../c2se/frontend/member_bank_withdraw.proto | 9 ++++++ proto/c2se/member.proto | 25 ++++++++++++---- proto/c2se/member_bank_account.proto | 18 +++++++++-- proto/ss/member.proto | 30 +++++++++++++++---- proto/ss/member_bank_account.proto | 21 +++++++++++-- 11 files changed, 123 insertions(+), 16 deletions(-) create mode 100644 proto/c2se/frontend/member.proto create mode 100644 proto/c2se/frontend/member_bank_account.proto create mode 100644 proto/c2se/frontend/member_bank_deposit.proto create mode 100644 proto/c2se/frontend/member_bank_withdraw.proto diff --git a/build.rs b/build.rs index a0a16a6..a41ae79 100644 --- a/build.rs +++ b/build.rs @@ -89,6 +89,11 @@ static TARGETS: Lazy>> = Lazy::new(|| { "./proto/c2se/backend/api/game.proto", "./proto/c2se/frontend/bank.proto", "./proto/c2se/frontend/identity.proto", + "./proto/c2se/frontend/member_bank_account.proto", + "./proto/c2se/frontend/member_bank_deposit.proto", + "./proto/c2se/frontend/member_bank_withdraw.proto", + "./proto/c2se/frontend/member_referrer.proto", + "./proto/c2se/frontend/member.proto", "./proto/c2se/frontend/api/vendor.proto", "./proto/c2se/frontend/api/game.proto", ], diff --git a/proto/c2se/backend/member.proto b/proto/c2se/backend/member.proto index 89b9f0f..edd772f 100644 --- a/proto/c2se/backend/member.proto +++ b/proto/c2se/backend/member.proto @@ -8,4 +8,6 @@ package bet.beteran.c2se.backend.member; // subject = bet.beteran.c2se.backend.member.GetMember // subject = bet.beteran.c2se.backend.member.GetMemberByUsername // subject = bet.beteran.c2se.backend.member.UpdateMember +// subject = bet.beteran.c2se.backend.member.UpdateMemberForPassword +// subject = bet.beteran.c2se.backend.member.UpdateMemberForState // subject = bet.beteran.c2se.backend.member.DeleteMember diff --git a/proto/c2se/backend/member_bank_account.proto b/proto/c2se/backend/member_bank_account.proto index 5865d23..a2f4cf9 100644 --- a/proto/c2se/backend/member_bank_account.proto +++ b/proto/c2se/backend/member_bank_account.proto @@ -6,4 +6,5 @@ package bet.beteran.c2se.backend.member_bank_account; // subject = bet.beteran.c2se.backend.member_bank_account.ListMemberBankAccounts // subject = bet.beteran.c2se.backend.member_bank_account.GetMemberBankAccount // subject = bet.beteran.c2se.backend.member_bank_account.UpdateMemberBankAccount +// subject = bet.beteran.c2se.backend.member_bank_account.UpdateMemberBankAccountForExchangePassword // subject = bet.beteran.c2se.backend.member_bank_account.DeleteMemberBankAccount diff --git a/proto/c2se/frontend/member.proto b/proto/c2se/frontend/member.proto new file mode 100644 index 0000000..517fe46 --- /dev/null +++ b/proto/c2se/frontend/member.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package bet.beteran.c2se.frontend.member; + + +// subject = bet.beteran.c2se.frontend.member.CreateMember +// subject = bet.beteran.c2se.frontend.member.GetMember +// subject = bet.beteran.c2se.frontend.member.GetMemberByUsername +// subject = bet.beteran.c2se.frontend.member.UpdateMember +// subject = bet.beteran.c2se.frontend.member.UpdateMemberForPassword +// subject = bet.beteran.c2se.frontend.member.DeleteMember diff --git a/proto/c2se/frontend/member_bank_account.proto b/proto/c2se/frontend/member_bank_account.proto new file mode 100644 index 0000000..584f572 --- /dev/null +++ b/proto/c2se/frontend/member_bank_account.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package bet.beteran.c2se.frontend.member_bank_account; + +// subject = bet.beteran.c2se.frontend.member_bank_account.CreateMemberBankAccount +// subject = bet.beteran.c2se.frontend.member_bank_account.GetMemberBankAccount +// subject = bet.beteran.c2se.frontend.member_bank_account.UpdateMemberBankAccount +// subject = bet.beteran.c2se.frontend.member_bank_account.UpdateMemberBankAccountForExchangePassword diff --git a/proto/c2se/frontend/member_bank_deposit.proto b/proto/c2se/frontend/member_bank_deposit.proto new file mode 100644 index 0000000..d0d0c40 --- /dev/null +++ b/proto/c2se/frontend/member_bank_deposit.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package bet.beteran.c2se.frontend.member_bank_deposit; + +// subject = bet.beteran.c2se.frontend.member_bank_deposit.CreateMemberBankDeposit +// subject = bet.beteran.c2se.frontend.member_bank_deposit.ListMemberBankDeposits +// subject = bet.beteran.c2se.frontend.member_bank_deposit.GetMemberBankDeposit +// subject = bet.beteran.c2se.frontend.member_bank_deposit.UpdateMemberBankDeposit +// subject = bet.beteran.c2se.frontend.member_bank_deposit.DeleteMemberBankDeposit diff --git a/proto/c2se/frontend/member_bank_withdraw.proto b/proto/c2se/frontend/member_bank_withdraw.proto new file mode 100644 index 0000000..4778226 --- /dev/null +++ b/proto/c2se/frontend/member_bank_withdraw.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package bet.beteran.c2se.frontend.member_bank_withdraw; + +// subject = bet.beteran.c2se.frontend.member_bank_withdraw.CreateMemberBankWithdraw +// subject = bet.beteran.c2se.frontend.member_bank_withdraw.ListMemberBankWithdraws +// subject = bet.beteran.c2se.frontend.member_bank_withdraw.GetMemberBankWithdraw +// subject = bet.beteran.c2se.frontend.member_bank_withdraw.UpdateMemberBankWithdraw +// subject = bet.beteran.c2se.frontend.member_bank_withdraw.DeleteMemberBankWithdraw diff --git a/proto/c2se/member.proto b/proto/c2se/member.proto index bb5dfee..a66ff92 100644 --- a/proto/c2se/member.proto +++ b/proto/c2se/member.proto @@ -14,6 +14,7 @@ message CreateMemberRequest { string name = 2; string account_number = 3; string exchange_password = 4; + optional string memo = 5; } message GameSetting { bool can_bet_casino = 1; @@ -122,7 +123,7 @@ message UpdateMemberRequest { string bank_id = 2; string name = 3; string account_number = 4; - string exchange_password = 5; + optional string memo = 5; } message GameSetting { string id = 1; @@ -159,11 +160,10 @@ message UpdateMemberRequest { 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; - optional GameSetting game_setting = 7; - optional SettlementSetting settlement_setting = 8; + optional string mobile_phone_number = 4; + optional BankAccount bank_account = 5; + optional GameSetting game_setting = 6; + optional SettlementSetting settlement_setting = 7; } message UpdateMemberResponse { @@ -174,6 +174,19 @@ message UpdateMemberResponse { optional Result result = 2; } +message UpdateMemberForPasswordRequest { + string id = 1; + string password = 2; +} + +message UpdateMemberForPasswordResponse { + message Result { + } + optional bet.protobuf.rpc.Error error = 1; + optional Result result = 2; +} + + message UpdateMemberForStateRequest { string id = 1; bet.beteran.member.MemberState state = 2; diff --git a/proto/c2se/member_bank_account.proto b/proto/c2se/member_bank_account.proto index 6396f94..aca94fd 100644 --- a/proto/c2se/member_bank_account.proto +++ b/proto/c2se/member_bank_account.proto @@ -62,8 +62,7 @@ message UpdateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - string exchange_password = 5; - optional string memo = 6; + optional string memo = 5; } @@ -75,6 +74,21 @@ message UpdateMemberBankAccountResponse { optional Result result = 2; } + + +message UpdateMemberBankAccountForExchangePasswordRequest { + string id = 1; + string exchange_password = 2; +} + +message UpdateMemberBankAccountForExchangePasswordResponse { + message Result { + } + optional bet.protobuf.rpc.Error error = 1; + optional Result result = 2; +} + + message DeleteMemberBankAccountRequest { string id = 1; } diff --git a/proto/ss/member.proto b/proto/ss/member.proto index 5401f59..a97e4ce 100644 --- a/proto/ss/member.proto +++ b/proto/ss/member.proto @@ -144,7 +144,7 @@ message UpdateMemberRequest { string bank_id = 2; string name = 3; string account_number = 4; - string exchange_password = 5; + optional string memo = 5; } message GameSetting { string id = 1; @@ -181,11 +181,10 @@ message UpdateMemberRequest { 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; - optional GameSetting game_setting = 7; - optional SettlementSetting settlement_setting = 8; + optional string mobile_phone_number = 4; + optional BankAccount bank_account = 5; + optional GameSetting game_setting = 6; + optional SettlementSetting settlement_setting = 7; } bet.beteran.core.network.Client client = 1; Request request = 2; @@ -199,6 +198,25 @@ message UpdateMemberResponse { optional Result result = 2; } + +// subject = bet.beteran.ss.member.UpdateMemberForPassword +message UpdateMemberForPasswordRequest { + message Request { + string id = 1; + string password = 2; + } + bet.beteran.core.network.Client client = 1; + Request request = 2; +} + +message UpdateMemberForPasswordResponse { + message Result { + } + optional bet.protobuf.rpc.Error error = 1; + optional Result result = 2; +} + + // subject = bet.beteran.ss.member.UpdateMemberForState message UpdateMemberForStateRequest { message Request { diff --git a/proto/ss/member_bank_account.proto b/proto/ss/member_bank_account.proto index d1e1feb..d31cd28 100644 --- a/proto/ss/member_bank_account.proto +++ b/proto/ss/member_bank_account.proto @@ -79,8 +79,7 @@ message UpdateMemberBankAccountRequest { string bank_id = 2; string name = 3; string account_number = 4; - string exchange_password = 5; - optional string memo = 6; + optional string memo = 5; } bet.beteran.core.network.Client client = 1; @@ -95,6 +94,24 @@ message UpdateMemberBankAccountResponse { optional Result result = 2; } + +// subject = bet.beteran.ss.member_bank_account.UpdateMemberBankAccountForExchangePassword +message UpdateMemberBankAccountForExchangePasswordRequest { + message Request { + string id = 1; + string exchange_password = 2; + } + bet.beteran.core.network.Client client = 1; + Request request = 2; +} + +message UpdateMemberBankAccountForExchangePasswordResponse { + message Result { + } + optional bet.protobuf.rpc.Error error = 1; + optional Result result = 2; +} + // subject = bet.beteran.ss.member_bank_account.DeleteMemberBankAccount message DeleteMemberBankAccountRequest { message Request {