diff --git a/src/app/modules/admin/game/casino/components/list.component.ts b/src/app/modules/admin/game/casino/components/list.component.ts index b625a2b..c1d4b8a 100644 --- a/src/app/modules/admin/game/casino/components/list.component.ts +++ b/src/app/modules/admin/game/casino/components/list.component.ts @@ -36,10 +36,7 @@ import { CasinoService } from '../services/casino.service'; import { ActivatedRoute, Router } from '@angular/router'; import { ListBettingHistoryResponse } from 'app/modules/proto/c2se/api/betting_pb'; import { BettingHistoryModel } from 'app/modules/proto/models/api/betting_pb'; -import { - MemberModel, - ParentMemberModel, -} from 'app/modules/proto/models/member_pb'; +import { MemberModel } from 'app/modules/proto/models/member_pb'; import { ListMembersResponse } from 'app/modules/proto/c2se/member_pb'; import { environment } from 'environments/environment'; @@ -283,7 +280,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { const isBaccarat = gameType.includes('baccarat'); const isRoulette = gameType.includes('isRoulette'); - let targetMember: MemberModel | ParentMemberModel | undefined; + let targetMember: MemberModel | undefined; let rate = 0; @@ -328,9 +325,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { } __getMemberByParentMemberAndClassId( - parentMember: ParentMemberModel | undefined, + parentMember: MemberModel | undefined, classId: string - ): ParentMemberModel | undefined { + ): MemberModel | undefined { if (!parentMember) { return; } diff --git a/src/app/modules/admin/game/slot/components/list.component.ts b/src/app/modules/admin/game/slot/components/list.component.ts index 39bb4c2..ffa29a8 100644 --- a/src/app/modules/admin/game/slot/components/list.component.ts +++ b/src/app/modules/admin/game/slot/components/list.component.ts @@ -36,10 +36,7 @@ import { SlotService } from '../services/slot.service'; import { ActivatedRoute } from '@angular/router'; import { ListBettingHistoryResponse } from 'app/modules/proto/c2se/api/betting_pb'; import { ListMembersResponse } from 'app/modules/proto/c2se/member_pb'; -import { - MemberModel, - ParentMemberModel, -} from 'app/modules/proto/models/member_pb'; +import { MemberModel } from 'app/modules/proto/models/member_pb'; import { BettingHistoryModel } from 'app/modules/proto/models/api/betting_pb'; import { environment } from 'environments/environment'; @@ -268,7 +265,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { const isBaccarat = gameType.includes('baccarat'); const isRoulette = gameType.includes('isRoulette'); - let targetMember: MemberModel | ParentMemberModel | undefined; + let targetMember: MemberModel | undefined; let rate = 0; @@ -301,9 +298,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { } __getMemberByParentMemberAndClassId( - parentMember: ParentMemberModel | undefined, + parentMember: MemberModel | undefined, classId: string - ): ParentMemberModel | undefined { + ): MemberModel | undefined { if (!parentMember) { return; } diff --git a/src/app/modules/proto/models/member_pb.d.ts b/src/app/modules/proto/models/member_pb.d.ts index 387305c..9304dff 100644 --- a/src/app/modules/proto/models/member_pb.d.ts +++ b/src/app/modules/proto/models/member_pb.d.ts @@ -109,145 +109,6 @@ export namespace Member { }; } -export class ParentMemberModel extends jspb.Message { - getId(): string; - setId(value: string): void; - - hasSite(): boolean; - clearSite(): void; - getSite(): models_site_pb.Site | undefined; - setSite(value?: models_site_pb.Site): void; - - hasMemberClass(): boolean; - clearMemberClass(): void; - getMemberClass(): models_member_class_pb.MemberClass | undefined; - setMemberClass(value?: models_member_class_pb.MemberClass): void; - - hasMemberLevel(): boolean; - clearMemberLevel(): void; - getMemberLevel(): models_member_level_pb.MemberLevel | undefined; - setMemberLevel(value?: models_member_level_pb.MemberLevel): void; - - hasBankAccount(): boolean; - clearBankAccount(): void; - getBankAccount(): - | models_member_bank_account_pb.MemberBankAccountModel - | undefined; - setBankAccount( - value?: models_member_bank_account_pb.MemberBankAccountModel - ): void; - - hasParentMemberId(): boolean; - clearParentMemberId(): void; - getParentMemberId(): string; - setParentMemberId(value: string): void; - - getChildMemberCount(): number; - setChildMemberCount(value: number): void; - - getUsername(): string; - setUsername(value: string): void; - - getNickname(): string; - setNickname(value: string): void; - - hasMobilePhoneNumber(): boolean; - clearMobilePhoneNumber(): void; - getMobilePhoneNumber(): string; - setMobilePhoneNumber(value: string): void; - - getState(): MemberStateMap[keyof MemberStateMap]; - setState(value: MemberStateMap[keyof MemberStateMap]): void; - - hasStateChangedAt(): boolean; - clearStateChangedAt(): void; - getStateChangedAt(): number; - setStateChangedAt(value: number): void; - - hasMemberGameSetting(): boolean; - clearMemberGameSetting(): void; - getMemberGameSetting(): - | models_member_game_setting_pb.MemberGameSetting - | undefined; - setMemberGameSetting( - value?: models_member_game_setting_pb.MemberGameSetting - ): void; - - hasMemberSettlementSetting(): boolean; - clearMemberSettlementSetting(): void; - getMemberSettlementSetting(): - | models_member_settlement_setting_pb.MemberSettlementSetting - | undefined; - setMemberSettlementSetting( - value?: models_member_settlement_setting_pb.MemberSettlementSetting - ): void; - - hasLastSigninedIp(): boolean; - clearLastSigninedIp(): void; - getLastSigninedIp(): string; - setLastSigninedIp(value: string): void; - - hasLastSigninedAt(): boolean; - clearLastSigninedAt(): void; - getLastSigninedAt(): number; - setLastSigninedAt(value: number): void; - - getCreatedAt(): number; - setCreatedAt(value: number): void; - - getUpdatedAt(): number; - setUpdatedAt(value: number): void; - - hasDeletedAt(): boolean; - clearDeletedAt(): void; - getDeletedAt(): number; - setDeletedAt(value: number): void; - - serializeBinary(): Uint8Array; - toObject(includeInstance?: boolean): ParentMemberModel.AsObject; - static toObject( - includeInstance: boolean, - msg: ParentMemberModel - ): ParentMemberModel.AsObject; - static extensions: { [key: number]: jspb.ExtensionFieldInfo }; - static extensionsBinary: { - [key: number]: jspb.ExtensionFieldBinaryInfo; - }; - static serializeBinaryToWriter( - message: ParentMemberModel, - writer: jspb.BinaryWriter - ): void; - static deserializeBinary(bytes: Uint8Array): ParentMemberModel; - static deserializeBinaryFromReader( - message: ParentMemberModel, - reader: jspb.BinaryReader - ): ParentMemberModel; -} - -export namespace ParentMemberModel { - export type AsObject = { - id: string; - site?: models_site_pb.Site.AsObject; - memberClass?: models_member_class_pb.MemberClass.AsObject; - memberLevel?: models_member_level_pb.MemberLevel.AsObject; - bankAccount?: models_member_bank_account_pb.MemberBankAccountModel.AsObject; - parentMemberId: string; - childMemberCount: number; - username: string; - nickname: string; - mobilePhoneNumber: string; - state: MemberStateMap[keyof MemberStateMap]; - stateChangedAt: number; - memberGameSetting?: models_member_game_setting_pb.MemberGameSetting.AsObject; - memberSettlementSetting?: models_member_settlement_setting_pb.MemberSettlementSetting.AsObject; - lastSigninedIp: string; - lastSigninedAt: number; - createdAt: number; - updatedAt: number; - deletedAt: number; - }; -} - export class MemberModel extends jspb.Message { getId(): string; setId(value: string): void; @@ -278,8 +139,8 @@ export class MemberModel extends jspb.Message { hasParentMember(): boolean; clearParentMember(): void; - getParentMember(): ParentMemberModel | undefined; - setParentMember(value?: ParentMemberModel): void; + getParentMember(): MemberModel | undefined; + setParentMember(value?: MemberModel): void; getChildMemberCount(): number; setChildMemberCount(value: number): void; @@ -370,7 +231,7 @@ export namespace MemberModel { memberClass?: models_member_class_pb.MemberClass.AsObject; memberLevel?: models_member_level_pb.MemberLevel.AsObject; bankAccount?: models_member_bank_account_pb.MemberBankAccountModel.AsObject; - parentMember?: ParentMemberModel.AsObject; + parentMember?: MemberModel.AsObject; childMemberCount: number; username: string; nickname: string; diff --git a/src/app/modules/proto/models/member_pb.js b/src/app/modules/proto/models/member_pb.js index f52418a..ccd6513 100644 --- a/src/app/modules/proto/models/member_pb.js +++ b/src/app/modules/proto/models/member_pb.js @@ -32,7 +32,6 @@ goog.object.extend(proto, models_member_settlement_setting_pb); goog.exportSymbol("proto.bet.beteran.member.Member", null, global); goog.exportSymbol("proto.bet.beteran.member.MemberModel", null, global); goog.exportSymbol("proto.bet.beteran.member.MemberState", null, global); -goog.exportSymbol("proto.bet.beteran.member.ParentMemberModel", null, global); /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -55,28 +54,6 @@ if (goog.DEBUG && !COMPILED) { proto.bet.beteran.member.Member.displayName = "proto.bet.beteran.member.Member"; } -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.bet.beteran.member.ParentMemberModel = function (opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.bet.beteran.member.ParentMemberModel, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.bet.beteran.member.ParentMemberModel.displayName = - "proto.bet.beteran.member.ParentMemberModel"; -} /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -707,966 +684,6 @@ proto.bet.beteran.member.Member.prototype.hasDeletedAt = function () { return jspb.Message.getField(this, 16) != null; }; -if (jspb.Message.GENERATE_TO_OBJECT) { - /** - * Creates an object representation of this proto. - * Field names that are reserved in JavaScript and will be renamed to pb_name. - * Optional fields that are not set will be set to undefined. - * To access a reserved field use, foo.pb_, eg, foo.pb_default. - * For the list of reserved names please see: - * net/proto2/compiler/js/internal/generator.cc#kKeyword. - * @param {boolean=} opt_includeInstance Deprecated. whether to include the - * JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration - * @return {!Object} - */ - proto.bet.beteran.member.ParentMemberModel.prototype.toObject = function ( - opt_includeInstance - ) { - return proto.bet.beteran.member.ParentMemberModel.toObject( - opt_includeInstance, - this - ); - }; - - /** - * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Deprecated. Whether to include - * the JSPB instance for transitional soy proto support: - * http://goto/soy-param-migration - * @param {!proto.bet.beteran.member.ParentMemberModel} msg The msg instance to transform. - * @return {!Object} - * @suppress {unusedLocalVariables} f is only used for nested messages - */ - proto.bet.beteran.member.ParentMemberModel.toObject = function ( - includeInstance, - msg - ) { - var f, - obj = { - id: jspb.Message.getFieldWithDefault(msg, 1, ""), - site: - (f = msg.getSite()) && - models_site_pb.Site.toObject(includeInstance, f), - memberClass: - (f = msg.getMemberClass()) && - models_member_class_pb.MemberClass.toObject(includeInstance, f), - memberLevel: - (f = msg.getMemberLevel()) && - models_member_level_pb.MemberLevel.toObject(includeInstance, f), - bankAccount: - (f = msg.getBankAccount()) && - models_member_bank_account_pb.MemberBankAccountModel.toObject( - includeInstance, - f - ), - parentMemberId: jspb.Message.getFieldWithDefault(msg, 6, ""), - childMemberCount: jspb.Message.getFieldWithDefault(msg, 7, 0), - username: jspb.Message.getFieldWithDefault(msg, 8, ""), - nickname: jspb.Message.getFieldWithDefault(msg, 9, ""), - mobilePhoneNumber: jspb.Message.getFieldWithDefault(msg, 10, ""), - state: jspb.Message.getFieldWithDefault(msg, 11, 0), - stateChangedAt: jspb.Message.getFieldWithDefault(msg, 12, 0), - memberGameSetting: - (f = msg.getMemberGameSetting()) && - models_member_game_setting_pb.MemberGameSetting.toObject( - includeInstance, - f - ), - memberSettlementSetting: - (f = msg.getMemberSettlementSetting()) && - models_member_settlement_setting_pb.MemberSettlementSetting.toObject( - includeInstance, - f - ), - lastSigninedIp: jspb.Message.getFieldWithDefault(msg, 15, ""), - lastSigninedAt: jspb.Message.getFieldWithDefault(msg, 16, 0), - createdAt: jspb.Message.getFieldWithDefault(msg, 17, 0), - updatedAt: jspb.Message.getFieldWithDefault(msg, 18, 0), - deletedAt: jspb.Message.getFieldWithDefault(msg, 19, 0), - }; - - if (includeInstance) { - obj.$jspbMessageInstance = msg; - } - return obj; - }; -} - -/** - * Deserializes binary data (in protobuf wire format). - * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.bet.beteran.member.ParentMemberModel} - */ -proto.bet.beteran.member.ParentMemberModel.deserializeBinary = function ( - bytes -) { - var reader = new jspb.BinaryReader(bytes); - var msg = new proto.bet.beteran.member.ParentMemberModel(); - return proto.bet.beteran.member.ParentMemberModel.deserializeBinaryFromReader( - msg, - reader - ); -}; - -/** - * Deserializes binary data (in protobuf wire format) from the - * given reader into the given message object. - * @param {!proto.bet.beteran.member.ParentMemberModel} msg The message object to deserialize into. - * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.bet.beteran.member.ParentMemberModel} - */ -proto.bet.beteran.member.ParentMemberModel.deserializeBinaryFromReader = - function (msg, reader) { - while (reader.nextField()) { - if (reader.isEndGroup()) { - break; - } - var field = reader.getFieldNumber(); - switch (field) { - case 1: - var value = /** @type {string} */ (reader.readString()); - msg.setId(value); - break; - case 2: - var value = new models_site_pb.Site(); - reader.readMessage( - value, - models_site_pb.Site.deserializeBinaryFromReader - ); - msg.setSite(value); - break; - case 3: - var value = new models_member_class_pb.MemberClass(); - reader.readMessage( - value, - models_member_class_pb.MemberClass.deserializeBinaryFromReader - ); - msg.setMemberClass(value); - break; - case 4: - var value = new models_member_level_pb.MemberLevel(); - reader.readMessage( - value, - models_member_level_pb.MemberLevel.deserializeBinaryFromReader - ); - msg.setMemberLevel(value); - break; - case 5: - var value = - new models_member_bank_account_pb.MemberBankAccountModel(); - reader.readMessage( - value, - models_member_bank_account_pb.MemberBankAccountModel - .deserializeBinaryFromReader - ); - msg.setBankAccount(value); - break; - case 6: - var value = /** @type {string} */ (reader.readString()); - msg.setParentMemberId(value); - break; - case 7: - var value = /** @type {number} */ (reader.readUint64()); - msg.setChildMemberCount(value); - break; - case 8: - var value = /** @type {string} */ (reader.readString()); - msg.setUsername(value); - break; - case 9: - var value = /** @type {string} */ (reader.readString()); - msg.setNickname(value); - break; - case 10: - var value = /** @type {string} */ (reader.readString()); - msg.setMobilePhoneNumber(value); - break; - case 11: - var value = /** @type {!proto.bet.beteran.member.MemberState} */ ( - reader.readEnum() - ); - msg.setState(value); - break; - case 12: - var value = /** @type {number} */ (reader.readUint64()); - msg.setStateChangedAt(value); - break; - case 13: - var value = new models_member_game_setting_pb.MemberGameSetting(); - reader.readMessage( - value, - models_member_game_setting_pb.MemberGameSetting - .deserializeBinaryFromReader - ); - msg.setMemberGameSetting(value); - break; - case 14: - var value = - new models_member_settlement_setting_pb.MemberSettlementSetting(); - reader.readMessage( - value, - models_member_settlement_setting_pb.MemberSettlementSetting - .deserializeBinaryFromReader - ); - msg.setMemberSettlementSetting(value); - break; - case 15: - var value = /** @type {string} */ (reader.readString()); - msg.setLastSigninedIp(value); - break; - case 16: - var value = /** @type {number} */ (reader.readUint64()); - msg.setLastSigninedAt(value); - break; - case 17: - var value = /** @type {number} */ (reader.readUint64()); - msg.setCreatedAt(value); - break; - case 18: - var value = /** @type {number} */ (reader.readUint64()); - msg.setUpdatedAt(value); - break; - case 19: - var value = /** @type {number} */ (reader.readUint64()); - msg.setDeletedAt(value); - break; - default: - reader.skipField(); - break; - } - } - return msg; - }; - -/** - * Serializes the message to binary data (in protobuf wire format). - * @return {!Uint8Array} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.serializeBinary = - function () { - var writer = new jspb.BinaryWriter(); - proto.bet.beteran.member.ParentMemberModel.serializeBinaryToWriter( - this, - writer - ); - return writer.getResultBuffer(); - }; - -/** - * Serializes the given message to binary data (in protobuf wire - * format), writing to the given BinaryWriter. - * @param {!proto.bet.beteran.member.ParentMemberModel} message - * @param {!jspb.BinaryWriter} writer - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.bet.beteran.member.ParentMemberModel.serializeBinaryToWriter = function ( - message, - writer -) { - var f = undefined; - f = message.getId(); - if (f.length > 0) { - writer.writeString(1, f); - } - f = message.getSite(); - if (f != null) { - writer.writeMessage(2, f, models_site_pb.Site.serializeBinaryToWriter); - } - f = message.getMemberClass(); - if (f != null) { - writer.writeMessage( - 3, - f, - models_member_class_pb.MemberClass.serializeBinaryToWriter - ); - } - f = message.getMemberLevel(); - if (f != null) { - writer.writeMessage( - 4, - f, - models_member_level_pb.MemberLevel.serializeBinaryToWriter - ); - } - f = message.getBankAccount(); - if (f != null) { - writer.writeMessage( - 5, - f, - models_member_bank_account_pb.MemberBankAccountModel - .serializeBinaryToWriter - ); - } - f = /** @type {string} */ (jspb.Message.getField(message, 6)); - if (f != null) { - writer.writeString(6, f); - } - f = message.getChildMemberCount(); - if (f !== 0) { - writer.writeUint64(7, f); - } - f = message.getUsername(); - if (f.length > 0) { - writer.writeString(8, f); - } - f = message.getNickname(); - if (f.length > 0) { - writer.writeString(9, f); - } - f = /** @type {string} */ (jspb.Message.getField(message, 10)); - if (f != null) { - writer.writeString(10, f); - } - f = message.getState(); - if (f !== 0.0) { - writer.writeEnum(11, f); - } - f = /** @type {number} */ (jspb.Message.getField(message, 12)); - if (f != null) { - writer.writeUint64(12, f); - } - f = message.getMemberGameSetting(); - if (f != null) { - writer.writeMessage( - 13, - f, - models_member_game_setting_pb.MemberGameSetting.serializeBinaryToWriter - ); - } - f = message.getMemberSettlementSetting(); - if (f != null) { - writer.writeMessage( - 14, - f, - models_member_settlement_setting_pb.MemberSettlementSetting - .serializeBinaryToWriter - ); - } - f = /** @type {string} */ (jspb.Message.getField(message, 15)); - if (f != null) { - writer.writeString(15, f); - } - f = /** @type {number} */ (jspb.Message.getField(message, 16)); - if (f != null) { - writer.writeUint64(16, f); - } - f = message.getCreatedAt(); - if (f !== 0) { - writer.writeUint64(17, f); - } - f = message.getUpdatedAt(); - if (f !== 0) { - writer.writeUint64(18, f); - } - f = /** @type {number} */ (jspb.Message.getField(message, 19)); - if (f != null) { - writer.writeUint64(19, f); - } -}; - -/** - * optional string id = 1; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getId = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setId = function (value) { - return jspb.Message.setProto3StringField(this, 1, value); -}; - -/** - * optional bet.beteran.site.Site site = 2; - * @return {?proto.bet.beteran.site.Site} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getSite = function () { - return /** @type{?proto.bet.beteran.site.Site} */ ( - jspb.Message.getWrapperField(this, models_site_pb.Site, 2) - ); -}; - -/** - * @param {?proto.bet.beteran.site.Site|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setSite = function ( - value -) { - return jspb.Message.setWrapperField(this, 2, value); -}; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearSite = function () { - return this.setSite(undefined); -}; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasSite = function () { - return jspb.Message.getField(this, 2) != null; -}; - -/** - * optional bet.beteran.member_class.MemberClass member_class = 3; - * @return {?proto.bet.beteran.member_class.MemberClass} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getMemberClass = - function () { - return /** @type{?proto.bet.beteran.member_class.MemberClass} */ ( - jspb.Message.getWrapperField(this, models_member_class_pb.MemberClass, 3) - ); - }; - -/** - * @param {?proto.bet.beteran.member_class.MemberClass|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setMemberClass = function ( - value -) { - return jspb.Message.setWrapperField(this, 3, value); -}; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearMemberClass = - function () { - return this.setMemberClass(undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasMemberClass = - function () { - return jspb.Message.getField(this, 3) != null; - }; - -/** - * optional bet.beteran.member_level.MemberLevel member_level = 4; - * @return {?proto.bet.beteran.member_level.MemberLevel} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getMemberLevel = - function () { - return /** @type{?proto.bet.beteran.member_level.MemberLevel} */ ( - jspb.Message.getWrapperField(this, models_member_level_pb.MemberLevel, 4) - ); - }; - -/** - * @param {?proto.bet.beteran.member_level.MemberLevel|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setMemberLevel = function ( - value -) { - return jspb.Message.setWrapperField(this, 4, value); -}; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearMemberLevel = - function () { - return this.setMemberLevel(undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasMemberLevel = - function () { - return jspb.Message.getField(this, 4) != null; - }; - -/** - * optional bet.beteran.member_bank_account.MemberBankAccountModel bank_account = 5; - * @return {?proto.bet.beteran.member_bank_account.MemberBankAccountModel} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getBankAccount = - function () { - return /** @type{?proto.bet.beteran.member_bank_account.MemberBankAccountModel} */ ( - jspb.Message.getWrapperField( - this, - models_member_bank_account_pb.MemberBankAccountModel, - 5 - ) - ); - }; - -/** - * @param {?proto.bet.beteran.member_bank_account.MemberBankAccountModel|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setBankAccount = function ( - value -) { - return jspb.Message.setWrapperField(this, 5, value); -}; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearBankAccount = - function () { - return this.setBankAccount(undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasBankAccount = - function () { - return jspb.Message.getField(this, 5) != null; - }; - -/** - * optional string parent_member_id = 6; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getParentMemberId = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 6, "") - ); - }; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setParentMemberId = - function (value) { - return jspb.Message.setField(this, 6, value); - }; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearParentMemberId = - function () { - return jspb.Message.setField(this, 6, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasParentMemberId = - function () { - return jspb.Message.getField(this, 6) != null; - }; - -/** - * optional uint64 child_member_count = 7; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getChildMemberCount = - function () { - return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0)); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setChildMemberCount = - function (value) { - return jspb.Message.setProto3IntField(this, 7, value); - }; - -/** - * optional string username = 8; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getUsername = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setUsername = function ( - value -) { - return jspb.Message.setProto3StringField(this, 8, value); -}; - -/** - * optional string nickname = 9; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getNickname = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setNickname = function ( - value -) { - return jspb.Message.setProto3StringField(this, 9, value); -}; - -/** - * optional string mobile_phone_number = 10; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getMobilePhoneNumber = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 10, "") - ); - }; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setMobilePhoneNumber = - function (value) { - return jspb.Message.setField(this, 10, value); - }; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearMobilePhoneNumber = - function () { - return jspb.Message.setField(this, 10, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasMobilePhoneNumber = - function () { - return jspb.Message.getField(this, 10) != null; - }; - -/** - * optional MemberState state = 11; - * @return {!proto.bet.beteran.member.MemberState} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getState = function () { - return /** @type {!proto.bet.beteran.member.MemberState} */ ( - jspb.Message.getFieldWithDefault(this, 11, 0) - ); -}; - -/** - * @param {!proto.bet.beteran.member.MemberState} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setState = function ( - value -) { - return jspb.Message.setProto3EnumField(this, 11, value); -}; - -/** - * optional uint64 state_changed_at = 12; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getStateChangedAt = - function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 12, 0) - ); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setStateChangedAt = - function (value) { - return jspb.Message.setField(this, 12, value); - }; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearStateChangedAt = - function () { - return jspb.Message.setField(this, 12, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasStateChangedAt = - function () { - return jspb.Message.getField(this, 12) != null; - }; - -/** - * optional bet.beteran.member_game_setting.MemberGameSetting member_game_setting = 13; - * @return {?proto.bet.beteran.member_game_setting.MemberGameSetting} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getMemberGameSetting = - function () { - return /** @type{?proto.bet.beteran.member_game_setting.MemberGameSetting} */ ( - jspb.Message.getWrapperField( - this, - models_member_game_setting_pb.MemberGameSetting, - 13 - ) - ); - }; - -/** - * @param {?proto.bet.beteran.member_game_setting.MemberGameSetting|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setMemberGameSetting = - function (value) { - return jspb.Message.setWrapperField(this, 13, value); - }; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearMemberGameSetting = - function () { - return this.setMemberGameSetting(undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasMemberGameSetting = - function () { - return jspb.Message.getField(this, 13) != null; - }; - -/** - * optional bet.beteran.member_settlement_setting.MemberSettlementSetting member_settlement_setting = 14; - * @return {?proto.bet.beteran.member_settlement_setting.MemberSettlementSetting} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getMemberSettlementSetting = - function () { - return /** @type{?proto.bet.beteran.member_settlement_setting.MemberSettlementSetting} */ ( - jspb.Message.getWrapperField( - this, - models_member_settlement_setting_pb.MemberSettlementSetting, - 14 - ) - ); - }; - -/** - * @param {?proto.bet.beteran.member_settlement_setting.MemberSettlementSetting|undefined} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setMemberSettlementSetting = - function (value) { - return jspb.Message.setWrapperField(this, 14, value); - }; - -/** - * Clears the message field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearMemberSettlementSetting = - function () { - return this.setMemberSettlementSetting(undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasMemberSettlementSetting = - function () { - return jspb.Message.getField(this, 14) != null; - }; - -/** - * optional string last_signined_ip = 15; - * @return {string} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getLastSigninedIp = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 15, "") - ); - }; - -/** - * @param {string} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setLastSigninedIp = - function (value) { - return jspb.Message.setField(this, 15, value); - }; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearLastSigninedIp = - function () { - return jspb.Message.setField(this, 15, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasLastSigninedIp = - function () { - return jspb.Message.getField(this, 15) != null; - }; - -/** - * optional uint64 last_signined_at = 16; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getLastSigninedAt = - function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 16, 0) - ); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setLastSigninedAt = - function (value) { - return jspb.Message.setField(this, 16, value); - }; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearLastSigninedAt = - function () { - return jspb.Message.setField(this, 16, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasLastSigninedAt = - function () { - return jspb.Message.getField(this, 16) != null; - }; - -/** - * optional uint64 created_at = 17; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getCreatedAt = - function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 17, 0) - ); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setCreatedAt = function ( - value -) { - return jspb.Message.setProto3IntField(this, 17, value); -}; - -/** - * optional uint64 updated_at = 18; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getUpdatedAt = - function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 18, 0) - ); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setUpdatedAt = function ( - value -) { - return jspb.Message.setProto3IntField(this, 18, value); -}; - -/** - * optional uint64 deleted_at = 19; - * @return {number} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.getDeletedAt = - function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 19, 0) - ); - }; - -/** - * @param {number} value - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.setDeletedAt = function ( - value -) { - return jspb.Message.setField(this, 19, value); -}; - -/** - * Clears the field making it undefined. - * @return {!proto.bet.beteran.member.ParentMemberModel} returns this - */ -proto.bet.beteran.member.ParentMemberModel.prototype.clearDeletedAt = - function () { - return jspb.Message.setField(this, 19, undefined); - }; - -/** - * Returns whether this field is set. - * @return {boolean} - */ -proto.bet.beteran.member.ParentMemberModel.prototype.hasDeletedAt = - function () { - return jspb.Message.getField(this, 19) != null; - }; - if (jspb.Message.GENERATE_TO_OBJECT) { /** * Creates an object representation of this proto. @@ -1722,10 +739,7 @@ if (jspb.Message.GENERATE_TO_OBJECT) { ), parentMember: (f = msg.getParentMember()) && - proto.bet.beteran.member.ParentMemberModel.toObject( - includeInstance, - f - ), + proto.bet.beteran.member.MemberModel.toObject(includeInstance, f), childMemberCount: jspb.Message.getFieldWithDefault(msg, 7, 0), username: jspb.Message.getFieldWithDefault(msg, 8, ""), nickname: jspb.Message.getFieldWithDefault(msg, 9, ""), @@ -1827,10 +841,10 @@ proto.bet.beteran.member.MemberModel.deserializeBinaryFromReader = function ( msg.setBankAccount(value); break; case 6: - var value = new proto.bet.beteran.member.ParentMemberModel(); + var value = new proto.bet.beteran.member.MemberModel(); reader.readMessage( value, - proto.bet.beteran.member.ParentMemberModel.deserializeBinaryFromReader + proto.bet.beteran.member.MemberModel.deserializeBinaryFromReader ); msg.setParentMember(value); break; @@ -1967,7 +981,7 @@ proto.bet.beteran.member.MemberModel.serializeBinaryToWriter = function ( writer.writeMessage( 6, f, - proto.bet.beteran.member.ParentMemberModel.serializeBinaryToWriter + proto.bet.beteran.member.MemberModel.serializeBinaryToWriter ); } f = message.getChildMemberCount(); @@ -2196,21 +1210,17 @@ proto.bet.beteran.member.MemberModel.prototype.hasBankAccount = function () { }; /** - * optional ParentMemberModel parent_member = 6; - * @return {?proto.bet.beteran.member.ParentMemberModel} + * optional MemberModel parent_member = 6; + * @return {?proto.bet.beteran.member.MemberModel} */ proto.bet.beteran.member.MemberModel.prototype.getParentMember = function () { - return /** @type{?proto.bet.beteran.member.ParentMemberModel} */ ( - jspb.Message.getWrapperField( - this, - proto.bet.beteran.member.ParentMemberModel, - 6 - ) + return /** @type{?proto.bet.beteran.member.MemberModel} */ ( + jspb.Message.getWrapperField(this, proto.bet.beteran.member.MemberModel, 6) ); }; /** - * @param {?proto.bet.beteran.member.ParentMemberModel|undefined} value + * @param {?proto.bet.beteran.member.MemberModel|undefined} value * @return {!proto.bet.beteran.member.MemberModel} returns this */ proto.bet.beteran.member.MemberModel.prototype.setParentMember = function (