Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

This commit is contained in:
Park Byung Eun 2022-07-29 02:18:04 +00:00
commit f9c31028ca
9 changed files with 506 additions and 949 deletions

View File

@ -29,7 +29,7 @@ export class ReportDailyPartnerMockApi {
// @ DailyPartners - GET // @ DailyPartners - GET
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onGet('api/apps/report/daily-partner', 300) .onGet('api/apps/report/daily-partners', 300)
.reply(({ request }) => { .reply(({ request }) => {
// Get available queries // Get available queries
const search = request.params.get('search'); const search = request.params.get('search');

View File

@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
import { assign, cloneDeep } from 'lodash-es'; import { assign, cloneDeep } from 'lodash-es';
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
import { todayBets as todayBetsData } from './data'; import { todayBets as todayBetsData } from './data';
import { contacts } from '../../chat/data';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -34,12 +33,29 @@ export class ReportTodayBetMockApi {
.reply(({ request }) => { .reply(({ request }) => {
// Get available queries // Get available queries
const search = request.params.get('search'); 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 order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10);
// Clone the todayBets // Clone the todayBets
let todayBets: any[] | null = cloneDeep(this._todayBets); let todayBets: any[] | null = cloneDeep(this._todayBets);
// Sort the todayBets
if (sort === 'signinId' || sort === 'nickname' || sort === 'rank') {
todayBets.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
return order === 'asc'
? fieldA.localeCompare(fieldB)
: fieldB.localeCompare(fieldA);
});
} else {
todayBets.sort((a, b) =>
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
);
}
// If search exists... // If search exists...
if (search) { if (search) {
// Filter the todayBets // Filter the todayBets
@ -50,11 +66,47 @@ export class ReportTodayBetMockApi {
); );
} }
// Paginate - Start
const todayBetsLength = todayBets.length;
// Calculate pagination details
const begin = page * size;
const end = Math.min(size * (page + 1), todayBetsLength);
const lastPage = Math.max(Math.ceil(todayBetsLength / size), 1);
// Prepare the pagination object
let pagination = {};
// If the requested page number is bigger than
// the last possible page number, return null for
// todayBets but also send the last possible page so
// the app can navigate to there
if (page > lastPage) {
todayBets = null;
pagination = {
lastPage,
};
} else {
// Paginate the results by size
todayBets = todayBets.slice(begin, end);
// Prepare the pagination mock-api
pagination = {
length: todayBetsLength,
size: size,
page: page,
lastPage: lastPage,
startIndex: begin,
endIndex: end - 1,
};
}
// Return the response // Return the response
return [ return [
200, 200,
{ {
todayBets, todayBets,
pagination,
}, },
]; ];
}); });

View File

@ -2,518 +2,40 @@
export const todayBets = [ export const todayBets = [
{ {
user: { id: '8fcce528-d878-4cc8-99f7-bd3451ed5402',
id: '1', signinId: 'aa100',
signinId: 'kgon1',
type: '본사',
parentId: 0,
rank: '회원', rank: '회원',
level: '4', level: '4',
nickname: 'aa100', nickname: 'aa100',
}, memberCharge: 40100000,
bank: { memberExchange: 19000000,
users: { memberProfitLoss: 21100000,
deposit: '0', partnerCharge: 0,
withdraw: '0', partnerExchange: 0,
netProfit: 0, partnerProfitLoss: 0,
}, totalProfitLoss: 21100000,
parthners: { passiveMoney: -20002000,
deposit: '0', passiveComp: 0,
withdraw: '0', casinoBetting: 13648000,
netProfit: '0', casinoTie: 314000,
}, casinoCancel: 0,
totalNetProfit: '0', casinoAvailable: 13334000,
passiveMoney: '0', casinoWinning: 12649500,
passiveComp: '0', casinoWinLoss: 998500,
casino: { casinoCommission: 83347,
betting: '382,000', casinoBetWinCalculate: 915153,
bettingTie: '33,000', slotBetting: 1159511,
bettingCancel: '0', slotCancel: 0,
bettingValid: '351,000', slotAvailable: 1159511,
bettingWin: '357,050', slotWinning: 897768,
winLoss: '26,950', slotWinLoss: 261743,
commission: { slotCommission: 6800,
total: '7,020', slotBetWinCalculate: 254943,
partner: '5,265', powerballBetting: 0,
me: '1,755', powerballWinning: 0,
}, powerballWinLoss: 0,
betWinSettle: '19,930', powerballCommission: 0,
}, powerballBetWinCalculate: 0,
slot: { totalBetWinCalculate: 0,
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '2',
signinId: 'kgon2',
type: '대본',
parentId: 1,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '3',
signinId: 'kgon1',
type: '본사',
parentId: 2,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '4',
signinId: 'kgon1',
type: '부본',
parentId: 3,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '5',
signinId: 'kgon1',
type: '본사',
parentId: 0,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '6',
signinId: 'kgon1',
type: '본사',
parentId: 0,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '7',
signinId: 'kgon1',
type: '본사',
parentId: 0,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
},
{
user: {
id: '8',
signinId: 'kgon1',
type: '본사',
parentId: 0,
},
bank: {
users: {
deposit: '0',
withdraw: '0',
netProfit: 0,
},
parthners: {
deposit: '0',
withdraw: '0',
netProfit: '0',
},
totalNetProfit: '0',
passiveMoney: '0',
passiveComp: '0',
casino: {
betting: '382,000',
bettingTie: '33,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
slot: {
betting: '382,000',
bettingCancel: '0',
bettingValid: '351,000',
bettingWin: '357,050',
winLoss: '26,950',
commission: {
total: '7,020',
partner: '5,265',
me: '1,755',
},
betWinSettle: '19,930',
},
powerball: {
betting: '0',
bettingCancel: '0',
bettingValid: '0',
bettingWin: '0',
winLoss: '0',
commission: {
total: '0',
partner: '0',
me: '0',
},
betWinSettle: '19,930',
},
},
totalBetSettle: '119,400',
}, },
]; ];

View File

@ -88,7 +88,7 @@ export class DailyPartnerService {
.get<{ .get<{
pagination: DailyPartnerPagination; pagination: DailyPartnerPagination;
dailyPartners: DailyPartner[]; dailyPartners: DailyPartner[];
}>('api/apps/report/daily-partner/daily-partners', { }>('api/apps/report/daily-partners', {
params: { params: {
page: '' + page, page: '' + page,
size: '' + size, size: '' + size,

View File

@ -7,9 +7,7 @@
class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden" class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
> >
<!-- Title --> <!-- Title -->
<div class="text-4xl font-extrabold tracking-tight"> <div class="text-4xl font-extrabold tracking-tight">월현황</div>
CASINO 머니파악
</div>
<div class="flex flex-col flex-auto mt-2 overflow-x-auto"> <div class="flex flex-col flex-auto mt-2 overflow-x-auto">
<div> <div>
<button <button

View File

@ -1,42 +1,46 @@
<div class="flex flex-col flex-auto min-w-0"> <div
<div class="flex-auto border-t -mt-px pt-4 sm:pt-6"> class="sm:absolute sm:inset-0 flex flex-col flex-auto min-w-0 sm:overflow-hidden bg-card dark:bg-transparent"
<div class="w-full max-w-screen-xl mx-auto"> >
<div class="grid grid-cols-1 sm:grid-cols-6 gap-6 w-full min-w-0"> <!-- Header -->
<!-- Budget distribution -->
<div <div
class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden" class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-8 px-6 md:px-8 border-b"
> >
<div class="text-lg font-medium tracking-tight leading-6 truncate"> <!-- Loader -->
금일배팅자목록 <div class="absolute inset-x-0 bottom-0" *ngIf="isLoading">
<mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
</div> </div>
<div> <!-- Title -->
<!-- Section --> <div class="text-4xl font-extrabold tracking-tight">금일배팅자목록</div>
<!-- Actions -->
<div class="grid grid-cols-8 gap-6 w-full mt-8"> <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Card number --> <!-- Search -->
<div class="col-span-2 sm:col-span-1"> <button mat-icon-button (click)="__onClickSearch()">
<mat-form-field class="fuse-mat-no subscript w-full"> <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<mat-select </button>
[value]="'전체'" </div>
disableOptionCentering </div>
#roleSelect="matSelect" <!-- Search -->
<div
*ngIf="__isSearchOpened"
class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
> >
<mat-select-trigger class="text-md"> <!-- Actions -->
<span class="ml-1 font-medium">{{ <div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
roleSelect.value | titlecase <!-- SelectBox -->
}}</span> <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
</mat-select-trigger> <mat-select placeholder="전체">
<ng-container *ngFor="let role of roles1"> <mat-option value="">전체</mat-option>
<mat-option <mat-option value="">파워볼</mat-option>
class="h-auto py-4 leading-none" <mat-option value="">카지노</mat-option>
[value]="role.value" <mat-option value="">슬롯</mat-option>
> </mat-select>
<div class="font-medium">{{ role.label }}</div> </mat-form-field>
</mat-option> <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
</ng-container> <mat-select placeholder="회원아이디">
<mat-option value="">회원아이디</mat-option>
<mat-option value="">닉네임</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div>
<!-- Card inception --> <!-- Card inception -->
<div class="col-span-2 sm:col-span-1"> <div class="col-span-2 sm:col-span-1">
<mat-form-field <mat-form-field
@ -73,253 +77,227 @@
<mat-datepicker #picker2></mat-datepicker> <mat-datepicker #picker2></mat-datepicker>
</mat-form-field> </mat-form-field>
</div> </div>
<!-- Card number --> <!-- Search -->
<div class="col-span-2 sm:col-span-1"> <mat-form-field
<mat-form-field class="fuse-mat-no subscript w-full"> fxFlex
<mat-select class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
[value]="'회원아이디'"
disableOptionCentering
#roleSelect="matSelect"
> >
<mat-select-trigger class="text-md"> <mat-icon
<span class="ml-1 font-medium">{{ class="icon-size-5"
roleSelect.value | titlecase matPrefix
}}</span> [svgIcon]="'heroicons_solid:search'"
</mat-select-trigger> ></mat-icon>
<ng-container *ngFor="let role of roles2"> <input
<mat-option matInput
class="h-auto py-4 leading-none" [formControl]="searchInputControl"
[value]="role.value" [autocomplete]="'off'"
> [placeholder]="'Search user'"
<div class="font-medium">{{ role.label }}</div> />
</mat-option>
</ng-container>
</mat-select>
</mat-form-field> </mat-form-field>
</div> <!-- Add user button -->
</div> <button
</div> mat-flat-button
<div class="flex flex-col flex-auto mt-2 overflow-x-auto"> [color]="'primary'"
<form [formGroup]="todayBetForm" autocomplete="off"> fxFlex
<table (click)="__createProduct()"
class="min-w-240 overflow-y-visible"
mat-table
[dataSource]="todayBetDataSource"
> >
<!-- 등급 --> <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<ng-container matColumnDef="rank"> <span class="ml-2 mr-1">Search</span>
<th mat-header-cell *matHeaderCellDef>등급</th> </button>
<td mat-cell *matCellDef="let info"> <div>
<span class="font-medium text-right"> <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
{{ info?.user.rank }} 검색하기
</span> </button>
</td> </div>
</ng-container> <div>
<!-- 레벨 --> <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
<ng-container matColumnDef="level"> 어제
<th mat-header-cell *matHeaderCellDef>레벨</th> </button>
<td mat-cell *matCellDef="let info"> </div>
<span class="font-medium text-right"> <div>
{{ info?.user.level }} <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
</span> 오늘
</td> </button>
</ng-container> </div>
<!-- 아이디 --> <div>
<ng-container matColumnDef="signinId"> <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
<th mat-header-cell *matHeaderCellDef>아이디</th> 7일
<td mat-cell *matCellDef="let info"> </button>
<span class="font-medium text-right"> </div>
{{ info?.user.signinId }} <div>
</span> <button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
</td> 엑셀저장
</ng-container> </button>
<!-- 닉네임 --> </div>
<ng-container matColumnDef="nickname"> </div>
<th mat-header-cell *matHeaderCellDef>닉네임</th> </div>
<td mat-cell *matCellDef="let info">
<span class="font-medium text-right">
{{ info?.user.nickname }}
</span>
</td>
</ng-container>
<!-- 회원입출 -->
<ng-container matColumnDef="depositDetails">
<th mat-header-cell *matHeaderCellDef>회원입출</th>
<td mat-cell *matCellDef="let info">
<span>{{ info?.bank.users.deposit }}</span>
<span>{{ info?.bank.users.withdraw }}</span>
<span>{{ info?.bank.users.netProfit }}</span>
</td>
</ng-container>
<!-- 파트너입출 -->
<ng-container matColumnDef="depositPartnerDetails">
<th mat-header-cell *matHeaderCellDef>파트너입출</th>
<td mat-cell *matCellDef="let info">
<span>{{ info?.bank.parthners.deposit }}</span>
<span>{{ info?.bank.parthners.withdraw }}</span>
<span>{{ info?.bank.parthners.netProfit }}</span>
</td>
</ng-container>
<!-- 총손익 -->
<ng-container matColumnDef="totalProfit">
<th mat-header-cell *matHeaderCellDef>총손익</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.totalNetProfit }}
</td>
</ng-container>
<!-- 수동머니 -->
<ng-container matColumnDef="passiveMoney">
<th mat-header-cell *matHeaderCellDef>수동머니</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.passiveMoney }}
</td>
</ng-container>
<!-- 수동콤프 -->
<ng-container matColumnDef="passiveComp">
<th mat-header-cell *matHeaderCellDef>수동콤프</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.passiveComp }}
</td>
</ng-container>
<!-- 배팅 -->
<ng-container matColumnDef="casinoBetDetails">
<th mat-header-cell *matHeaderCellDef>배팅</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.casino.betting }}
</td>
</ng-container>
<!-- 당첨 -->
<ng-container matColumnDef="casinoWinningDetails">
<th mat-header-cell *matHeaderCellDef>당첨</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.casino.bettingWin }}
</td>
</ng-container>
<!-- 윈로스(A) -->
<ng-container matColumnDef="casinoWinLoss">
<th mat-header-cell *matHeaderCellDef>윈로스(A)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.casino.winLoss }}
</td>
</ng-container>
<!-- 수수료(B) -->
<ng-container matColumnDef="casinoCommission">
<th mat-header-cell *matHeaderCellDef>수수료(B)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.casino.commission.total }}
</td>
</ng-container>
<!-- 벳윈정산(A-B) -->
<ng-container matColumnDef="casinoSettle">
<th mat-header-cell *matHeaderCellDef>벳윈정산(A-B)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.casino.betWinSettle }}
</td>
</ng-container>
<!-- 배팅 --> <!-- Main -->
<ng-container matColumnDef="slotBetDetails"> <div class="flex flex-auto overflow-hidden">
<th mat-header-cell *matHeaderCellDef>배팅</th> <!-- Products list -->
<td mat-cell *matCellDef="let info"> <div
{{ info?.bank.slot.betting }} class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
</td>
</ng-container>
<!-- 당첨 -->
<ng-container matColumnDef="slotWinningDetails">
<th mat-header-cell *matHeaderCellDef>당첨</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.slot.bettingWin }}
</td>
</ng-container>
<!-- 윈로스(D) -->
<ng-container matColumnDef="slotWinLoss">
<th mat-header-cell *matHeaderCellDef>윈로스(D)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.slot.winLoss }}
</td>
</ng-container>
<!-- 수수료(E) -->
<ng-container matColumnDef="slotCommission">
<th mat-header-cell *matHeaderCellDef>수수료(E)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.slot.commission.total }}
</td>
</ng-container>
<!-- 벳윈정산(A-B) -->
<ng-container matColumnDef="slotSettle">
<th mat-header-cell *matHeaderCellDef>벳윈정산(A-B)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.slot.commission.betWinSettle }}
</td>
</ng-container>
<!-- 배팅 -->
<ng-container matColumnDef="powerballBetDetails">
<th mat-header-cell *matHeaderCellDef>배팅</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.powerball.betting }}
</td>
</ng-container>
<!-- 당첨 -->
<ng-container matColumnDef="powerballWinningDetails">
<th mat-header-cell *matHeaderCellDef>당첨</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.powerball.bettingWin }}
</td>
</ng-container>
<!-- 윈로스(G) -->
<ng-container matColumnDef="powerballWinLoss">
<th mat-header-cell *matHeaderCellDef>윈로스(G)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.powerball.winLoss }}
</td>
</ng-container>
<!-- 수수료(G) -->
<ng-container matColumnDef="powerballCommission">
<th mat-header-cell *matHeaderCellDef>수수료(H)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.powerball.commission.total }}
</td>
</ng-container>
<!-- 벳윈정산(G-H) -->
<ng-container matColumnDef="powerballSettle">
<th mat-header-cell *matHeaderCellDef>벳윈정산(G-H)</th>
<td mat-cell *matCellDef="let info">
{{ info?.bank.powerball.commission.betWinSettle }}
</td>
</ng-container>
<!-- 총벳윈정산 -->
<ng-container matColumnDef="totalBetWinSettle">
<th mat-header-cell *matHeaderCellDef>총벳윈정산</th>
<td mat-cell *matCellDef="let info">
{{ info?.totalBetSettle }}
</td>
</ng-container>
<!-- Header row second group -->
<ng-container matColumnDef="header-row-info-group">
<th
mat-header-cell
*matHeaderCellDef
[attr.colspan]="2"
[attr.rowspan]="2"
> >
Second group <ng-container *ngIf="todayBets$ | async as todayBets">
</th> <ng-container *ngIf="todayBets.length > 0; else noTodayBet">
<div class="grid">
<!-- Header -->
<div
class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
>
<div>
아이디
<hr style="margin: 7px 0px" />
닉네임
</div>
<div>
등급
<hr style="margin: 7px 0px" />
레벨
</div>
<div>회원입출금</div>
<div>파트너입출금</div>
<div class="hidden sm:block">전체손익</div>
<div class="hidden md:block">수동머니</div>
<div class="hidden md:block">수동콤프</div>
<div class="hidden md:block">카-배팅</div>
<div class="hidden lg:block">카-당첨</div>
<div class="hidden lg:block">카-윈로스(A)</div>
<div class="hidden lg:block">카-수수료(B)</div>
<div class="hidden lg:block">카-벳윈정산(A-B)</div>
<div class="hidden md:block">슬-배팅</div>
<div class="hidden lg:block">슬-당첨</div>
<div class="hidden lg:block">슬-윈로스(D)</div>
<div class="hidden lg:block">슬-수수료(E)</div>
<div class="hidden lg:block">슬-벳윈정산(D-E)</div>
<div class="hidden md:block">파-배팅</div>
<div class="hidden lg:block">파-당첨</div>
<div class="hidden lg:block">파-윈로스(H)</div>
<div class="hidden lg:block">파-수수료(I)</div>
<div class="hidden lg:block">파-벳윈정산(H-I)</div>
<div class="hidden lg:block">총벳윈정산</div>
</div>
<!-- Rows -->
<ng-container *ngIf="todayBets$ | async as todayBets">
<ng-container
*ngFor="let todayBet of todayBets; trackBy: __trackByFn"
>
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<div>
{{ todayBet.signinId }}
<hr style="margin: 7px 0px" />
{{ todayBet.nickname }}
</div>
<div>
{{ todayBet.rank }}
<hr style="margin: 7px 0px" />
{{ todayBet.level }}
</div>
<div>
충전{{ todayBet.memberCharge }}
<hr style="margin: 7px 0px" />
환전{{ todayBet.memberExchange }}
<hr style="margin: 7px 0px" />
손익{{ todayBet.memberProfitLoss }}
</div>
<div>
충전{{ todayBet.partnerCharge }}
<hr style="margin: 7px 0px" />
환전{{ todayBet.partnerExchange }}
<hr style="margin: 7px 0px" />
손익{{ todayBet.partnerProfitLoss }}
</div>
<div class="hidden sm:block">
{{ todayBet.totalProfitLoss }}
</div>
<div class="hidden md:block">{{ todayBet.passiveMoney }}</div>
<div class="hidden md:block">
{{ todayBet.passiveComp }}
</div>
<div class="hidden md:block">
배팅{{ todayBet.casinoBetting }}
<hr style="margin: 7px 0px" />
타이{{ todayBet.casinoTie }}
<hr style="margin: 7px 0px" />
취소{{ todayBet.casinoCancel }}
<hr style="margin: 7px 0px" />
유효{{ todayBet.casinoAvailable }}
</div>
<div class="hidden lg:block">
{{ todayBet.casinoWinning }}
</div>
<div class="hidden lg:block">
{{ todayBet.casinoWinLoss }}
</div>
<div class="hidden lg:block">
{{ todayBet.casinoCommission }}
</div>
<div class="hidden lg:block">
{{ todayBet.casinoBetWinCalculate }}
</div>
<div class="hidden md:block">
배팅{{ todayBet.slotBetting }}
<hr style="margin: 7px 0px" />
취소{{ todayBet.slotCancel }}
<hr style="margin: 7px 0px" />
유효{{ todayBet.slotAvailable }}
</div>
<div class="hidden lg:block">
{{ todayBet.slotWinning }}
</div>
<div class="hidden lg:block">
{{ todayBet.slotWinLoss }}
</div>
<div class="hidden lg:block">
{{ todayBet.slotCommission }}
</div>
<div class="hidden lg:block">
{{ todayBet.slotBetWinCalculate }}
</div>
<div class="hidden md:block">
배팅{{ todayBet.powerballBetting }}
</div>
<div class="hidden lg:block">
{{ todayBet.powerballWinning }}
</div>
<div class="hidden lg:block">
{{ todayBet.powerballWinLoss }}
</div>
<div class="hidden lg:block">
{{ todayBet.powerballCommission }}
</div>
<div class="hidden lg:block">
{{ todayBet.powerballBetWinCalculate }}
</div>
<div class="hidden lg:block">
{{ todayBet.totalBetWinCalculate }}
</div>
</div>
</ng-container>
</ng-container>
</div>
<mat-paginator
class="sm:absolute sm:inset-x-0 sm:bottom-0 border-b sm:border-t sm:border-b-0 z-10 bg-gray-50 dark:bg-transparent"
[ngClass]="{ 'pointer-events-none': isLoading }"
[length]="pagination?.length"
[pageIndex]="pagination?.page"
[pageSize]="pagination?.size"
[pageSizeOptions]="[5, 10, 25, 100]"
[showFirstLastButtons]="true"
></mat-paginator>
</ng-container>
</ng-container> </ng-container>
<!-- <tr mat-header-row *matHeaderRowDef="['betInfo']"></tr> --> <ng-template #noTodayBet>
<tr mat-header-row *matHeaderRowDef="todayBetTableColumns"></tr> <div
<tr class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
mat-row >
*matRowDef="let row; columns: todayBetTableColumns" There are no data!
></tr>
</table>
</form>
</div>
</div>
</div> </div>
</ng-template>
</div> </div>
</div> </div>
</div> </div>

