diff --git a/src/app/mock-api/apps/game/slot/data.ts b/src/app/mock-api/apps/game/slot/data.ts
index 78cdfed..19fd0f4 100644
--- a/src/app/mock-api/apps/game/slot/data.ts
+++ b/src/app/mock-api/apps/game/slot/data.ts
@@ -3,39 +3,128 @@
export const slots = [
{
id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
+ signinId: 'aa200',
highRank: '[매장]kgon5',
gameId: 'ks1_1007',
- signinId: 'aa100',
- nickname: 'aa100',
- gameName: '프라그마틱슬롯',
- gameInfo1: '스타라이트 프린세스',
- gameInfo2: '',
- gameInfo3: '62afded8114e77723a93caa2',
- gameType: '배팅',
- betting: 800,
- beforeBetting: 187730,
- afterBetting: 186903,
- data: '',
+ nickname: 'aa200',
+ vendorName: '프라그마스틱 슬롯',
+ gameName: '스타라이트 프린세스',
+ bettingId: '62acfwdcmdkei911dkd81221fb',
+ betStatus: '베팅',
+ betPrevMoney: '187,730',
+ bettingMoney: '1,000',
+ betAfterMoney: '186,930',
comp: 'Y',
- mainofficeName: 'kgon1',
- mainofficePercent: '2.80',
- mainofficePoint: '22.40',
- branchName: 'kgon2',
- branchPercent: '0.20',
- branchPoint: '1.60',
- divisionName: 'kgon3',
- divisionPercent: '0.20',
- divisionPoint: '1.60',
- officeName: 'kgon4',
- officePercent: '0.30',
- officePoint: '2.40',
- storeName: 'kgon5',
- storePercent: '1.50',
- storePoint: '12.00',
- memberName: '',
- memberPercent: '',
- memberPoint: '',
- bettingTime: '2022-06-20 11:43:37',
- registrationDate: '2022-06-20 11:45:02',
+ 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-4337-96b6-9476a7e2ba3c',
+ signinId: 'aa200',
+ highRank: '[매장]kgon5',
+ gameId: 'ks1_1007',
+ nickname: 'aa200',
+ vendorName: '프라그마스틱 슬롯',
+ gameName: '스타라이트 프린세스',
+ bettingId: '62acfwdcmdkei911dkd81221fb',
+ betStatus: '베팅',
+ betPrevMoney: '187,730',
+ bettingMoney: '1,000',
+ betAfterMoney: '186,930',
+ comp: 'Y',
+ 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-4327-96b6-9476a7e2ba3c',
+ signinId: 'aa200',
+ highRank: '[매장]kgon5',
+ gameId: 'ks1_1007',
+ nickname: 'aa200',
+ vendorName: '프라그마스틱 슬롯',
+ gameName: '스타라이트 프린세스',
+ bettingId: '62acfwdcmdkei911dkd81221fb',
+ betStatus: '베팅',
+ betPrevMoney: '187,730',
+ bettingMoney: '1,000',
+ betAfterMoney: '186,930',
+ comp: 'Y',
+ 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',
},
];
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 68a9146..41ce03f 100644
--- a/src/app/modules/admin/game/slot/components/list.component.html
+++ b/src/app/modules/admin/game/slot/components/list.component.html
@@ -10,54 +10,48 @@
-
+
+
+
+
-
- 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,82 +62,85 @@
-
-
- 카지노
- 슬롯
-
-
-
-
- 전체
- 프라그마틱슬롯
- 마이크로게이밍슬롯
- 하바네로
- 부운고
- 플레이손
- 퀵스핀
- 플레이엔고
- 넷엔트
- 메버릭
- 레드레이크
- 릴렉스
- 블루프린트
- ELK
- 아시안게이밍슬롯
- CQ9슬롯
- 레드타이거
- 드래곤소프트
- 스피어헤드
- 엘리시움
-
-
-
-
- 전체
- 배팅100만미만
- 배팅100-300만
- 배팅300-500만
- 배팅500만이상
- 당첨1000만초과
-
-
-
-
- 아이디
- 게임아이디
- 닉네임
- 게임종류
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 카지노
+ 슬롯
+
+
+
+
+ 전체
+ 프라그마틱슬롯
+ 마이크로게이밍슬롯
+ 하바네로
+ 부운고
+ 플레이손
+ 퀵스핀
+ 플레이엔고
+ 넷엔트
+ 메버릭
+ 레드레이크
+ 릴렉스
+ 블루프린트
+ ELK
+ 아시안게이밍슬롯
+ CQ9슬롯
+ 레드타이거
+ 드래곤소프트
+ 스피어헤드
+ 엘리시움
+
+
+
+
+ 전체
+ 배팅100만미만
+ 배팅100-300만
+ 배팅300-500만
+ 배팅500만이상
+ 당첨1000만초과
+
+
+
+
+ 아이디
+ 게임아이디
+ 닉네임
+ 게임종류
+
+
+
+
+
+
+
+
+
+
@@ -154,18 +151,36 @@
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
>
- 0; else noSlot">
+ 0; else noUser">
-
상부
-
유저
-
게임
-
형식
-
금액
-
콤프
+
상위
+
+ 게임코드ID
+
+ 사이트ID
+
+ 닉네임
+
+
+ 게임사이름
+
+ 게임 이름
+
+ 배팅고유코드
+
+
형식
+
+ 배팅전
+
+ 배팅
+
+ 배팅 후
+
+
콤프
롤링
배팅시간
@@ -177,65 +192,69 @@
-
{{ slot.highRank }}
-
- 게임ID{{ slot.gameId }}
-
- 사이트ID{{ slot.signinId }}
-
- 닉네임{{ slot.nickname }}
+
+ {{ slot.highRank }}
-
+
+ {{ slot.gameId }}
+
+ {{ slot.signinId }}
+
+ {{ slot.nickname }}
+
+
+ {{ slot.vendorName }}
+
{{ slot.gameName }}
- {{ slot.gameInfo1 }}
-
- {{ slot.gameInfo2 }}
-
- {{ slot.gameInfo3 }}
+ {{ slot.bettingId }}
-
- {{ slot.gameType }}
-
-
- 배팅전{{ slot.beforeBetting }}
+
{{ slot.betStatus }}
+
+ {{ slot.betPrevMoney }}
- 배팅{{ slot.betting }}
+ {{ slot.bettingMoney }}
- 배팅후{{ slot.afterBetting }}
+ {{ slot.betAfterMoney }}
-
+
{{ slot.comp }}
- 본사{{ slot.mainofficeName }}({{
- slot.mainofficePercent
- }}% : {{ slot.mainofficePoint }}P)
-
- 대본{{ slot.branchName }}({{
- slot.branchPercent
- }}% : {{ slot.branchPoint }}P)
-
- 부본{{ slot.divisionName }}({{
- slot.divisionPercent
- }}% : {{ slot.divisionPoint }}P)
-
- 총판{{ slot.officeName }}({{
- slot.officePercent
- }}% : {{ slot.officePoint }}P)
-
- 매장{{ slot.storeName }}({{
- slot.storePercent
- }}% : {{ slot.storePoint }}P)
-
- 회원{{ slot.memberName }}({{
- slot.memberPercent
- }}% : {{ slot.memberPoint }}P)
+
+ 본사: {{ slot.mainInfo.name }}({{
+ slot.mainInfo.commissionRate
+ }},{{ slot.mainInfo.point }})
+
+ 대본: {{ slot.branchInfo.name }}({{
+ slot.branchInfo.commissionRate
+ }},{{ slot.branchInfo.point }})
+
+ 부본: {{ slot.divisionInfo.name }}({{
+ slot.divisionInfo.commissionRate
+ }},{{ slot.divisionInfo.point }})
+
+ 총판: {{ slot.officeInfo.name }}({{
+ slot.officeInfo.commissionRate
+ }},{{ slot.officeInfo.point }})
+
+ 매장: {{ slot.storeInfo.name }}({{
+ slot.storeInfo.commissionRate
+ }},{{ slot.storeInfo.point }})
- {{ slot.bettingTime }}
+ {{ slot.bettingRegistDate }}
{{ slot.registrationDate }}
@@ -256,7 +275,7 @@
-
+
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 66b4794..26652fd 100644
--- a/src/app/modules/admin/game/slot/components/list.component.ts
+++ b/src/app/modules/admin/game/slot/components/list.component.ts
@@ -39,23 +39,23 @@ import { SlotService } from '../services/slot.service';
styles: [
/* language=SCSS */
`
- .inventory-grid {
- /* 상부 유저 게임 형식 금액 */
- grid-template-columns: 100px 140px auto 100px 100px;
+ .game-slot-grid {
+ /* 상위 게임 베팅 형식 금액 콤프 롤링 배팅시간*/
+ grid-template-columns: 100px 100px auto 60px 100px 40px 150px 150px;
@screen sm {
- /* 상부 유저 게임 형식 금액 콤프 */
- grid-template-columns: 100px 140px auto 100px 100px 140px;
+ /* 상위 게임 베팅 형식 금액 콤프 롤링 배팅시간*/
+ grid-template-columns: 100px 100px auto 60px 100px 40px 150px 150px;
}
@screen md {
- /* 상부 유저 게임 형식 금액 콤프 롤링 */
- grid-template-columns: 100px 140px auto 100px 100px 140px 100px;
+ /* 상위 게임 베팅 형식 금액 콤프 롤링 배팅시간*/
+ grid-template-columns: 100px 100px auto 60px 100px 40px 150px 150px;
}
@screen lg {
- /* 상부 유저 게임 형식 금액 콤프 롤링 */
- grid-template-columns: 100px 140px auto 100px 100px 140px 100px;
+ /* 상위 게임 베팅 형식 금액 콤프 롤링 배팅시간*/
+ grid-template-columns: 100px 100px auto 60px 100px 40px 150px 150px;
}
}
`,
diff --git a/src/app/modules/admin/game/slot/models/slot.ts b/src/app/modules/admin/game/slot/models/slot.ts
index 0b2ba37..d46f32d 100644
--- a/src/app/modules/admin/game/slot/models/slot.ts
+++ b/src/app/modules/admin/game/slot/models/slot.ts
@@ -4,33 +4,39 @@ export interface Slot {
highRank?: string;
gameId?: string;
nickname?: string;
+ vendorName?: string;
gameName?: string;
- gameInfo1?: string;
- gameInfo2?: string;
- gameInfo3?: string;
- gameType?: string;
- betting?: number;
- afterBetting?: number;
- beforeBetting?: number;
+ bettingId?: string;
+ betStatus?: string;
+ betPrevMoney?: number;
+ bettingMoney?: number;
+ betAfterMoney?: number;
comp?: string;
- mainofficeName?: string;
- mainofficePercent?: number;
- mainofficePoint?: number;
- branchName?: string;
- branchPercent?: number;
- branchPoint?: number;
- divisionName?: string;
- divisionPercent?: number;
- divisionPoint?: number;
- officeName?: string;
- officePercent?: number;
- officePoint?: number;
- storeName?: string;
- storePercent?: number;
- storePoint?: number;
- memberName?: string;
- memberPercent?: number;
- memberPoint?: number;
- bettingTime?: string;
+ mainInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ branchInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ divisionInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ officeInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ storeInfo?: {
+ name?: string;
+ commissionRate?: string;
+ point?: string;
+ };
+ bettingRegistDate?: string;
registrationDate?: string;
}