diff --git a/proto/c2se/member.proto b/proto/c2se/member.proto index a66ff92..afb448e 100644 --- a/proto/c2se/member.proto +++ b/proto/c2se/member.proto @@ -73,12 +73,16 @@ message ListMembersRequest { optional string member_class_id = 2; optional string member_level_id = 3; optional string parent_member_id = 4; - optional string username_like = 5; - optional string nickname_like = 6; - optional string mobile_phone_number_like = 7; - optional string last_signined_ip = 8; - optional bet.beteran.member.MemberState state = 9; - optional uint64 deleted_at = 10; + optional string username = 5; + repeated string usernames = 6; + optional string username_like = 7; + optional string nickname = 8; + repeated string nicknames = 9; + optional string nickname_like = 10; + optional string mobile_phone_number_like = 11; + optional string last_signined_ip = 12; + optional bet.beteran.member.MemberState state = 13; + optional uint64 deleted_at = 14; } optional bet.protobuf.pagination.Pagination pagination = 1; repeated bet.protobuf.pagination.Sort sorts = 2; diff --git a/proto/models/api/betting.proto b/proto/models/api/betting.proto index 4918046..a0ebf3c 100644 --- a/proto/models/api/betting.proto +++ b/proto/models/api/betting.proto @@ -32,36 +32,28 @@ message BettingHistory { message BettingHistoryModel { - message Member { - string site_id = 1; - string member_class_id = 2; - string member_level_id = 3; - optional string parent_member_id = 4; - string nickname = 5; - optional string mobile_phone_number = 6; - } - string id = 1; - uint64 vendor_id = 2; - string vendor_name = 3; - uint64 game_id = 4; - string game_name = 5; - string game_category = 6; - string game_type = 7; - string currency = 8; - double cash = 9; - double before_cash = 10; - double after_cash = 11; - string key = 12; - string ref_id = 13; - string o_ref_id = 14; - optional string group_key = 15; - bool is_bonus = 16; - bool is_promo = 17; - bool is_jackpot = 18; - string site_username = 19; - string betting_type = 20; - string category = 21; - uint64 created_at = 22; - uint64 utc_created_at = 23; - Member member = 24; + string id = 1; + uint64 vendor_id = 2; + string vendor_name = 3; + uint64 game_id = 4; + string game_name = 5; + string game_category = 6; + string game_type = 7; + string currency = 8; + double cash = 9; + double before_cash = 10; + double after_cash = 11; + string key = 12; + string ref_id = 13; + string o_ref_id = 14; + optional string group_key = 15; + bool is_bonus = 16; + bool is_promo = 17; + bool is_jackpot = 18; + string site_username = 19; + string betting_type = 20; + string category = 21; + uint64 created_at = 22; + uint64 utc_created_at = 23; + bet.beteran.member.MemberModel member = 24; } diff --git a/proto/ss/api/betting.proto b/proto/ss/api/betting.proto index 1fa4319..c49598a 100644 --- a/proto/ss/api/betting.proto +++ b/proto/ss/api/betting.proto @@ -56,7 +56,7 @@ message ListBettingHistoryRequest { message ListBettingHistoryResponse { message Result { - repeated bet.beteran.api.betting.BettingHistoryModel betting_history = 1; + repeated bet.beteran.api.betting.BettingHistory betting_history = 1; } optional bet.protobuf.rpc.Error error = 1; optional Result result = 2; diff --git a/proto/ss/member.proto b/proto/ss/member.proto index a97e4ce..e362200 100644 --- a/proto/ss/member.proto +++ b/proto/ss/member.proto @@ -79,12 +79,16 @@ message ListMembersRequest { optional string member_class_id = 2; optional string member_level_id = 3; optional string parent_member_id = 4; - optional string username_like = 5; - optional string nickname_like = 6; - optional string mobile_phone_number_like = 7; - optional string last_signined_ip = 8; - optional bet.beteran.member.MemberState state = 9; - optional uint64 deleted_at = 10; + optional string username = 5; + repeated string usernames = 6; + optional string username_like = 7; + optional string nickname = 8; + repeated string nicknames = 9; + optional string nickname_like = 10; + optional string mobile_phone_number_like = 11; + optional string last_signined_ip = 12; + optional bet.beteran.member.MemberState state = 13; + optional uint64 deleted_at = 14; } optional bet.protobuf.pagination.Pagination pagination = 1; repeated bet.protobuf.pagination.Sort sorts = 2;