diff --git a/Cargo.toml b/Cargo.toml index 4c2d854..6c74c39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ prost = { version = "0" } nats = { version = "0" } base64 = { version = "0" } -beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.70-snapshot" } -beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.54-snapshot" } +beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.72-snapshot" } +beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.56-snapshot" } [build-dependencies] diff --git a/src/member/service.rs b/src/member/service.rs index 7aa127d..9c84078 100644 --- a/src/member/service.rs +++ b/src/member/service.rs @@ -102,6 +102,48 @@ impl Service { None => None, }; + let game_setting = match req.game_setting { + Some(a) => Some( + bpr::ss::member::create_member_request::request::GameSetting { + can_bet_casino: a.can_bet_casino, + can_bet_slot: a.can_bet_slot, + can_bet_powerball: a.can_bet_powerball, + can_bet_powerladder: a.can_bet_powerladder, + can_bet_eos: a.can_bet_eos, + can_bet_bogglepowerball: a.can_bet_bogglepowerball, + }, + ), + None => None, + }; + + let settlement_setting = match req.settlement_setting { + Some(a) => Some( + bpr::ss::member::create_member_request::request::SettlementSetting { + can_exchange: a.can_exchange, + can_first_charge_comp: a.can_first_charge_comp, + can_per_charge_comp: a.can_per_charge_comp, + manual_payment_type_for_partner: a.manual_payment_type_for_partner, + settlement_type: a.settlement_type, + rate_casino: a.rate_casino, + rate_casino_loosing: a.rate_casino_loosing, + rate_casino_bacara: a.rate_casino_bacara, + rate_casino_roulette: a.rate_casino_roulette, + rate_casino_dragon_tiger: a.rate_casino_dragon_tiger, + rate_slot: a.rate_slot, + rate_slot_loosing: a.rate_slot_loosing, + rate_powerball_single: a.rate_powerball_single, + rate_powerball_combo: a.rate_powerball_combo, + rate_powerladder_single: a.rate_powerladder_single, + rate_powerladder_combo: a.rate_powerladder_combo, + rate_eos_single: a.rate_eos_single, + rate_eos_combo: a.rate_eos_combo, + rate_bogglepowerball_single: a.rate_bogglepowerball_single, + rate_bogglepowerball_combo: a.rate_bogglepowerball_combo, + }, + ), + None => None, + }; + let ss_create_member_req = bpr::ss::member::CreateMemberRequest { client: Some(client), request: Some(bpr::ss::member::create_member_request::Request { @@ -114,6 +156,8 @@ impl Service { password: req.password, nickname: req.nickname, bank_account, + game_setting, + settlement_setting, }), }; @@ -536,6 +580,50 @@ impl Service { None => None, }; + let game_setting = match req.game_setting { + Some(a) => Some( + bpr::ss::member::update_member_request::request::GameSetting { + id: a.id, + can_bet_casino: a.can_bet_casino, + can_bet_slot: a.can_bet_slot, + can_bet_powerball: a.can_bet_powerball, + can_bet_powerladder: a.can_bet_powerladder, + can_bet_eos: a.can_bet_eos, + can_bet_bogglepowerball: a.can_bet_bogglepowerball, + }, + ), + None => None, + }; + + let settlement_setting = match req.settlement_setting { + Some(a) => Some( + bpr::ss::member::update_member_request::request::SettlementSetting { + id: a.id, + can_exchange: a.can_exchange, + can_first_charge_comp: a.can_first_charge_comp, + can_per_charge_comp: a.can_per_charge_comp, + manual_payment_type_for_partner: a.manual_payment_type_for_partner, + settlement_type: a.settlement_type, + rate_casino: a.rate_casino, + rate_casino_loosing: a.rate_casino_loosing, + rate_casino_bacara: a.rate_casino_bacara, + rate_casino_roulette: a.rate_casino_roulette, + rate_casino_dragon_tiger: a.rate_casino_dragon_tiger, + rate_slot: a.rate_slot, + rate_slot_loosing: a.rate_slot_loosing, + rate_powerball_single: a.rate_powerball_single, + rate_powerball_combo: a.rate_powerball_combo, + rate_powerladder_single: a.rate_powerladder_single, + rate_powerladder_combo: a.rate_powerladder_combo, + rate_eos_single: a.rate_eos_single, + rate_eos_combo: a.rate_eos_combo, + rate_bogglepowerball_single: a.rate_bogglepowerball_single, + rate_bogglepowerball_combo: a.rate_bogglepowerball_combo, + }, + ), + None => None, + }; + let ss_update_member_req = bpr::ss::member::UpdateMemberRequest { client: Some(client), request: Some(bpr::ss::member::update_member_request::Request { @@ -545,6 +633,8 @@ impl Service { password: req.password, mobile_phone_number: req.mobile_phone_number, bank_account, + game_setting, + settlement_setting, }), }; diff --git a/src/member_game_setting/service.rs b/src/member_game_setting/service.rs index 77407b2..f5407d6 100644 --- a/src/member_game_setting/service.rs +++ b/src/member_game_setting/service.rs @@ -97,6 +97,12 @@ impl Service { request: Some( bpr::ss::member_game_setting::create_member_game_setting_request::Request { member_id: req.member_id, + can_bet_casino: req.can_bet_casino, + can_bet_slot: req.can_bet_slot, + can_bet_powerball: req.can_bet_powerball, + can_bet_powerladder: req.can_bet_powerladder, + can_bet_eos: req.can_bet_eos, + can_bet_bogglepowerball: req.can_bet_bogglepowerball, }, ), }; diff --git a/src/member_settlement_setting/service.rs b/src/member_settlement_setting/service.rs index b0e34c4..60b0b99 100644 --- a/src/member_settlement_setting/service.rs +++ b/src/member_settlement_setting/service.rs @@ -97,6 +97,26 @@ impl Service { request: Some( bpr::ss::member_settlement_setting::create_member_settlement_setting_request::Request { member_id: req.member_id, + can_exchange: req.can_exchange, + can_first_charge_comp: req.can_first_charge_comp, + can_per_charge_comp: req.can_per_charge_comp, + manual_payment_type_for_partner: req.manual_payment_type_for_partner, + settlement_type: req.settlement_type, + rate_casino: req.rate_casino, + rate_casino_loosing: req.rate_casino_loosing, + rate_casino_bacara: req.rate_casino_bacara, + rate_casino_roulette: req.rate_casino_roulette, + rate_casino_dragon_tiger: req.rate_casino_dragon_tiger, + rate_slot: req.rate_slot, + rate_slot_loosing: req.rate_slot_loosing, + rate_powerball_single: req.rate_powerball_single, + rate_powerball_combo: req.rate_powerball_combo, + rate_powerladder_single: req.rate_powerladder_single, + rate_powerladder_combo: req.rate_powerladder_combo, + rate_eos_single: req.rate_eos_single, + rate_eos_combo: req.rate_eos_combo, + rate_bogglepowerball_single: req.rate_bogglepowerball_single, + rate_bogglepowerball_combo: req.rate_bogglepowerball_combo, }, ), };