From 78302f355ebc9453a2b12cc4ee864e14d38ad5ea Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 5 Sep 2022 07:52:16 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/list.component.html | 10 +++++++ .../components/list.component.html | 11 +++++++- .../components/list.component.html | 26 ------------------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/app/modules/admin/bank/partner-calculate/components/list.component.html b/src/app/modules/admin/bank/partner-calculate/components/list.component.html index 20ff08b..791a9ae 100644 --- a/src/app/modules/admin/bank/partner-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/partner-calculate/components/list.component.html @@ -176,6 +176,11 @@ " > + + + 합계: 29292929 원 + + @@ -269,6 +274,11 @@ " > + + + 합계: 29292929 원 + + diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.html b/src/app/modules/admin/bank/web-calculate/components/list.component.html index 34b9c1e..7c5e54e 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.html @@ -161,7 +161,6 @@ }} - + + + 합계: 29292929 원 + + @@ -261,6 +265,11 @@ *matRowDef="let row; columns: webDepositTableColumns" > + + + 합계: 29292929 원 + + diff --git a/src/app/modules/admin/member/unconnected/components/list.component.html b/src/app/modules/admin/member/unconnected/components/list.component.html index 6496d5b..15bf103 100644 --- a/src/app/modules/admin/member/unconnected/components/list.component.html +++ b/src/app/modules/admin/member/unconnected/components/list.component.html @@ -174,32 +174,6 @@ -
-
- -
-
- -
-
Date: Mon, 5 Sep 2022 12:37:51 +0000 Subject: [PATCH 2/5] =?UTF-8?q?Search=20=EB=B2=84=ED=8A=BC=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deposit/components/list.component.html | 14 ++++++-------- .../withdraw/components/list.component.html | 14 ++++++-------- .../customer/components/list.component.html | 12 ++++++------ .../message/components/list.component.html | 14 ++++++-------- .../components/list.component.html | 11 +++++++---- .../notice/components/list.component.html | 15 ++++++--------- .../casino/components/list.component.html | 12 ++++++------ .../powerball/components/list.component.html | 11 +++++++---- .../game/slot/components/list.component.html | 19 +++++++------------ .../components/list.component.html | 12 ++++++------ .../coupon-log/components/list.component.html | 12 ++++++------ .../components/list.component.html | 13 ++++++------- .../coupon/components/list.component.html | 12 ++++++------ .../components/list.component.html | 13 +++++++------ .../components/list.component.html | 14 ++++++-------- .../comp-log/components/list.component.html | 11 +++++++---- .../components/list.component.html | 13 ++++++------- .../daily/components/list.component.html | 13 ++++++------- .../components/list.component.html | 14 ++++++-------- .../excel-log/components/list.component.html | 15 +++++++-------- .../components/list.component.html | 13 ++++++------- .../money-log/components/list.component.html | 13 ++++++------- .../components/list.component.html | 13 ++++++------- .../statistics/components/list.component.html | 13 ++++++------- .../today-bet/components/list.component.html | 13 ++++++------- .../components/list.component.html | 14 ++++++-------- 26 files changed, 162 insertions(+), 181 deletions(-) diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html index 5eb544b..48c4460 100644 --- a/src/app/modules/admin/bank/deposit/components/list.component.html +++ b/src/app/modules/admin/bank/deposit/components/list.component.html @@ -10,14 +10,12 @@ -
입금관리
- -
- - - +
+ 입금관리 +
diff --git a/src/app/modules/admin/bank/withdraw/components/list.component.html b/src/app/modules/admin/bank/withdraw/components/list.component.html index 181686d..75b3763 100644 --- a/src/app/modules/admin/bank/withdraw/components/list.component.html +++ b/src/app/modules/admin/bank/withdraw/components/list.component.html @@ -10,14 +10,12 @@ -
출금관리
- -
- - - +
+ 출금관리 +
diff --git a/src/app/modules/admin/board/customer/components/list.component.html b/src/app/modules/admin/board/customer/components/list.component.html index a7f5fac..4836482 100644 --- a/src/app/modules/admin/board/customer/components/list.component.html +++ b/src/app/modules/admin/board/customer/components/list.component.html @@ -10,12 +10,12 @@ -
고객센터
- -
- +
+ 고객센터 +
-
쪽지함
- -
- - - +
+ 쪽지함 +
diff --git a/src/app/modules/admin/board/notice-oneline/components/list.component.html b/src/app/modules/admin/board/notice-oneline/components/list.component.html index 534350f..59be2b7 100644 --- a/src/app/modules/admin/board/notice-oneline/components/list.component.html +++ b/src/app/modules/admin/board/notice-oneline/components/list.component.html @@ -10,13 +10,16 @@ -
한줄공지
+
+ 한줄공지 + +
-
-
공지사항
- - -
-
- -
+
+ 공지사항 +
-
{{ title }}
- -
- +
+ {{ title }} +
diff --git a/src/app/modules/admin/game/powerball/components/list.component.html b/src/app/modules/admin/game/powerball/components/list.component.html index c772870..27357ac 100644 --- a/src/app/modules/admin/game/powerball/components/list.component.html +++ b/src/app/modules/admin/game/powerball/components/list.component.html @@ -10,7 +10,13 @@ -
파워볼
+
+ 파워볼 + +
@@ -24,9 +30,6 @@ 진행중금액:0원   정산:410,000원
- diff --git a/src/app/modules/admin/game/slot/components/list.component.html b/src/app/modules/admin/game/slot/components/list.component.html index d14d603..5bf5164 100644 --- a/src/app/modules/admin/game/slot/components/list.component.html +++ b/src/app/modules/admin/game/slot/components/list.component.html @@ -10,20 +10,15 @@ -
슬롯베팅리스트
- -
- - -
- - +
+ 슬롯베팅리스트 +
+
-
CASINO 머니파악
- -
- +
+ CASINO 머니파악 +
-
쿠폰발행로그
- -
- +
+ 쿠폰발행로그 +
-
쿠폰발행머니로그
- -
- - +
+ 쿠폰발행머니로그 +
-
쿠폰발행리스트
- -
- +
+ 쿠폰발행리스트 + +
-
장기 미접속 회원
- -
- +
+ 장기 미접속 회원 + + +
diff --git a/src/app/modules/admin/report/admin-session/components/list.component.html b/src/app/modules/admin/report/admin-session/components/list.component.html index 3347272..ca0e0cc 100644 --- a/src/app/modules/admin/report/admin-session/components/list.component.html +++ b/src/app/modules/admin/report/admin-session/components/list.component.html @@ -10,14 +10,12 @@ -
관리자로그인정보
- -
- - - +
+ 관리자로그인정보 +
diff --git a/src/app/modules/admin/report/comp-log/components/list.component.html b/src/app/modules/admin/report/comp-log/components/list.component.html index a875fb0..064c1ab 100644 --- a/src/app/modules/admin/report/comp-log/components/list.component.html +++ b/src/app/modules/admin/report/comp-log/components/list.component.html @@ -10,7 +10,13 @@ -
콤프사용Logs
+
+ 콤프사용로그 + + +
@@ -18,9 +24,6 @@ 콤프합계:7,600콤프  
-
diff --git a/src/app/modules/admin/report/daily-partner/components/list.component.html b/src/app/modules/admin/report/daily-partner/components/list.component.html index 9f61ced..1a454d5 100644 --- a/src/app/modules/admin/report/daily-partner/components/list.component.html +++ b/src/app/modules/admin/report/daily-partner/components/list.component.html @@ -10,13 +10,12 @@
-
파트너일일현황
- -
- - +
+ 파트너일일현황 +
diff --git a/src/app/modules/admin/report/daily/components/list.component.html b/src/app/modules/admin/report/daily/components/list.component.html index fa3a520..dc4675b 100644 --- a/src/app/modules/admin/report/daily/components/list.component.html +++ b/src/app/modules/admin/report/daily/components/list.component.html @@ -10,13 +10,12 @@
-
일일현황
- -
- - +
+ 일일현황 +
diff --git a/src/app/modules/admin/report/duplicated-session/components/list.component.html b/src/app/modules/admin/report/duplicated-session/components/list.component.html index 08b98a8..db9741e 100644 --- a/src/app/modules/admin/report/duplicated-session/components/list.component.html +++ b/src/app/modules/admin/report/duplicated-session/components/list.component.html @@ -10,14 +10,12 @@
-
중복로그인
- -
- - - +
+ 중복로그인 +
diff --git a/src/app/modules/admin/report/excel-log/components/list.component.html b/src/app/modules/admin/report/excel-log/components/list.component.html index cd1ecdd..0fa2791 100644 --- a/src/app/modules/admin/report/excel-log/components/list.component.html +++ b/src/app/modules/admin/report/excel-log/components/list.component.html @@ -10,14 +10,13 @@ -
엑셀다운로그
- -
- - - +
+ 엑셀다운로그 + + +
diff --git a/src/app/modules/admin/report/modification-log/components/list.component.html b/src/app/modules/admin/report/modification-log/components/list.component.html index 59ae7fc..e18b767 100644 --- a/src/app/modules/admin/report/modification-log/components/list.component.html +++ b/src/app/modules/admin/report/modification-log/components/list.component.html @@ -10,13 +10,12 @@ -
회원수정로그
- -
- - +
+ 회원수정로그 +
diff --git a/src/app/modules/admin/report/money-log/components/list.component.html b/src/app/modules/admin/report/money-log/components/list.component.html index 7cd9027..c1612d8 100644 --- a/src/app/modules/admin/report/money-log/components/list.component.html +++ b/src/app/modules/admin/report/money-log/components/list.component.html @@ -10,13 +10,12 @@ -
머니활동 Logs
- -
- - +
+ 머니활동로그 +
diff --git a/src/app/modules/admin/report/payment-log/components/list.component.html b/src/app/modules/admin/report/payment-log/components/list.component.html index 5a9ae70..d10060f 100644 --- a/src/app/modules/admin/report/payment-log/components/list.component.html +++ b/src/app/modules/admin/report/payment-log/components/list.component.html @@ -10,13 +10,12 @@
-
수동지급/회수로그
- -
- - +
+ 수동지급/회수로그 +
diff --git a/src/app/modules/admin/report/statistics/components/list.component.html b/src/app/modules/admin/report/statistics/components/list.component.html index fd1cafb..5263bde 100644 --- a/src/app/modules/admin/report/statistics/components/list.component.html +++ b/src/app/modules/admin/report/statistics/components/list.component.html @@ -10,13 +10,12 @@ -
종목별매출통계
- -
- - +
+ 종목별매출통계 +
diff --git a/src/app/modules/admin/report/today-bet/components/list.component.html b/src/app/modules/admin/report/today-bet/components/list.component.html index e7aca39..2f30303 100644 --- a/src/app/modules/admin/report/today-bet/components/list.component.html +++ b/src/app/modules/admin/report/today-bet/components/list.component.html @@ -10,13 +10,12 @@
-
금일배팅자목록
- -
- - +
+ 금일배팅자목록 +
diff --git a/src/app/modules/admin/report/user-session/components/list.component.html b/src/app/modules/admin/report/user-session/components/list.component.html index e5bd036..138bb5e 100644 --- a/src/app/modules/admin/report/user-session/components/list.component.html +++ b/src/app/modules/admin/report/user-session/components/list.component.html @@ -10,14 +10,12 @@
-
로그인정보
- -
- - - +
+ 로그인정보 +
From cb39f9014cff399e21483170082c867013facd0a Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Mon, 5 Sep 2022 14:32:55 +0000 Subject: [PATCH 3/5] model is modified --- .../modules/proto/models/api/betting_pb.d.ts | 60 +- .../modules/proto/models/api/betting_pb.js | 725 ++++++++++-------- 2 files changed, 444 insertions(+), 341 deletions(-) diff --git a/src/app/modules/proto/models/api/betting_pb.d.ts b/src/app/modules/proto/models/api/betting_pb.d.ts index 16ea3ef..2a3a203 100644 --- a/src/app/modules/proto/models/api/betting_pb.d.ts +++ b/src/app/modules/proto/models/api/betting_pb.d.ts @@ -38,20 +38,16 @@ export class BettingHistory extends jspb.Message { getAfterCash(): number; setAfterCash(value: number): void; - getKey(): string; - setKey(value: string): void; - - getRefId(): string; - setRefId(value: string): void; - - getORefId(): string; - setORefId(value: string): void; - hasGroupKey(): boolean; clearGroupKey(): void; getGroupKey(): string; setGroupKey(value: string): void; + hasDetail(): boolean; + clearDetail(): void; + getDetail(): string; + setDetail(value: string): void; + getIsBonus(): boolean; setIsBonus(value: boolean): void; @@ -64,6 +60,15 @@ export class BettingHistory extends jspb.Message { getSiteUsername(): string; setSiteUsername(value: string): void; + getKey(): string; + setKey(value: string): void; + + getRefId(): string; + setRefId(value: string): void; + + getORefId(): string; + setORefId(value: string): void; + getBettingType(): string; setBettingType(value: string): void; @@ -110,14 +115,15 @@ export namespace BettingHistory { cash: number; beforeCash: number; afterCash: number; - key: string; - refId: string; - oRefId: string; groupKey: string; + detail: string; isBonus: boolean; isPromo: boolean; isJackpot: boolean; siteUsername: string; + key: string; + refId: string; + oRefId: string; bettingType: string; category: string; createdAt: number; @@ -159,20 +165,16 @@ export class BettingHistoryModel extends jspb.Message { getAfterCash(): number; setAfterCash(value: number): void; - getKey(): string; - setKey(value: string): void; - - getRefId(): string; - setRefId(value: string): void; - - getORefId(): string; - setORefId(value: string): void; - hasGroupKey(): boolean; clearGroupKey(): void; getGroupKey(): string; setGroupKey(value: string): void; + hasDetail(): boolean; + clearDetail(): void; + getDetail(): string; + setDetail(value: string): void; + getIsBonus(): boolean; setIsBonus(value: boolean): void; @@ -185,6 +187,15 @@ export class BettingHistoryModel extends jspb.Message { getSiteUsername(): string; setSiteUsername(value: string): void; + getKey(): string; + setKey(value: string): void; + + getRefId(): string; + setRefId(value: string): void; + + getORefId(): string; + setORefId(value: string): void; + getBettingType(): string; setBettingType(value: string): void; @@ -236,14 +247,15 @@ export namespace BettingHistoryModel { cash: number; beforeCash: number; afterCash: number; - key: string; - refId: string; - oRefId: string; groupKey: string; + detail: string; isBonus: boolean; isPromo: boolean; isJackpot: boolean; siteUsername: string; + key: string; + refId: string; + oRefId: string; bettingType: string; category: string; createdAt: number; diff --git a/src/app/modules/proto/models/api/betting_pb.js b/src/app/modules/proto/models/api/betting_pb.js index c583e81..570c86b 100644 --- a/src/app/modules/proto/models/api/betting_pb.js +++ b/src/app/modules/proto/models/api/betting_pb.js @@ -118,18 +118,19 @@ if (jspb.Message.GENERATE_TO_OBJECT) { cash: jspb.Message.getFloatingPointFieldWithDefault(msg, 9, 0.0), beforeCash: jspb.Message.getFloatingPointFieldWithDefault(msg, 10, 0.0), afterCash: jspb.Message.getFloatingPointFieldWithDefault(msg, 11, 0.0), - key: jspb.Message.getFieldWithDefault(msg, 12, ""), - refId: jspb.Message.getFieldWithDefault(msg, 13, ""), - oRefId: jspb.Message.getFieldWithDefault(msg, 14, ""), - groupKey: jspb.Message.getFieldWithDefault(msg, 15, ""), - isBonus: jspb.Message.getBooleanFieldWithDefault(msg, 16, false), - isPromo: jspb.Message.getBooleanFieldWithDefault(msg, 17, false), - isJackpot: jspb.Message.getBooleanFieldWithDefault(msg, 18, false), - siteUsername: jspb.Message.getFieldWithDefault(msg, 19, ""), - bettingType: jspb.Message.getFieldWithDefault(msg, 20, ""), - category: jspb.Message.getFieldWithDefault(msg, 21, ""), - createdAt: jspb.Message.getFieldWithDefault(msg, 22, 0), - utcCreatedAt: jspb.Message.getFieldWithDefault(msg, 23, 0), + groupKey: jspb.Message.getFieldWithDefault(msg, 12, ""), + detail: jspb.Message.getFieldWithDefault(msg, 13, ""), + isBonus: jspb.Message.getBooleanFieldWithDefault(msg, 14, false), + isPromo: jspb.Message.getBooleanFieldWithDefault(msg, 15, false), + isJackpot: jspb.Message.getBooleanFieldWithDefault(msg, 16, false), + siteUsername: jspb.Message.getFieldWithDefault(msg, 17, ""), + key: jspb.Message.getFieldWithDefault(msg, 18, ""), + refId: jspb.Message.getFieldWithDefault(msg, 19, ""), + oRefId: jspb.Message.getFieldWithDefault(msg, 20, ""), + bettingType: jspb.Message.getFieldWithDefault(msg, 21, ""), + category: jspb.Message.getFieldWithDefault(msg, 22, ""), + createdAt: jspb.Message.getFieldWithDefault(msg, 23, 0), + utcCreatedAt: jspb.Message.getFieldWithDefault(msg, 24, 0), }; if (includeInstance) { @@ -216,49 +217,53 @@ proto.bet.beteran.api.betting.BettingHistory.deserializeBinaryFromReader = break; case 12: var value = /** @type {string} */ (reader.readString()); - msg.setKey(value); + msg.setGroupKey(value); break; case 13: var value = /** @type {string} */ (reader.readString()); - msg.setRefId(value); + msg.setDetail(value); break; case 14: - var value = /** @type {string} */ (reader.readString()); - msg.setORefId(value); - break; - case 15: - var value = /** @type {string} */ (reader.readString()); - msg.setGroupKey(value); - break; - case 16: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsBonus(value); break; - case 17: + case 15: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsPromo(value); break; - case 18: + case 16: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsJackpot(value); break; - case 19: + case 17: var value = /** @type {string} */ (reader.readString()); msg.setSiteUsername(value); break; + case 18: + var value = /** @type {string} */ (reader.readString()); + msg.setKey(value); + break; + case 19: + var value = /** @type {string} */ (reader.readString()); + msg.setRefId(value); + break; case 20: var value = /** @type {string} */ (reader.readString()); - msg.setBettingType(value); + msg.setORefId(value); break; case 21: var value = /** @type {string} */ (reader.readString()); - msg.setCategory(value); + msg.setBettingType(value); break; case 22: + var value = /** @type {string} */ (reader.readString()); + msg.setCategory(value); + break; + case 23: var value = /** @type {number} */ (reader.readUint64()); msg.setCreatedAt(value); break; - case 23: + case 24: var value = /** @type {number} */ (reader.readUint64()); msg.setUtcCreatedAt(value); break; @@ -338,53 +343,57 @@ proto.bet.beteran.api.betting.BettingHistory.serializeBinaryToWriter = if (f !== 0.0) { writer.writeDouble(11, f); } - f = message.getKey(); - if (f.length > 0) { + f = /** @type {string} */ (jspb.Message.getField(message, 12)); + if (f != null) { writer.writeString(12, f); } - f = message.getRefId(); - if (f.length > 0) { - writer.writeString(13, f); - } - f = message.getORefId(); - if (f.length > 0) { - writer.writeString(14, f); - } - f = /** @type {string} */ (jspb.Message.getField(message, 15)); + f = /** @type {string} */ (jspb.Message.getField(message, 13)); if (f != null) { - writer.writeString(15, f); + writer.writeString(13, f); } f = message.getIsBonus(); if (f) { - writer.writeBool(16, f); + writer.writeBool(14, f); } f = message.getIsPromo(); if (f) { - writer.writeBool(17, f); + writer.writeBool(15, f); } f = message.getIsJackpot(); if (f) { - writer.writeBool(18, f); + writer.writeBool(16, f); } f = message.getSiteUsername(); + if (f.length > 0) { + writer.writeString(17, f); + } + f = message.getKey(); + if (f.length > 0) { + writer.writeString(18, f); + } + f = message.getRefId(); if (f.length > 0) { writer.writeString(19, f); } - f = message.getBettingType(); + f = message.getORefId(); if (f.length > 0) { writer.writeString(20, f); } - f = message.getCategory(); + f = message.getBettingType(); if (f.length > 0) { writer.writeString(21, f); } + f = message.getCategory(); + if (f.length > 0) { + writer.writeString(22, f); + } f = message.getCreatedAt(); if (f !== 0) { - writer.writeUint64(22, f); + writer.writeUint64(23, f); } f = message.getUtcCreatedAt(); if (f !== 0) { - writer.writeUint64(23, f); + writer.writeUint64(24, f); } }; @@ -608,67 +617,13 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.setAfterCash = function ( }; /** - * optional string key = 12; - * @return {string} - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getKey = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setKey = function ( - value -) { - return jspb.Message.setProto3StringField(this, 12, value); -}; - -/** - * optional string ref_id = 13; - * @return {string} - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getRefId = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setRefId = function ( - value -) { - return jspb.Message.setProto3StringField(this, 13, value); -}; - -/** - * optional string o_ref_id = 14; - * @return {string} - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getORefId = function () { - return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, "")); -}; - -/** - * @param {string} value - * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this - */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setORefId = function ( - value -) { - return jspb.Message.setProto3StringField(this, 14, value); -}; - -/** - * optional string group_key = 15; + * optional string group_key = 12; * @return {string} */ proto.bet.beteran.api.betting.BettingHistory.prototype.getGroupKey = function () { return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 15, "") + jspb.Message.getFieldWithDefault(this, 12, "") ); }; @@ -679,7 +634,7 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getGroupKey = proto.bet.beteran.api.betting.BettingHistory.prototype.setGroupKey = function ( value ) { - return jspb.Message.setField(this, 15, value); + return jspb.Message.setField(this, 12, value); }; /** @@ -688,7 +643,7 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.setGroupKey = function ( */ proto.bet.beteran.api.betting.BettingHistory.prototype.clearGroupKey = function () { - return jspb.Message.setField(this, 15, undefined); + return jspb.Message.setField(this, 12, undefined); }; /** @@ -697,17 +652,52 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.clearGroupKey = */ proto.bet.beteran.api.betting.BettingHistory.prototype.hasGroupKey = function () { - return jspb.Message.getField(this, 15) != null; + return jspb.Message.getField(this, 12) != null; }; /** - * optional bool is_bonus = 16; + * optional string detail = 13; + * @return {string} + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.getDetail = function () { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, "")); +}; + +/** + * @param {string} value + * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.setDetail = function ( + value +) { + return jspb.Message.setField(this, 13, value); +}; + +/** + * Clears the field making it undefined. + * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.clearDetail = + function () { + return jspb.Message.setField(this, 13, undefined); + }; + +/** + * Returns whether this field is set. + * @return {boolean} + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.hasDetail = function () { + return jspb.Message.getField(this, 13) != null; +}; + +/** + * optional bool is_bonus = 14; * @return {boolean} */ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsBonus = function () { return /** @type {boolean} */ ( - jspb.Message.getBooleanFieldWithDefault(this, 16, false) + jspb.Message.getBooleanFieldWithDefault(this, 14, false) ); }; @@ -718,17 +708,17 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsBonus = proto.bet.beteran.api.betting.BettingHistory.prototype.setIsBonus = function ( value ) { - return jspb.Message.setProto3BooleanField(this, 16, value); + return jspb.Message.setProto3BooleanField(this, 14, value); }; /** - * optional bool is_promo = 17; + * optional bool is_promo = 15; * @return {boolean} */ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsPromo = function () { return /** @type {boolean} */ ( - jspb.Message.getBooleanFieldWithDefault(this, 17, false) + jspb.Message.getBooleanFieldWithDefault(this, 15, false) ); }; @@ -739,17 +729,17 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsPromo = proto.bet.beteran.api.betting.BettingHistory.prototype.setIsPromo = function ( value ) { - return jspb.Message.setProto3BooleanField(this, 17, value); + return jspb.Message.setProto3BooleanField(this, 15, value); }; /** - * optional bool is_jackpot = 18; + * optional bool is_jackpot = 16; * @return {boolean} */ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsJackpot = function () { return /** @type {boolean} */ ( - jspb.Message.getBooleanFieldWithDefault(this, 18, false) + jspb.Message.getBooleanFieldWithDefault(this, 16, false) ); }; @@ -760,17 +750,17 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getIsJackpot = proto.bet.beteran.api.betting.BettingHistory.prototype.setIsJackpot = function ( value ) { - return jspb.Message.setProto3BooleanField(this, 18, value); + return jspb.Message.setProto3BooleanField(this, 16, value); }; /** - * optional string site_username = 19; + * optional string site_username = 17; * @return {string} */ proto.bet.beteran.api.betting.BettingHistory.prototype.getSiteUsername = function () { return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 19, "") + jspb.Message.getFieldWithDefault(this, 17, "") ); }; @@ -780,34 +770,68 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getSiteUsername = */ proto.bet.beteran.api.betting.BettingHistory.prototype.setSiteUsername = function (value) { - return jspb.Message.setProto3StringField(this, 19, value); + return jspb.Message.setProto3StringField(this, 17, value); }; /** - * optional string betting_type = 20; + * optional string key = 18; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getBettingType = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 20, "") - ); - }; +proto.bet.beteran.api.betting.BettingHistory.prototype.getKey = function () { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 18, "")); +}; /** * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setBettingType = - function (value) { - return jspb.Message.setProto3StringField(this, 20, value); - }; +proto.bet.beteran.api.betting.BettingHistory.prototype.setKey = function ( + value +) { + return jspb.Message.setProto3StringField(this, 18, value); +}; /** - * optional string category = 21; + * optional string ref_id = 19; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getCategory = +proto.bet.beteran.api.betting.BettingHistory.prototype.getRefId = function () { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 19, "")); +}; + +/** + * @param {string} value + * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.setRefId = function ( + value +) { + return jspb.Message.setProto3StringField(this, 19, value); +}; + +/** + * optional string o_ref_id = 20; + * @return {string} + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.getORefId = function () { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 20, "")); +}; + +/** + * @param {string} value + * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.setORefId = function ( + value +) { + return jspb.Message.setProto3StringField(this, 20, value); +}; + +/** + * optional string betting_type = 21; + * @return {string} + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.getBettingType = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 21, "") @@ -818,51 +842,71 @@ proto.bet.beteran.api.betting.BettingHistory.prototype.getCategory = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setCategory = function ( - value -) { - return jspb.Message.setProto3StringField(this, 21, value); -}; +proto.bet.beteran.api.betting.BettingHistory.prototype.setBettingType = + function (value) { + return jspb.Message.setProto3StringField(this, 21, value); + }; /** - * optional uint64 created_at = 22; - * @return {number} + * optional string category = 22; + * @return {string} */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getCreatedAt = +proto.bet.beteran.api.betting.BettingHistory.prototype.getCategory = function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 22, 0) + return /** @type {string} */ ( + jspb.Message.getFieldWithDefault(this, 22, "") ); }; /** - * @param {number} value + * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this */ -proto.bet.beteran.api.betting.BettingHistory.prototype.setCreatedAt = function ( +proto.bet.beteran.api.betting.BettingHistory.prototype.setCategory = function ( value ) { - return jspb.Message.setProto3IntField(this, 22, value); + return jspb.Message.setProto3StringField(this, 22, value); }; /** - * optional uint64 utc_created_at = 23; + * optional uint64 created_at = 23; * @return {number} */ -proto.bet.beteran.api.betting.BettingHistory.prototype.getUtcCreatedAt = +proto.bet.beteran.api.betting.BettingHistory.prototype.getCreatedAt = function () { return /** @type {number} */ ( jspb.Message.getFieldWithDefault(this, 23, 0) ); }; +/** + * @param {number} value + * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.setCreatedAt = function ( + value +) { + return jspb.Message.setProto3IntField(this, 23, value); +}; + +/** + * optional uint64 utc_created_at = 24; + * @return {number} + */ +proto.bet.beteran.api.betting.BettingHistory.prototype.getUtcCreatedAt = + function () { + return /** @type {number} */ ( + jspb.Message.getFieldWithDefault(this, 24, 0) + ); + }; + /** * @param {number} value * @return {!proto.bet.beteran.api.betting.BettingHistory} returns this */ proto.bet.beteran.api.betting.BettingHistory.prototype.setUtcCreatedAt = function (value) { - return jspb.Message.setProto3IntField(this, 23, value); + return jspb.Message.setProto3IntField(this, 24, value); }; if (jspb.Message.GENERATE_TO_OBJECT) { @@ -912,18 +956,19 @@ if (jspb.Message.GENERATE_TO_OBJECT) { cash: jspb.Message.getFloatingPointFieldWithDefault(msg, 9, 0.0), beforeCash: jspb.Message.getFloatingPointFieldWithDefault(msg, 10, 0.0), afterCash: jspb.Message.getFloatingPointFieldWithDefault(msg, 11, 0.0), - key: jspb.Message.getFieldWithDefault(msg, 12, ""), - refId: jspb.Message.getFieldWithDefault(msg, 13, ""), - oRefId: jspb.Message.getFieldWithDefault(msg, 14, ""), - groupKey: jspb.Message.getFieldWithDefault(msg, 15, ""), - isBonus: jspb.Message.getBooleanFieldWithDefault(msg, 16, false), - isPromo: jspb.Message.getBooleanFieldWithDefault(msg, 17, false), - isJackpot: jspb.Message.getBooleanFieldWithDefault(msg, 18, false), - siteUsername: jspb.Message.getFieldWithDefault(msg, 19, ""), - bettingType: jspb.Message.getFieldWithDefault(msg, 20, ""), - category: jspb.Message.getFieldWithDefault(msg, 21, ""), - createdAt: jspb.Message.getFieldWithDefault(msg, 22, 0), - utcCreatedAt: jspb.Message.getFieldWithDefault(msg, 23, 0), + groupKey: jspb.Message.getFieldWithDefault(msg, 12, ""), + detail: jspb.Message.getFieldWithDefault(msg, 13, ""), + isBonus: jspb.Message.getBooleanFieldWithDefault(msg, 14, false), + isPromo: jspb.Message.getBooleanFieldWithDefault(msg, 15, false), + isJackpot: jspb.Message.getBooleanFieldWithDefault(msg, 16, false), + siteUsername: jspb.Message.getFieldWithDefault(msg, 17, ""), + key: jspb.Message.getFieldWithDefault(msg, 18, ""), + refId: jspb.Message.getFieldWithDefault(msg, 19, ""), + oRefId: jspb.Message.getFieldWithDefault(msg, 20, ""), + bettingType: jspb.Message.getFieldWithDefault(msg, 21, ""), + category: jspb.Message.getFieldWithDefault(msg, 22, ""), + createdAt: jspb.Message.getFieldWithDefault(msg, 23, 0), + utcCreatedAt: jspb.Message.getFieldWithDefault(msg, 24, 0), member: (f = msg.getMember()) && models_member_pb.MemberModel.toObject(includeInstance, f), @@ -1013,53 +1058,57 @@ proto.bet.beteran.api.betting.BettingHistoryModel.deserializeBinaryFromReader = break; case 12: var value = /** @type {string} */ (reader.readString()); - msg.setKey(value); + msg.setGroupKey(value); break; case 13: var value = /** @type {string} */ (reader.readString()); - msg.setRefId(value); + msg.setDetail(value); break; case 14: - var value = /** @type {string} */ (reader.readString()); - msg.setORefId(value); - break; - case 15: - var value = /** @type {string} */ (reader.readString()); - msg.setGroupKey(value); - break; - case 16: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsBonus(value); break; - case 17: + case 15: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsPromo(value); break; - case 18: + case 16: var value = /** @type {boolean} */ (reader.readBool()); msg.setIsJackpot(value); break; - case 19: + case 17: var value = /** @type {string} */ (reader.readString()); msg.setSiteUsername(value); break; + case 18: + var value = /** @type {string} */ (reader.readString()); + msg.setKey(value); + break; + case 19: + var value = /** @type {string} */ (reader.readString()); + msg.setRefId(value); + break; case 20: var value = /** @type {string} */ (reader.readString()); - msg.setBettingType(value); + msg.setORefId(value); break; case 21: var value = /** @type {string} */ (reader.readString()); - msg.setCategory(value); + msg.setBettingType(value); break; case 22: - var value = /** @type {number} */ (reader.readUint64()); - msg.setCreatedAt(value); + var value = /** @type {string} */ (reader.readString()); + msg.setCategory(value); break; case 23: var value = /** @type {number} */ (reader.readUint64()); - msg.setUtcCreatedAt(value); + msg.setCreatedAt(value); break; case 24: + var value = /** @type {number} */ (reader.readUint64()); + msg.setUtcCreatedAt(value); + break; + case 25: var value = new models_member_pb.MemberModel(); reader.readMessage( value, @@ -1143,58 +1192,62 @@ proto.bet.beteran.api.betting.BettingHistoryModel.serializeBinaryToWriter = if (f !== 0.0) { writer.writeDouble(11, f); } - f = message.getKey(); - if (f.length > 0) { + f = /** @type {string} */ (jspb.Message.getField(message, 12)); + if (f != null) { writer.writeString(12, f); } - f = message.getRefId(); - if (f.length > 0) { - writer.writeString(13, f); - } - f = message.getORefId(); - if (f.length > 0) { - writer.writeString(14, f); - } - f = /** @type {string} */ (jspb.Message.getField(message, 15)); + f = /** @type {string} */ (jspb.Message.getField(message, 13)); if (f != null) { - writer.writeString(15, f); + writer.writeString(13, f); } f = message.getIsBonus(); if (f) { - writer.writeBool(16, f); + writer.writeBool(14, f); } f = message.getIsPromo(); if (f) { - writer.writeBool(17, f); + writer.writeBool(15, f); } f = message.getIsJackpot(); if (f) { - writer.writeBool(18, f); + writer.writeBool(16, f); } f = message.getSiteUsername(); + if (f.length > 0) { + writer.writeString(17, f); + } + f = message.getKey(); + if (f.length > 0) { + writer.writeString(18, f); + } + f = message.getRefId(); if (f.length > 0) { writer.writeString(19, f); } - f = message.getBettingType(); + f = message.getORefId(); if (f.length > 0) { writer.writeString(20, f); } - f = message.getCategory(); + f = message.getBettingType(); if (f.length > 0) { writer.writeString(21, f); } + f = message.getCategory(); + if (f.length > 0) { + writer.writeString(22, f); + } f = message.getCreatedAt(); if (f !== 0) { - writer.writeUint64(22, f); + writer.writeUint64(23, f); } f = message.getUtcCreatedAt(); if (f !== 0) { - writer.writeUint64(23, f); + writer.writeUint64(24, f); } f = message.getMember(); if (f != null) { writer.writeMessage( - 24, + 25, f, models_member_pb.MemberModel.serializeBinaryToWriter ); @@ -1420,10 +1473,10 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setAfterCash = }; /** - * optional string key = 12; + * optional string group_key = 12; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getKey = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getGroupKey = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 12, "") @@ -1434,17 +1487,34 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getKey = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setKey = function ( - value -) { - return jspb.Message.setProto3StringField(this, 12, value); -}; +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setGroupKey = + function (value) { + return jspb.Message.setField(this, 12, value); + }; /** - * optional string ref_id = 13; + * Clears the field making it undefined. + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.clearGroupKey = + function () { + return jspb.Message.setField(this, 12, undefined); + }; + +/** + * Returns whether this field is set. + * @return {boolean} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.hasGroupKey = + function () { + return jspb.Message.getField(this, 12) != null; + }; + +/** + * optional string detail = 13; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getRefId = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getDetail = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 13, "") @@ -1455,74 +1525,74 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getRefId = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setRefId = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setDetail = function (value) { - return jspb.Message.setProto3StringField(this, 13, value); - }; - -/** - * optional string o_ref_id = 14; - * @return {string} - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getORefId = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 14, "") - ); - }; - -/** - * @param {string} value - * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setORefId = - function (value) { - return jspb.Message.setProto3StringField(this, 14, value); - }; - -/** - * optional string group_key = 15; - * @return {string} - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getGroupKey = - function () { - return /** @type {string} */ ( - jspb.Message.getFieldWithDefault(this, 15, "") - ); - }; - -/** - * @param {string} value - * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setGroupKey = - function (value) { - return jspb.Message.setField(this, 15, value); + return jspb.Message.setField(this, 13, value); }; /** * Clears the field making it undefined. * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.clearGroupKey = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.clearDetail = function () { - return jspb.Message.setField(this, 15, undefined); + return jspb.Message.setField(this, 13, undefined); }; /** * Returns whether this field is set. * @return {boolean} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.hasGroupKey = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.hasDetail = function () { - return jspb.Message.getField(this, 15) != null; + return jspb.Message.getField(this, 13) != null; }; /** - * optional bool is_bonus = 16; + * optional bool is_bonus = 14; * @return {boolean} */ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsBonus = + function () { + return /** @type {boolean} */ ( + jspb.Message.getBooleanFieldWithDefault(this, 14, false) + ); + }; + +/** + * @param {boolean} value + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsBonus = + function (value) { + return jspb.Message.setProto3BooleanField(this, 14, value); + }; + +/** + * optional bool is_promo = 15; + * @return {boolean} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsPromo = + function () { + return /** @type {boolean} */ ( + jspb.Message.getBooleanFieldWithDefault(this, 15, false) + ); + }; + +/** + * @param {boolean} value + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsPromo = + function (value) { + return jspb.Message.setProto3BooleanField(this, 15, value); + }; + +/** + * optional bool is_jackpot = 16; + * @return {boolean} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsJackpot = function () { return /** @type {boolean} */ ( jspb.Message.getBooleanFieldWithDefault(this, 16, false) @@ -1533,56 +1603,57 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsBonus = * @param {boolean} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsBonus = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsJackpot = function (value) { return jspb.Message.setProto3BooleanField(this, 16, value); }; /** - * optional bool is_promo = 17; - * @return {boolean} - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsPromo = - function () { - return /** @type {boolean} */ ( - jspb.Message.getBooleanFieldWithDefault(this, 17, false) - ); - }; - -/** - * @param {boolean} value - * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsPromo = - function (value) { - return jspb.Message.setProto3BooleanField(this, 17, value); - }; - -/** - * optional bool is_jackpot = 18; - * @return {boolean} - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getIsJackpot = - function () { - return /** @type {boolean} */ ( - jspb.Message.getBooleanFieldWithDefault(this, 18, false) - ); - }; - -/** - * @param {boolean} value - * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this - */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setIsJackpot = - function (value) { - return jspb.Message.setProto3BooleanField(this, 18, value); - }; - -/** - * optional string site_username = 19; + * optional string site_username = 17; * @return {string} */ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getSiteUsername = + function () { + return /** @type {string} */ ( + jspb.Message.getFieldWithDefault(this, 17, "") + ); + }; + +/** + * @param {string} value + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setSiteUsername = + function (value) { + return jspb.Message.setProto3StringField(this, 17, value); + }; + +/** + * optional string key = 18; + * @return {string} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getKey = + function () { + return /** @type {string} */ ( + jspb.Message.getFieldWithDefault(this, 18, "") + ); + }; + +/** + * @param {string} value + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setKey = function ( + value +) { + return jspb.Message.setProto3StringField(this, 18, value); +}; + +/** + * optional string ref_id = 19; + * @return {string} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getRefId = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 19, "") @@ -1593,16 +1664,16 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getSiteUsername = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setSiteUsername = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setRefId = function (value) { return jspb.Message.setProto3StringField(this, 19, value); }; /** - * optional string betting_type = 20; + * optional string o_ref_id = 20; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getBettingType = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getORefId = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 20, "") @@ -1613,16 +1684,16 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getBettingType = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setBettingType = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setORefId = function (value) { return jspb.Message.setProto3StringField(this, 20, value); }; /** - * optional string category = 21; + * optional string betting_type = 21; * @return {string} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getCategory = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getBettingType = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 21, "") @@ -1633,36 +1704,36 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getCategory = * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setCategory = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setBettingType = function (value) { return jspb.Message.setProto3StringField(this, 21, value); }; /** - * optional uint64 created_at = 22; - * @return {number} + * optional string category = 22; + * @return {string} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getCreatedAt = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getCategory = function () { - return /** @type {number} */ ( - jspb.Message.getFieldWithDefault(this, 22, 0) + return /** @type {string} */ ( + jspb.Message.getFieldWithDefault(this, 22, "") ); }; /** - * @param {number} value + * @param {string} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setCreatedAt = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setCategory = function (value) { - return jspb.Message.setProto3IntField(this, 22, value); + return jspb.Message.setProto3StringField(this, 22, value); }; /** - * optional uint64 utc_created_at = 23; + * optional uint64 created_at = 23; * @return {number} */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getUtcCreatedAt = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getCreatedAt = function () { return /** @type {number} */ ( jspb.Message.getFieldWithDefault(this, 23, 0) @@ -1673,19 +1744,39 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getUtcCreatedAt = * @param {number} value * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this */ -proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setUtcCreatedAt = +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setCreatedAt = function (value) { return jspb.Message.setProto3IntField(this, 23, value); }; /** - * optional bet.beteran.member.MemberModel member = 24; + * optional uint64 utc_created_at = 24; + * @return {number} + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getUtcCreatedAt = + function () { + return /** @type {number} */ ( + jspb.Message.getFieldWithDefault(this, 24, 0) + ); + }; + +/** + * @param {number} value + * @return {!proto.bet.beteran.api.betting.BettingHistoryModel} returns this + */ +proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setUtcCreatedAt = + function (value) { + return jspb.Message.setProto3IntField(this, 24, value); + }; + +/** + * optional bet.beteran.member.MemberModel member = 25; * @return {?proto.bet.beteran.member.MemberModel} */ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getMember = function () { return /** @type{?proto.bet.beteran.member.MemberModel} */ ( - jspb.Message.getWrapperField(this, models_member_pb.MemberModel, 24) + jspb.Message.getWrapperField(this, models_member_pb.MemberModel, 25) ); }; @@ -1695,7 +1786,7 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.getMember = */ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.setMember = function (value) { - return jspb.Message.setWrapperField(this, 24, value); + return jspb.Message.setWrapperField(this, 25, value); }; /** @@ -1713,7 +1804,7 @@ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.clearMember = */ proto.bet.beteran.api.betting.BettingHistoryModel.prototype.hasMember = function () { - return jspb.Message.getField(this, 24) != null; + return jspb.Message.getField(this, 25) != null; }; goog.object.extend(exports, proto.bet.beteran.api.betting); From e7ae83912a233fc5714408961316c74ab5a69899 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Tue, 6 Sep 2022 12:40:35 +0000 Subject: [PATCH 4/5] member model is modified --- .../game/casino/components/list.component.ts | 11 +- .../game/slot/components/list.component.ts | 11 +- src/app/modules/proto/models/member_pb.d.ts | 145 +-- src/app/modules/proto/models/member_pb.js | 1008 +---------------- 4 files changed, 20 insertions(+), 1155 deletions(-) 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 ( From 54aea119d9a4c25cd1cdc51fe8d0e780b20966d4 Mon Sep 17 00:00:00 2001 From: PARK BYUNG JUN Date: Wed, 7 Sep 2022 03:25:19 +0000 Subject: [PATCH 5/5] modified --- .../user/components/list.component.html | 7 ++++++- .../member/user/components/list.component.ts | 20 ------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/app/modules/admin/member/user/components/list.component.html b/src/app/modules/admin/member/user/components/list.component.html index 02ea8a1..cd4edff 100644 --- a/src/app/modules/admin/member/user/components/list.component.html +++ b/src/app/modules/admin/member/user/components/list.component.html @@ -329,7 +329,12 @@
요율
- {{ __getParentUsername(member) }} + + [{{ + member.getParentMember()?.getMemberClass()?.getName() + }}] + {{ member.getParentMember()?.getUsername() }} +