View File

@ -34,7 +34,6 @@ import { TodayBet } from '../models/today-bet';
import { TodayBetPagination } from '../models/today-bet-pagination'; import { TodayBetPagination } from '../models/today-bet-pagination';
import { TodayBetService } from '../services/today-bet.service'; import { TodayBetService } from '../services/today-bet.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { MatTableDataSource } from '@angular/material/table';
@Component({ @Component({
selector: 'today-bet-list', selector: 'today-bet-list',
@ -43,18 +42,22 @@ import { MatTableDataSource } from '@angular/material/table';
/* language=SCSS */ /* language=SCSS */
` `
.inventory-grid { .inventory-grid {
grid-template-columns: 60px auto 40px; /* 아이디 등급 회원 */
grid-template-columns: 40px auto 30px;
@screen sm { @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 { @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 { @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;
} }
} }
`, `,
@ -64,48 +67,20 @@ import { MatTableDataSource } from '@angular/material/table';
animations: fuseAnimations, animations: fuseAnimations,
}) })
export class ListComponent implements OnInit, AfterViewInit, OnDestroy { export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
@ViewChild(MatSort) private _sort!: MatSort;
todayBets$!: Observable<TodayBet[] | undefined>; todayBets$!: Observable<TodayBet[] | undefined>;
users$!: Observable<User[] | undefined>; users$!: Observable<User[] | undefined>;
__isSearchOpened = false;
isLoading = false; isLoading = false;
searchInputControl = new FormControl(); searchInputControl = new FormControl();
selectedTodayBet?: TodayBet; selectedTodayBet?: TodayBet;
pagination?: TodayBetPagination;
todayBetForm!: FormGroup;
todayBetDataSource: MatTableDataSource<any> = new MatTableDataSource();
todayBetTableColumns: string[] = [
'rank',
'level',
'signinId',
'nickname',
'depositDetails',
'depositPartnerDetails',
'totalProfit',
'passiveMoney',
'passiveComp',
'casinoBetDetails',
'casinoWinningDetails',
'casinoWinLoss',
'casinoCommission',
'casinoSettle',
'slotBetDetails',
'slotWinningDetails',
'slotWinLoss',
'slotCommission',
'slotSettle',
'powerballBetDetails',
'powerballWinningDetails',
'powerballWinLoss',
'powerballCommission',
'powerballSettle',
'totalBetWinSettle',
];
private _unsubscribeAll: Subject<any> = new Subject<any>(); private _unsubscribeAll: Subject<any> = new Subject<any>();
roles1: any[];
roles2: any[];
/** /**
* Constructor * Constructor
*/ */
@ -115,36 +90,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
private _formBuilder: FormBuilder, private _formBuilder: FormBuilder,
private _todayBetService: TodayBetService, private _todayBetService: TodayBetService,
private router: Router private router: Router
) { ) {}
this.roles1 = [
{
label: '전체',
value: '전체',
},
{
label: '파워볼',
value: '파워볼',
},
{
label: '카지노',
value: '카지노',
},
{
label: '슬롯',
value: '슬롯',
},
];
this.roles2 = [
{
label: '회원아이디',
value: '회원아이디',
},
{
label: '닉네임',
value: '닉네임',
},
];
}
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks // @ Lifecycle hooks
@ -154,19 +100,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
* On init * On init
*/ */
ngOnInit(): void { ngOnInit(): void {
this.todayBetForm = this._formBuilder.group({
bankName: [''],
accountNumber: [''],
accountHolder: [''],
});
// Get the pagination // Get the pagination
this._todayBetService this._todayBetService.pagination$
.getTodayBets()
.pipe(takeUntil(this._unsubscribeAll)) .pipe(takeUntil(this._unsubscribeAll))
.subscribe((todayBets: any) => { .subscribe((pagination: TodayBetPagination | undefined) => {
// Update the pagination
this.pagination = pagination;
// Mark for check // Mark for check
this.todayBetDataSource = todayBets.todayBets;
console.log(todayBets);
this._changeDetectorRef.markForCheck(); this._changeDetectorRef.markForCheck();
}); });
@ -177,7 +118,45 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
/** /**
* After view init * After view init
*/ */
ngAfterViewInit(): void {} ngAfterViewInit(): void {
if (this._sort && this._paginator) {
// Set the initial sort
this._sort.sort({
id: 'signinId',
start: 'asc',
disableClear: true,
});
// Mark for check
this._changeDetectorRef.markForCheck();
// If the todayBet changes the sort order...
this._sort.sortChange
.pipe(takeUntil(this._unsubscribeAll))
.subscribe(() => {
// Reset back to the first page
this._paginator.pageIndex = 0;
});
// Get products if sort or page changes
merge(this._sort.sortChange, this._paginator.page)
.pipe(
switchMap(() => {
this.isLoading = true;
return this._todayBetService.getTodayBets(
this._paginator.pageIndex,
this._paginator.pageSize,
this._sort.active,
this._sort.direction
);
}),
map(() => {
this.isLoading = false;
})
)
.subscribe();
}
}
/** /**
* On destroy * On destroy
@ -212,6 +191,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/ */
__toggleDetails(productId: string): void {} __toggleDetails(productId: string): void {}
/**
* toggle the search
* Used in 'bar'
*/
__onClickSearch(): void {
this.__isSearchOpened = !this.__isSearchOpened;
}
/** /**
* Track by function for ngFor loops * Track by function for ngFor loops
* *
@ -221,7 +208,4 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
__trackByFn(index: number, item: any): any { __trackByFn(index: number, item: any): any {
return item.id || index; return item.id || index;
} }
__testData(info: any): any {
console.log(info);
}
} }

View File

@ -1,29 +1,39 @@
import { StringNullableChain } from 'lodash';
export interface TodayBet { export interface TodayBet {
id?: string; id: string;
totalPartnerCount?: number; signinId?: string;
totalHoldingMoney?: number; rank?: string;
totalComp?: number; level?: string;
total?: number;
branchCount?: number;
divisionCount?: number;
officeCount?: number;
storeCount?: number;
memberCount?: number;
nickname?: string; nickname?: string;
accountHolder?: string; memberCharge?: number; // 회원충전
phoneNumber?: string; memberExchange?: number; // 회원환전
calculateType?: string; memberProfitLoss?: number; // 회원손익
ownCash?: number; partnerCharge?: number; // 파트너충전
ownComp?: number; partnerExchange?: number; // 파트너환전
ownCoupon?: number; partnerProfitLoss?: number; // 파트너손익
gameMoney?: number; totalProfitLoss?: number; // 전체손익
todayComp?: number; passiveMoney?: number;
totalDeposit?: number; passiveComp?: number;
totalWithdraw?: number; casinoBetting?: number; // 카지노배팅
balance?: number; casinoTie?: number; // 카지노타이
registDate?: string; casinoCancel?: number; // 카지노취소
finalSigninDate?: string; casinoAvailable?: number; // 카지노유효
ip?: string; casinoWinning?: number; // 카지노당첨
state?: string; casinoWinLoss?: number; // 카지노윈로스(A)
note?: string; 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; // 총벳윈정산
} }

View File

@ -70,19 +70,32 @@ export class TodayBetService {
* @param order * @param order
* @param search * @param search
*/ */
getTodayBets(search: string = ''): Observable<{ getTodayBets(
page: number = 0,
size: number = 10,
sort: string = 'name',
order: 'asc' | 'desc' | '' = 'asc',
search: string = ''
): Observable<{
pagination: TodayBetPagination;
todayBets: TodayBet[]; todayBets: TodayBet[];
}> { }> {
return this._httpClient return this._httpClient
.get<{ .get<{
pagination: TodayBetPagination;
todayBets: TodayBet[]; todayBets: TodayBet[];
}>('api/apps/report/today-bet/today-bets', { }>('api/apps/report/today-bet/today-bets', {
params: { params: {
page: '' + page,
size: '' + size,
sort,
order,
search, search,
}, },
}) })
.pipe( .pipe(
tap((response) => { tap((response) => {
this.__pagination.next(response.pagination);
this.__todayBets.next(response.todayBets); this.__todayBets.next(response.todayBets);
}) })
); );