diff --git a/src/app/mock-api/apps/report/monthly/api.ts b/src/app/mock-api/apps/report/monthly/api.ts
index 121ce68..bd7cfed 100644
--- a/src/app/mock-api/apps/report/monthly/api.ts
+++ b/src/app/mock-api/apps/report/monthly/api.ts
@@ -33,7 +33,7 @@ export class ReportMonthlyMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'day';
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,11 @@ export class ReportMonthlyMockApi {
let monthlys: any[] | null = cloneDeep(this._monthlys);
// Sort the monthlys
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (
+ sort === 'day' ||
+ sort === 'monthlyDiposit' ||
+ sort === 'monthlyWithdraw'
+ ) {
monthlys.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/monthly/data.ts b/src/app/mock-api/apps/report/monthly/data.ts
index be97b0c..493b293 100644
--- a/src/app/mock-api/apps/report/monthly/data.ts
+++ b/src/app/mock-api/apps/report/monthly/data.ts
@@ -2,32 +2,15 @@
export const monthlys = [
{
- id: 'on00',
- totalPartnerCount: '5',
- totalHoldingMoney: 303675,
- totalComp: 108933,
- total: 412608,
- branchCount: 1,
- divisionCount: 1,
- officeCount: 1,
- storeCount: 1,
- memberCount: 1,
- nickname: 'on00',
- accountHolder: '11',
- phoneNumber: '010-1111-1111',
- calculateType: '롤링',
- ownCash: 50000,
- ownComp: 1711,
- ownCoupon: 50000,
- gameMoney: 0,
- todayComp: 0,
- totalDeposit: 0,
- totalWithdraw: 0,
- balance: 0,
- registDate: '2022-06-12 15:38',
- finalSigninDate: '',
- ip: '',
- state: '정상',
- note: '',
+ id: '8fcce528-d878-4cc8-99f7-bd3451ed5402',
+ day: 1,
+ monthlyDiposit: 0,
+ monthlyWithdraw: 0,
+ monthlyPartnerDiposit: 0,
+ monthlyPartnerWithdraw: 0,
+ monthlyPassiveMoney: 0,
+ monthlyPassiveComp: 0,
+ monthlyBettingBalance: 66,
+ monthlyBetMembers: 1,
},
];
diff --git a/src/app/modules/admin/report/monthly/components/list.component.html b/src/app/modules/admin/report/monthly/components/list.component.html
index d7a585b..17a7572 100644
--- a/src/app/modules/admin/report/monthly/components/list.component.html
+++ b/src/app/modules/admin/report/monthly/components/list.component.html
@@ -1,355 +1,268 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 40
- 60
- 80
- 100
-
-
-
-
- LV.1
- LV.2
- LV.3
- LV.4
-
-
-
-
- 정상
- 대기
- 탈퇴
- 휴면
- 블랙
- 정지
-
-
-
-
- 카지노제한
- 슬롯제한
-
-
-
-
- 계좌입금
-
-
-
-
- 카지노콤프
- 슬롯콤프
- 배팅콤프
- 첫충콤프
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0; else noMonthly">
-
-
-
-
-
요율
-
상부트리
-
관리
-
매장수
-
회원수
-
아이디
-
닉네임
-
예금주
-
연락처
-
정산
-
보유금
-
게임중머니
-
카지노->캐쉬
-
금일콤프
-
총입출
-
로그
-
상태
-
회원수
-
비고
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ monthly.id }}
-
-
-
-
-
- {{ monthly.nickname }}
-
-
-
- {{ monthly.accountHolder }}
-
-
-
- {{ monthly.phoneNumber }}
-
-
-
- {{ monthly.calculateType }}
-
-
-
- 캐쉬{{ monthly.ownCash }} 콤프{{ monthly.ownComp }} 쿠폰{{
- monthly.ownCoupon
- }}
-
-
-
- {{ monthly.gameMoney }}
-
-
-
-
-
-
-
-
- {{ monthly.todayComp }}P
-
-
-
- 입금{{ monthly.totalDeposit }} 출금{{
- monthly.totalWithdraw
- }}
- 차익{{ monthly.balance }}
-
-
-
- 가입{{ monthly.registDate }} 최종{{
- monthly.finalSigninDate
- }}
- IP{{ monthly.ip }}
-
-
-
- {{ monthly.state }}
-
-
-
- {{ monthly.memberCount }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
- There are no monthlys!
+
+
+
+
+
+
+
2022년6월
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0; else noMonthly">
+
+
+
+
요율
+
상부
+
+ 아이디
+
+ 닉네임
+
+ 연락처
+
+
+ 등급
+
+ 레벨
+
+
예금주
+
보유금
+
+ 게임중머니
+
+ 금일콤프
+
+
총입출
+
카지노->캐쉬
+
+
+
+
+
+
요율
+
+ {{ monthly.day }}
+
+
+ {{ monthly.day }}
+
+ {{ monthly.day }}
+
+ {{ monthly.day }}
+
+
+ {{ monthly.day }}
+
+ LV{{ monthly.day }}
+
+
+ {{ monthly.day }}
+
+
+ 캐쉬{{ monthly.day }}
+
+ 콤프{{ monthly.day }}P
+
+ 쿠폰{{ monthly.day }}
+
+
+ {{ monthly.day }}
+
+ {{ monthly.day }}P
+
+
+ 입금{{ monthly.day }}
+
+ 출금{{ monthly.day }}
+
+ 차익{{ monthly.day }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ There are no data!
+
+
+
+
-
+
diff --git a/src/app/modules/admin/report/monthly/components/list.component.ts b/src/app/modules/admin/report/monthly/components/list.component.ts
index a723a1b..38182f8 100644
--- a/src/app/modules/admin/report/monthly/components/list.component.ts
+++ b/src/app/modules/admin/report/monthly/components/list.component.ts
@@ -117,7 +117,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
if (this._sort && this._paginator) {
// Set the initial sort
this._sort.sort({
- id: 'name',
+ id: 'day',
start: 'asc',
disableClear: true,
});
diff --git a/src/app/modules/admin/report/monthly/models/monthly.ts b/src/app/modules/admin/report/monthly/models/monthly.ts
index fc883d8..6aa7814 100644
--- a/src/app/modules/admin/report/monthly/models/monthly.ts
+++ b/src/app/modules/admin/report/monthly/models/monthly.ts
@@ -1,29 +1,12 @@
export interface Monthly {
- id?: string;
- totalPartnerCount?: number;
- totalHoldingMoney?: number;
- totalComp?: number;
- total?: number;
- branchCount?: number;
- divisionCount?: number;
- officeCount?: number;
- storeCount?: number;
- memberCount?: number;
- nickname?: string;
- accountHolder?: string;
- phoneNumber?: string;
- calculateType?: string;
- ownCash?: number;
- ownComp?: number;
- ownCoupon?: number;
- gameMoney?: number;
- todayComp?: number;
- totalDeposit?: number;
- totalWithdraw?: number;
- balance?: number;
- registDate?: string;
- finalSigninDate?: string;
- ip?: string;
- state?: string;
- note?: string;
+ id: string;
+ day?: number; // 일
+ monthlyDiposit?: number; // 월별 입금액
+ monthlyWithdraw?: number; // 월별 출금액
+ monthlyPartnerDiposit?: number; // 파트너 월별 입금액
+ monthlyPartnerWithdraw?: number; // 파트너 월별 출금액
+ monthlyPassiveMoney?: number; // 월별 수동머니 금액
+ monthlyPassiveComp?: number; // 월별 수동콤프 금액
+ monthlyBettingBalance?: number; // 월별 배팅수익액
+ monthlyBetMembers?: number; // 월별 실벳인원
}