From 938cc0a212639686f821559f046691d6509cdbea Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Fri, 5 Aug 2022 07:50:19 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=EC=97=90=EB=B3=BC=EB=A3=A8=EC=85=98=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/mock-api/apps/game/evolution/api.ts | 2 +- src/app/mock-api/apps/game/evolution/data.ts | 182 ++++++++ src/app/mock-api/apps/game/slot/data.ts | 12 +- .../evolution/components/list.component.html | 390 +++++++++++------- .../evolution/components/list.component.ts | 11 +- .../admin/game/evolution/evolution.module.ts | 4 + .../admin/game/evolution/models/evolution.ts | 73 ++-- .../game/slot/components/list.component.html | 7 +- .../modules/admin/game/slot/models/slot.ts | 6 +- src/styles/styles.scss | 6 +- 10 files changed, 484 insertions(+), 209 deletions(-) diff --git a/src/app/mock-api/apps/game/evolution/api.ts b/src/app/mock-api/apps/game/evolution/api.ts index 6e1b1cb..6522ea9 100644 --- a/src/app/mock-api/apps/game/evolution/api.ts +++ b/src/app/mock-api/apps/game/evolution/api.ts @@ -42,7 +42,7 @@ export class GameEvolutionMockApi { let evolutions: any[] | null = cloneDeep(this._evolutions); // Sort the evolutions - if (sort === 'signinId' || sort === 'nickname' || sort === 'gameId') { + if (sort === 'signinId') { 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 bfba3ac..079fb3d 100644 --- a/src/app/mock-api/apps/game/evolution/data.ts +++ b/src/app/mock-api/apps/game/evolution/data.ts @@ -1,6 +1,188 @@ /* eslint-disable */ export const evolutions = [ + { + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + signinId: 'aa200', + highRank: '[매장]kgon5', + gameId: 'ks1_1007', + nickname: 'aa200', + vendorName: '에볼류션 카지노', + gameName: '스타라이트 프린세스', + bettingId: '62acfwdcmdkei911dkd81221fb', + betStatus: '베팅', + betBeforeMoney: '77,831', + betWinMoney: '0', + betProfitLossMoney: '-8,000', + totalMoney: '69,831', + betMoney: '8,000', + betAfterMoney: '69,831', + comp: 'Y', + betHistorys: [ + { + pickBetType: 'Player', + betMoney: '2,000', + betWinMoney: '0', + }, + { + pickBetType: 'Player_Lighting', + betMoney: '400', + betWinMoney: '0', + }, + ], + mainInfo: { + name: 'kgon1', + commissionRate: '2.80%', + point: '22.40P', + }, + branchInfo: { + name: 'kgon2', + commissionRate: '0.20%', + point: '1.60P', + }, + divisionInfo: { + name: 'kgon3', + commissionRate: '0.20%', + point: '1.60P', + }, + officeInfo: { + name: 'kgon4', + commissionRate: '0.30%', + point: '2.40P', + }, + storeInfo: { + name: 'kgon5', + commissionRate: '1.50', + point: '12.00P', + }, + memberInfo: { + name: 'aa100', + commissionRate: '0.70', + point: '56.00P', + }, + bettingRegistDate: '2022-06-20 11:43:37', + registrationDate: '2022-06-20 11:43:37', + }, + { + id: '7eb7c859-1347-4337-96b6-9476a7e2ba3c', + signinId: 'aa200', + highRank: '[매장]kgon5', + gameId: 'ks1_1007', + nickname: 'aa200', + vendorName: '에볼류션 카지노', + gameName: '스타라이트 프린세스', + bettingId: '62acfwdcmdkei911dkd81221fb', + betStatus: '베팅', + betBeforeMoney: '82,831', + betWinMoney: '0', + betProfitLossMoney: '-5,000', + totalMoney: '77,831', + betMoney: '5,000', + betAfterMoney: '77,831', + comp: 'Y', + betHistorys: [ + { + pickBetType: 'Player', + betMoney: '2,000', + betWinMoney: '0', + }, + { + pickBetType: 'Player_Lighting', + betMoney: '400', + betWinMoney: '0', + }, + ], + mainInfo: { + name: 'kgon1', + commissionRate: '2.80%', + point: '22.40P', + }, + branchInfo: { + name: 'kgon2', + commissionRate: '0.20%', + point: '1.60P', + }, + divisionInfo: { + name: 'kgon3', + commissionRate: '0.20%', + point: '1.60P', + }, + officeInfo: { + name: 'kgon4', + commissionRate: '0.30%', + point: '2.40P', + }, + storeInfo: { + name: 'kgon5', + commissionRate: '1.50', + point: '12.00P', + }, + memberInfo: { + name: 'aa100', + commissionRate: '0.70', + point: '35.00P', + }, + bettingRegistDate: '2022-06-20 11:43:37', + registrationDate: '2022-06-20 11:43:37', + }, + { + id: '7eb7c859-1347-4327-96b6-9476a7e2ba3c', + signinId: 'aa200', + highRank: '[매장]kgon5', + gameId: 'ks1_1007', + nickname: 'aa200', + vendorName: '에볼류션 카지노', + gameName: '스타라이트 프린세스', + bettingId: '62acfwdcmdkei911dkd81221fb', + betStatus: '베팅', + betBeforeMoney: '80,931', + betWinMoney: '3,900', + betProfitLossMoney: '1,900', + totalMoney: '82,831', + betMoney: '2,000', + betAfterMoney: '78,931', + comp: 'Y', + betHistorys: [ + { + pickBetType: 'Player', + betMoney: '2,000', + betWinMoney: '0', + }, + { + pickBetType: 'Player_Lighting', + betMoney: '400', + betWinMoney: '0', + }, + ], + mainInfo: { + name: 'kgon1', + commissionRate: '2.80%', + point: '22.40P', + }, + branchInfo: { + name: 'kgon2', + commissionRate: '0.20%', + point: '1.60P', + }, + divisionInfo: { + name: 'kgon3', + commissionRate: '0.20%', + point: '1.60P', + }, + officeInfo: { + name: 'kgon4', + commissionRate: '0.30%', + point: '2.40P', + }, + storeInfo: { + name: 'kgon5', + commissionRate: '1.50', + point: '12.00P', + }, + bettingRegistDate: '2022-06-20 11:43:37', + registrationDate: '2022-06-20 11:43:37', + }, + { id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', signinId: 'aa100', diff --git a/src/app/mock-api/apps/game/slot/data.ts b/src/app/mock-api/apps/game/slot/data.ts index 19fd0f4..9bffc3b 100644 --- a/src/app/mock-api/apps/game/slot/data.ts +++ b/src/app/mock-api/apps/game/slot/data.ts @@ -11,8 +11,8 @@ export const slots = [ gameName: '스타라이트 프린세스', bettingId: '62acfwdcmdkei911dkd81221fb', betStatus: '베팅', - betPrevMoney: '187,730', - bettingMoney: '1,000', + betBeforeMoney: '187,730', + betMoney: '1,000', betAfterMoney: '186,930', comp: 'Y', mainInfo: { @@ -53,8 +53,8 @@ export const slots = [ gameName: '스타라이트 프린세스', bettingId: '62acfwdcmdkei911dkd81221fb', betStatus: '베팅', - betPrevMoney: '187,730', - bettingMoney: '1,000', + betBeforeMoney: '187,730', + betMoney: '1,000', betAfterMoney: '186,930', comp: 'Y', mainInfo: { @@ -95,8 +95,8 @@ export const slots = [ gameName: '스타라이트 프린세스', bettingId: '62acfwdcmdkei911dkd81221fb', betStatus: '베팅', - betPrevMoney: '187,730', - bettingMoney: '1,000', + betBeforeMoney: '187,730', + betMoney: '1,000', betAfterMoney: '186,930', comp: 'Y', mainInfo: { 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 ad89d92..3e3e8d2 100644 --- a/src/app/modules/admin/game/evolution/components/list.component.html +++ b/src/app/modules/admin/game/evolution/components/list.component.html @@ -10,54 +10,49 @@ -
에볼루션배팅리스트
+
에볼루션베팅리스트
+ +
+
-
- 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원 -
-
- +
+
+
기간
+
+ 2022-06-01 00:00 ~ 2022-06-21 23:59 까지 +
+
+ 총 유효배팅 | 배팅금액 +
+
816,335원 | 816,335원
+
+ 당첨 | 취소 | 배팅-당첨-취소 +
+
717,335원 | 0원 98,847
+
+ 본사롤링 | 대본롤링 | 부본롤링 | 총판 롤링 | 매장롤링 | 회원롤링 +
+
+ 6,335원 | 1,663원 | 1,633원 | 2,304원 | 5,544원 | 6,119원 +
+
롤링합계
+
3,9041원
+
+
@@ -68,52 +63,87 @@
- - - 전체 - 배팅100만미만 - 배팅100-300만 - 배팅300-500만 - 배팅500만이상 - 당첨1000만초과 - - - - - 아이디 - 게임아이디 - 닉네임 - 게임종류 - - - - - - - - - +
+ + + + 전체 + 배팅100만미만 + 배팅100-300만 + 배팅300-500만 + 배팅500만이상 + 당첨1000만초과 + + + + + + + + + + + + + + + + + 아이디 + 게임아이디 + 닉네임 + 게임종류 + + + + + + + + + +
@@ -124,22 +154,49 @@ class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto" > - +
-
상부
-
유저
-
게임
- - - - - - -