diff --git a/src/app/mock-api/apps/game/casino/data.ts b/src/app/mock-api/apps/game/casino/data.ts
index 2529961..504a683 100644
--- a/src/app/mock-api/apps/game/casino/data.ts
+++ b/src/app/mock-api/apps/game/casino/data.ts
@@ -2,6 +2,7 @@
export const casinos = [
{
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
highRank: '[매장]kgon5',
gameId: 'ks1_1007',
siteId: 'aa100',
@@ -17,7 +18,7 @@ export const casinos = [
bettingInfo1: 'Banker',
bettingInfo2: 8000,
bettingInfo3: 0,
- compY: 'Y',
+ comp: 'Y',
mainofficeName: 'kgon1',
mainofficePercent: '1.00',
mainofficePoint: '10.00',
diff --git a/src/app/mock-api/apps/game/evolution/api.ts b/src/app/mock-api/apps/game/evolution/api.ts
index 6c959a4..6e1b1cb 100644
--- a/src/app/mock-api/apps/game/evolution/api.ts
+++ b/src/app/mock-api/apps/game/evolution/api.ts
@@ -33,7 +33,7 @@ export class GameEvolutionMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'signinId';
const order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10);
@@ -42,7 +42,7 @@ export class GameEvolutionMockApi {
let evolutions: any[] | null = cloneDeep(this._evolutions);
// Sort the evolutions
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'signinId' || sort === 'nickname' || sort === 'gameId') {
evolutions.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/game/evolution/data.ts b/src/app/mock-api/apps/game/evolution/data.ts
index 706e992..bfba3ac 100644
--- a/src/app/mock-api/apps/game/evolution/data.ts
+++ b/src/app/mock-api/apps/game/evolution/data.ts
@@ -2,41 +2,24 @@
export const evolutions = [
{
- startDate: '2022-06-01 00:00',
- finishDate: '2022-06-21 23:59',
- availableBetting: 11545000,
- bettingMoney: 11811000,
- winningMoney: 11405200,
- cancel: 0,
- betWinCancel: 405800,
- mainofficeRolling: 58114,
- branchRolling: 34514,
- divisionRolling: 23058,
- officeRolling: 22982,
- storeRolling: 11787,
- memberRolling: 80295,
- totalrolling: 230750,
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'aa100',
highRank: '[매장]kgon5',
gameId: 'ks1_1007',
- id: 'aa100',
nickname: 'aa100',
gameName: '에볼류션 카지노',
gameInfo1: 'Speed Baccarat J',
gameInfo2: '',
gameInfo3: '62ae9bdd396a5971c3921033',
- form: '',
betting: 8000,
profitLoss: -8000,
- beforeWinning: 69831,
winning: 0,
- afterWinning: 69831,
beforeBetting: 77831,
afterBetting: 69831,
finalMoney: 69831,
bettingInfo1: 'Banker',
bettingInfo2: 8000,
bettingInfo3: 0,
- data: '데이터확인',
comp: 'Y',
mainofficeName: 'kgon1',
mainofficePercent: '0.50',
@@ -57,6 +40,6 @@ export const evolutions = [
memberPercent: '0.70',
memberPoint: '56.00',
bettingTime: '2022-06-19 12:44:33',
- registrationTime: '2022-06-19 12:47:02',
+ registrationDate: '2022-06-19 12:47:02',
},
];
diff --git a/src/app/modules/admin/game/casino/components/list.component.html b/src/app/modules/admin/game/casino/components/list.component.html
index 610a2c5..6b9d2a3 100644
--- a/src/app/modules/admin/game/casino/components/list.component.html
+++ b/src/app/modules/admin/game/casino/components/list.component.html
@@ -218,7 +218,7 @@
- {{ casino.compY }}
+ {{ casino.comp }}
본사{{ casino.mainofficeName }}({{
@@ -226,8 +226,8 @@
}}% : {{ casino.mainofficePoint }}P)
대본{{ casino.branchName }}({{
- casino.beforeWinning
- }}% : {{ casino.beforeWinning }}P)
+ casino.branchPercent
+ }}% : {{ casino.branchPoint }}P)
부본{{ casino.divisionName }}({{
casino.divisionPercent
diff --git a/src/app/modules/admin/game/casino/models/casino.ts b/src/app/modules/admin/game/casino/models/casino.ts
index 5dc19b1..208c5f2 100644
--- a/src/app/modules/admin/game/casino/models/casino.ts
+++ b/src/app/modules/admin/game/casino/models/casino.ts
@@ -15,7 +15,7 @@ export interface Casino {
bettingInfo1?: string;
bettingInfo2?: number;
bettingInfo3?: number;
- compY?: string;
+ comp?: string;
mainofficeName?: string;
mainofficePercent?: number;
mainofficePoint?: number;
diff --git a/src/app/modules/admin/game/evolution/components/list.component.html b/src/app/modules/admin/game/evolution/components/list.component.html
index 907126a..d0ccc6b 100644
--- a/src/app/modules/admin/game/evolution/components/list.component.html
+++ b/src/app/modules/admin/game/evolution/components/list.component.html
@@ -10,40 +10,67 @@
-
+
-
-
+
+
+ 2022-01-01 00:00~
+ 2022-06-21 23:59
+ 까지의 총 유효배팅:12,440,000원
+ 배팅금액:12,751,000원
+ 당첨:12,199,950원
+ 취소:10,000원
+ 배팅-당첨-취소:542,050원
+ 본사롤링:60,202원
+ 대본롤링:36,390원
+ 부본롤링:24,828원
+ 총판롤링:24,752원
+ 매장롤링:13,451원
+ 회원롤링:81,037원
+ 롤링합계:240,660원
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 전체금액
+
+
+ 전체
배팅100만미만
배팅100-300만
배팅300-500만
@@ -51,8 +78,8 @@
당첨1000만초과
-
-
+
+
아이디
게임아이디
닉네임
@@ -61,7 +88,8 @@
-
+
@@ -100,33 +129,21 @@
-
-
상위
-
유저
-
게임
-
형식
+
상부
+
유저
+
게임
금액
최종금액
-
배팅
-
데이터
-
콤프
-
롤링
-
배팅시간 등록시간
-
@@ -136,191 +153,86 @@
-
-
-
+
{{ evolution.highRank }}
+
+ 게임ID{{ evolution.gameId }}
+
+ 사이트ID{{ evolution.signinId }}
+
+ 닉네임{{ evolution.nickname }}
-
-
- {{ evolution.gameId }}
- {{ evolution.id }}
- {{ evolution.nickname }}
-
-
-
-
+
+ {{ evolution.gameName }}
+
{{ evolution.gameInfo1 }}
+
{{ evolution.gameInfo2 }}
+
{{ evolution.gameInfo3 }}
-
-
-
-
-
-
- 배팅{{ evolution.betting }} 당첨{{
- evolution.winning
- }}
+
+ 배팅{{ evolution.betting }}
+
+ 당첨{{ evolution.winning }}
+
손익{{ evolution.profitLoss }}
-
-
-
- 배팅 전{{ evolution.beforeBetting }} 배팅 후{{
- evolution.afterBetting
- }}
+
+ 배팅전{{ evolution.beforeBetting }}
+
+ 배팅후{{ evolution.afterBetting }}
+
최종금액{{ evolution.finalMoney }}
-
-
-
+
{{ evolution.bettingInfo1 }}
+
{{ evolution.bettingInfo2 }}
+
{{ evolution.bettingInfo3 }}
-
-
-
-