diff --git a/src/app/mock-api/apps/report/daily/api.ts b/src/app/mock-api/apps/report/daily/api.ts
index 1809429..928ce02 100644
--- a/src/app/mock-api/apps/report/daily/api.ts
+++ b/src/app/mock-api/apps/report/daily/api.ts
@@ -33,7 +33,7 @@ export class ReportDailyMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'lastDayHoldingMoney';
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 ReportDailyMockApi {
let dailys: any[] | null = cloneDeep(this._dailys);
// Sort the dailys
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (
+ sort === 'lastDayHoldingMoney' ||
+ sort === 'memberCharge' ||
+ sort === 'memberExchange'
+ ) {
dailys.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/report/daily/data.ts b/src/app/mock-api/apps/report/daily/data.ts
index 7a16563..c0bc71b 100644
--- a/src/app/mock-api/apps/report/daily/data.ts
+++ b/src/app/mock-api/apps/report/daily/data.ts
@@ -2,32 +2,38 @@
export const dailys = [
{
- 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',
+ processDate: '2022-06-20',
+ lastDayHoldingMoney: 22846133,
+ memberCharge: 0,
+ memberExchange: 0,
+ memberProfitLoss: 0,
+ partnerCharge: 0,
+ partnerExchange: 0,
+ partnerProfitLoss: 0,
+ totalProfitLoss: 0,
+ passiveMoney: 0,
+ passiveComp: 0,
+ casinoBetting: 0,
+ casinoTie: 0,
+ casinoCancel: 0,
+ casinoAvailable: 0,
+ casinoWinning: 0,
+ casinoWinLoss: 0,
+ casinoCommission: 0,
+ casinoBetWinCalculate: 0,
+ slotBetting: 160000,
+ slotCancel: 0,
+ slotAvailable: 160000,
+ slotWinning: 90280,
+ slotWinLoss: 69720,
+ slotCommission: 8000,
+ slotBetWinCalculate: 61720,
+ powerballBetting: 0,
+ powerballWinning: 0,
+ powerballWinLoss: 0,
+ powerballCommission: 0,
+ powerballBetWinCalculate: 0,
+ totalBetWinCalculate: 61720,
},
];
diff --git a/src/app/modules/admin/member/current-user/components/list.component.html b/src/app/modules/admin/member/current-user/components/list.component.html
index 212d28c..2b25670 100644
--- a/src/app/modules/admin/member/current-user/components/list.component.html
+++ b/src/app/modules/admin/member/current-user/components/list.component.html
@@ -14,165 +14,164 @@
현재접속자&쪽지전송
-
-
-
-
-
-
-
- 0; else noCurrentUser">
-
-
-
-
번호
-
상부
-
- 아이디
-
- 닉네임
-
-
- 등급
-
- 레벨
-
-
현재위치
-
보유금
-
게임중머니
-
사이트
-
쪽지보내기
-
배팅내역
-
로그아웃
-
-
-
-
-
-
{{ currentUser.index }}
-
{{ currentUser.highRank }}
-
-
- {{ currentUser.signinId }}
-
-
- {{ currentUser.nickname }}
-
- {{ currentUser.currentLocation }}
-
-
- {{ currentUser.rank }}
-
- {{ currentUser.level }}
-
-
{{ currentUser.currentLocation }}
-
- {{ currentUser.ownCash }}
-
- {{ currentUser.ownComp }}
-
-
- {{ currentUser.gameMoney }}
-
-
- {{ currentUser.siteAddress }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- There are no data!
-
-
-
-
-
+
+
+
-
- 현재 접속자 & 전체회원 쪽지보내기
-
-
-
-
-
-
- 제목
-
-
+
+ 0; else noCurrentUser">
+
+
+
+
번호
+
상부
+
+ 아이디
+
+ 닉네임
+
+
+ 등급
+
+ 레벨
+
+
현재위치
+
보유금
+
게임중머니
+
사이트
+
쪽지보내기
+
배팅내역
+
로그아웃
-
-
- 글쓴이
-
-
-
-
-
- 내용
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
{{ currentUser.index }}
+
{{ currentUser.highRank }}
+
+
+ {{ currentUser.signinId }}
+
+
+ {{ currentUser.nickname }}
+
+ {{ currentUser.currentLocation }}
+
+
+ {{ currentUser.rank }}
+
+ {{ currentUser.level }}
+
+
{{ currentUser.currentLocation }}
+
+ {{ currentUser.ownCash }}
+
+ {{ currentUser.ownComp }}
+
+
+ {{ currentUser.gameMoney }}
+
+
+ {{ currentUser.siteAddress }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ There are no data!
+
+
+
+
+
+
+
+ 현재 접속자 & 전체회원 쪽지보내기
+
+
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 567a713..1b2ff2f 100644
--- a/src/app/modules/admin/report/daily/components/list.component.html
+++ b/src/app/modules/admin/report/daily/components/list.component.html
@@ -13,110 +13,32 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
- 40
- 60
- 80
- 100
+
+
+ 전체
+ 파워볼
+ 카지노
+ 슬롯
-
-
- LV.1
- LV.2
- LV.3
- LV.4
-
-
-
-
- 정상
- 대기
- 탈퇴
- 휴면
- 블랙
- 정지
-
-
-
-
- 카지노제한
- 슬롯제한
-
-
-
-
- 계좌입금
-
-
-
-
- 카지노콤프
- 슬롯콤프
- 배팅콤프
- 첫충콤프
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -157,29 +102,30 @@
-
-
요율
-
상부트리
-
관리
-
매장수
-
회원수
-
아이디
-
닉네임
-
예금주
-
연락처
-
정산
-
보유금
-
게임중머니
-
카지노->캐쉬
-
금일콤프
-
총입출
-
로그
-
상태
-
회원수
-
비고
+
처리날짜
+
이전일보유금
+
회원입출금
+
파트너입출금
+
전체손익
+
수동머니
+
수동콤프
+
카-배팅
+
카-당첨
+
카-윈로스(A)
+
카-수수료(B)
+
카-벳윈정산(A-B)
+
슬-배팅
+
슬-당첨
+
슬-윈로스(D)
+
슬-수수료(E)
+
슬-벳윈정산(D-E)
+
파-배팅
+
파-당첨
+
파-윈로스(H)
+
파-수수료(I)
+
파-벳윈정산(H-I)
+
총벳윈정산
@@ -187,142 +133,88 @@
-
-
+
{{ daily.processDate }}
+
+ {{ daily.lastDayHoldingMoney }}
-
-
-
-
-
-
-
+
+ 충전{{ daily.memberCharge }}
+
+ 환전{{ daily.memberExchange }}
+
+ 손익{{ daily.memberProfitLoss }}
-
-
-
-
-
-
+
+ 충전{{ daily.partnerCharge }}
+
+ 환전{{ daily.partnerExchange }}
+
+ 손익{{ daily.partnerProfitLoss }}
-
-
-
+
+ {{ daily.totalProfitLoss }}
-
-
-
-
- {{ daily.id }}
-
-
-
-
-
- {{ daily.nickname }}
+
{{ daily.passiveMoney }}
+
+ {{ daily.passiveComp }}
-
-
- {{ daily.accountHolder }}
+
+ 배팅{{ daily.casinoBetting }}
+
+ 타이{{ daily.casinoTie }}
+
+ 취소{{ daily.casinoCancel }}
+
+ 유효{{ daily.casinoAvailable }}
-
-
- {{ daily.phoneNumber }}
+
+ {{ daily.casinoWinning }}
-
-
- {{ daily.calculateType }}
+
+ {{ daily.casinoWinLoss }}
-
-
- 캐쉬{{ daily.ownCash }} 콤프{{ daily.ownComp }} 쿠폰{{
- daily.ownCoupon
- }}
+
+ {{ daily.casinoCommission }}
-
-
- {{ daily.gameMoney }}
+
+ {{ daily.casinoBetWinCalculate }}
-
-
-
-
+
+ 배팅{{ daily.slotBetting }}
+
+ 취소{{ daily.slotCancel }}
+
+ 유효{{ daily.slotAvailable }}
-
-
- {{ daily.todayComp }}P
+
+ {{ daily.slotWinning }}
-
-
- 입금{{ daily.totalDeposit }} 출금{{
- daily.totalWithdraw
- }}
- 차익{{ daily.balance }}
+
+ {{ daily.slotWinLoss }}
-
-
- 가입{{ daily.registDate }} 최종{{
- daily.finalSigninDate
- }}
- IP{{ daily.ip }}
+
+ {{ daily.slotCommission }}
-
-
- {{ daily.state }}
+
+ {{ daily.slotBetWinCalculate }}
-
-
- {{ daily.memberCount }}
+
+ 배팅{{ daily.powerballBetting }}
-
-
-
+
+ {{ daily.powerballWinning }}
+
+
+ {{ daily.powerballWinLoss }}
+
+
+ {{ daily.powerballCommission }}
+
+
+ {{ daily.powerballBetWinCalculate }}
+
+
+ {{ daily.totalBetWinCalculate }}
@@ -345,7 +237,7 @@
- There are no dailys!
+ There are no data!
diff --git a/src/app/modules/admin/report/daily/components/list.component.ts b/src/app/modules/admin/report/daily/components/list.component.ts
index df1a968..0cbc9a7 100644
--- a/src/app/modules/admin/report/daily/components/list.component.ts
+++ b/src/app/modules/admin/report/daily/components/list.component.ts
@@ -42,18 +42,22 @@ import { Router } from '@angular/router';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* 날짜 보유 회원 */
+ grid-template-columns: 40px auto 30px;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ /* 날짜 보유 회원 파트너 손익 머니 콤프 카배팅 */
+ grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ /* 날짜 보유 회원 파트너 손익 머니 콤프 카배팅 카당첨 */
+ grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ /* 날짜 보유 회원 파트너 손익 머니 콤프 카배팅 카당첨 카윈로스 카수수료 카정산 슬배팅 슬당첨 슬윈로스 슬수수료 슬정산 파배팅 파당첨 파윈로스 파수수료 파정산 총정산 */
+ grid-template-columns: 40px auto 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px 30px;
}
}
`,
@@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
dailys$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedDaily?: Daily;
@@ -117,7 +122,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
if (this._sort && this._paginator) {
// Set the initial sort
this._sort.sort({
- id: 'name',
+ id: 'lastDayHoldingMoney',
start: 'asc',
disableClear: true,
});
@@ -186,6 +191,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__toggleDetails(productId: string): void {}
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
+
/**
* Track by function for ngFor loops
*
diff --git a/src/app/modules/admin/report/daily/models/daily.ts b/src/app/modules/admin/report/daily/models/daily.ts
index 8cc0bc2..5ca1e91 100644
--- a/src/app/modules/admin/report/daily/models/daily.ts
+++ b/src/app/modules/admin/report/daily/models/daily.ts
@@ -1,29 +1,35 @@
export interface Daily {
- 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;
+ processDate?: Date; // 처리날짜
+ lastDayHoldingMoney?: number; // 이전일보유금
+ memberCharge?: number; // 회원충전
+ memberExchange?: number; // 회원환전
+ memberProfitLoss?: number; // 회원손익
+ partnerCharge?: number; // 파트너충전
+ partnerExchange?: number; // 파트너환전
+ partnerProfitLoss?: number; // 파트너손익
+ totalProfitLoss?: number; // 전체손익
+ passiveMoney?: number;
+ passiveComp?: number;
+ casinoBetting?: number; // 카지노배팅
+ casinoTie?: number; // 카지노타이
+ casinoCancel?: number; // 카지노취소
+ casinoAvailable?: number; // 카지노유효
+ casinoWinning?: number; // 카지노당첨
+ casinoWinLoss?: number; // 카지노윈로스(A)
+ casinoCommission?: number; // 카지노수수료(B)
+ casinoBetWinCalculate?: number; // 카지노벳윈정산 (A-B)
+ slotBetting?: number; // 슬롯배팅
+ slotCancel?: number; // 슬롯취소
+ slotAvailable?: number; // 슬롯유효
+ slotWinning?: number; // 슬롯당첨
+ slotWinLoss?: number; // 슬롯윈로스(D)
+ slotCommission?: number; // 슬롯수수료(E)
+ slotBetWinCalculate?: number; // 슬롯벳윈정산(D-E)
+ powerballBetting?: number; // 파워볼배팅
+ powerballWinning?: number; // 파워볼당첨
+ powerballWinLoss?: number; // 파워볼윈로스(H)
+ powerballCommission?: number; // 파워볼수수료(I)
+ powerballBetWinCalculate?: number; // 파워볼벳윈정산(H-I)
+ totalBetWinCalculate?: number; // 총벳윈정산
}