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-26 07:06:05 +00:00
commit 5ad7b6ed80
7 changed files with 420 additions and 465 deletions

View File

@ -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();

View File

@ -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,
},
];

View File

@ -14,10 +14,8 @@
현재접속자&쪽지전송
</div>
</div>
</div>
<!-- Main -->
<div class="flex flex-auto overflow-hidden">
<!-- Main -->
<div class="flex flex-auto overflow-hidden">
<!-- Products list -->
<div
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
@ -176,4 +174,5 @@
</div>
</div>
</div>
</div>
</div>

View File

@ -17,4 +17,39 @@ export const partnerRoutes: Route[] = [
Partners: PartnersResolver,
},
},
{
path: 'main-office',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
},
},
{
path: 'branch',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
},
},
{
path: 'division',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
},
},
{
path: 'office',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
},
},
{
path: 'store',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
},
},
];

View File

@ -13,110 +13,32 @@
<div class="text-4xl font-extrabold tracking-tight">일일현황</div>
<!-- Actions -->
<div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Memo -->
<!-- <mat-form-field>
<ng-container *ngIf="dailys$ | async as dailys">
<ng-container
*ngFor="let daily of dailys; trackBy: __trackByFn"
>
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<fieldset>
총 파트너수:{{ daily.totalPartnerCount }} 총 보유머니:{{
daily.totalHoldingMoney
}}
총 콤프:{{ daily.totalComp }} 총 합계:{{
daily.total
}}
</fieldset>
<!-- Search -->
<button mat-icon-button (click)="__onClickSearch()">
<mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
</button>
</div>
</ng-container>
</ng-container>
</mat-form-field> -->
</div>
<!-- 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"
>
<!-- Actions -->
<div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
<!-- SelectBox -->
<mat-form-field>
<mat-select placeholder="리스트수">
<mat-option value="40">40</mat-option>
<mat-option value="60">60</mat-option>
<mat-option value="80">80</mat-option>
<mat-option value="100">100</mat-option>
<mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
<mat-select placeholder="전체">
<mat-option value="">전체</mat-option>
<mat-option value="">파워볼</mat-option>
<mat-option value="">카지노</mat-option>
<mat-option value="">슬롯</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="레벨">
<mat-option value="level1">LV.1</mat-option>
<mat-option value="level2">LV.2</mat-option>
<mat-option value="level3">LV.3</mat-option>
<mat-option value="level4">LV.4</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="상태">
<mat-option value="">정상</mat-option>
<mat-option value="">대기</mat-option>
<mat-option value="">탈퇴</mat-option>
<mat-option value="">휴면</mat-option>
<mat-option value="">블랙</mat-option>
<mat-option value="">정지</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="제한">
<mat-option value="">카지노제한</mat-option>
<mat-option value="">슬롯제한</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="입금">
<mat-option value="">계좌입금</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="내용">
<mat-option value="">카지노콤프</mat-option>
<mat-option value="">슬롯콤프</mat-option>
<mat-option value="">배팅콤프</mat-option>
<mat-option value="">첫충콤프</mat-option>
</mat-select>
</mat-form-field>
<!-- <mat-form-field>
<mat-select placeholder="입금">
<mat-option value="">계좌입금</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="아이디">
<mat-option value="">아이디</mat-option>
<mat-option value="">닉네임</mat-option>
<mat-option value="">이름</mat-option>
<mat-option value="">사이트</mat-option>
<mat-option value="">파트너수동지급</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="가입일 정렬">
<mat-option value="">가입일 정렬</mat-option>
<mat-option value="">아이디 정렬</mat-option>
<mat-option value="">닉네임 정렬</mat-option>
<mat-option value="">캐쉬 정렬</mat-option>
<mat-option value="">콤프 정렬</mat-option>
<mat-option value="">쿠폰 정렬</mat-option>
<mat-option value="">입금 정렬</mat-option>
<mat-option value="">출금 정렬</mat-option>
<mat-option value="">차익 정렬</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="내림차순">
<mat-option value="">내림차순</mat-option>
<mat-option value="">오름차순</mat-option>
</mat-select>
</mat-form-field> -->
<!-- Search -->
<mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
fxFlex
class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
>
<mat-icon
class="icon-size-5"
@ -127,21 +49,44 @@
matInput
[formControl]="searchInputControl"
[autocomplete]="'off'"
[placeholder]="'Search'"
[placeholder]="'Search user'"
/>
</mat-form-field>
<!-- Add user button -->
<button
class="ml-4"
mat-flat-button
[color]="'primary'"
fxFlex
(click)="__createProduct()"
>
<!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
<span class="ml-2 mr-1">검색하기</span>
<mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<span class="ml-2 mr-1">Search</span>
</button>
<button>엑셀저장</button>
<button>카지노머니확인</button>
<div>
<button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
검색하기
</button>
</div>
<div>
<button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
어제
</button>
</div>
<div>
<button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
오늘
</button>
</div>
<div>
<button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
7일
</button>
</div>
<div>
<button mat-flat-button class="bet-mat-small-8" [color]="'primary'">
엑셀저장
</button>
</div>
</div>
</div>
@ -157,29 +102,30 @@
<!-- 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"
matSort
matSortDisableClear
>
<div class="hidden sm:block"><mat-checkbox></mat-checkbox></div>
<div class="hidden sm:block">요율</div>
<div class="hidden sm:block">상부트리</div>
<div class="hidden sm:block">관리</div>
<div class="hidden sm:block">매장수</div>
<div class="hidden sm:block">회원수</div>
<div class="hidden sm:block">아이디</div>
<div class="hidden sm:block">닉네임</div>
<div class="hidden sm:block">예금주</div>
<div class="hidden sm:block">연락처</div>
<div class="hidden sm:block">정산</div>
<div class="hidden sm:block">보유금</div>
<div class="hidden sm:block">게임중머니</div>
<div class="hidden sm:block">카지노->캐쉬</div>
<div class="hidden sm:block">금일콤프</div>
<div class="hidden sm:block">총입출</div>
<div class="hidden sm:block">로그</div>
<div class="hidden sm:block">상태</div>
<div class="hidden sm:block">회원수</div>
<div class="hidden sm:block">비고</div>
<div>처리날짜</div>
<div>이전일보유금</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="dailys$ | async as dailys">
@ -187,142 +133,88 @@
<div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
>
<div class="hidden sm:block truncate">
<mat-checkbox></mat-checkbox>
<div>{{ daily.processDate }}</div>
<div>
{{ daily.lastDayHoldingMoney }}
</div>
<!-- rate -->
<div class="hidden sm:block truncate">
<button
mat-button
color="primary"
matTooltip="요율확인
카지노-바카라: 0%
카지노-룰렛: 0%
카지노-드레곤타이거: 0%
카지노-그외: 0%
슬롯: 0%
카지노루징: 0%
슬롯루징: 0%"
>
요율
</button>
<div class="hidden sm:block truncate">
<!-- 관리 -->
<button mat-flat-button [color]="'primary'">
<mat-form-field>
<mat-select placeholder="관리">
<mat-option value="">보유금지급/회수</mat-option>
<mat-option value="">수수료설정</mat-option>
<mat-option value="">콤프지급/회수</mat-option>
<mat-option value="">쿠폰머니지급/회수</mat-option>
<mat-option value="">쪽지보내기</mat-option>
<mat-option value="">베팅리스트</mat-option>
<mat-option value="">강제로그아웃</mat-option>
</mat-select>
</mat-form-field>
</button>
<div>
충전{{ daily.memberCharge }}
<hr style="margin: 7px 0px" />
환전{{ daily.memberExchange }}
<hr style="margin: 7px 0px" />
손익{{ daily.memberProfitLoss }}
</div>
<div>
충전{{ daily.partnerCharge }}
<hr style="margin: 7px 0px" />
환전{{ daily.partnerExchange }}
<hr style="margin: 7px 0px" />
손익{{ daily.partnerProfitLoss }}
</div>
<!-- 매장수 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ daily.branchCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ daily.divisionCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ daily.officeCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ daily.storeCount }}
</button>
<div class="hidden sm:block">
{{ daily.totalProfitLoss }}
</div>
<!-- 회원수 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ daily.memberCount }}
</button>
<div class="hidden md:block">{{ daily.passiveMoney }}</div>
<div class="hidden md:block">
{{ daily.passiveComp }}
</div>
<!-- id -->
<ng-container *ngIf="users$ | async as users">
<ng-container
*ngFor="let user of users; trackBy: __trackByFn"
>
<div
class="hidden sm:block truncate"
(click)="viewUserDetail(user.id!)"
>
{{ daily.id }}
<div class="hidden md:block">
배팅{{ daily.casinoBetting }}
<hr style="margin: 7px 0px" />
타이{{ daily.casinoTie }}
<hr style="margin: 7px 0px" />
취소{{ daily.casinoCancel }}
<hr style="margin: 7px 0px" />
유효{{ daily.casinoAvailable }}
</div>
</ng-container>
</ng-container>
<!-- nickname -->
<div class="hidden sm:block truncate">
{{ daily.nickname }}
<div class="hidden lg:block">
{{ daily.casinoWinning }}
</div>
<!-- accountHolder -->
<div class="hidden sm:block truncate">
{{ daily.accountHolder }}
<div class="hidden lg:block">
{{ daily.casinoWinLoss }}
</div>
<!-- 연락처 -->
<div class="hidden sm:block truncate">
{{ daily.phoneNumber }}
<div class="hidden lg:block">
{{ daily.casinoCommission }}
</div>
<!-- 정산 -->
<div class="hidden sm:block truncate">
{{ daily.calculateType }}
<div class="hidden lg:block">
{{ daily.casinoBetWinCalculate }}
</div>
<!-- 보유금 -->
<div class="hidden sm:block truncate">
캐쉬{{ daily.ownCash }} 콤프{{ daily.ownComp }} 쿠폰{{
daily.ownCoupon
}}
<div class="hidden md:block">
배팅{{ daily.slotBetting }}
<hr style="margin: 7px 0px" />
취소{{ daily.slotCancel }}
<hr style="margin: 7px 0px" />
유효{{ daily.slotAvailable }}
</div>
<!-- gameMoney -->
<div class="hidden sm:block truncate">
{{ daily.gameMoney }}
<div class="hidden lg:block">
{{ daily.slotWinning }}
</div>
<!-- casinoCash -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
게임머니확인
</button>
<button mat-flat-button [color]="'primary'">
게임머니회수
</button>
<div class="hidden lg:block">
{{ daily.slotWinLoss }}
</div>
<!-- todayComp -->
<div class="hidden sm:block truncate">
{{ daily.todayComp }}P
<div class="hidden lg:block">
{{ daily.slotCommission }}
</div>
<!-- 총입출 -->
<div class="hidden sm:block truncate">
입금{{ daily.totalDeposit }} 출금{{
daily.totalWithdraw
}}
차익{{ daily.balance }}
<div class="hidden lg:block">
{{ daily.slotBetWinCalculate }}
</div>
<!-- log -->
<div class="hidden sm:block truncate">
가입{{ daily.registDate }} 최종{{
daily.finalSigninDate
}}
IP{{ daily.ip }}
<div class="hidden md:block">
배팅{{ daily.powerballBetting }}
</div>
<!-- state -->
<div class="hidden sm:block truncate">
{{ daily.state }}
<div class="hidden lg:block">
{{ daily.powerballWinning }}
</div>
<!-- 회원수 -->
<div class="hidden sm:block truncate">
{{ daily.memberCount }}
<div class="hidden lg:block">
{{ daily.powerballWinLoss }}
</div>
<!-- 비고 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ daily.note }}
</button>
<div class="hidden lg:block">
{{ daily.powerballCommission }}
</div>
<div class="hidden lg:block">
{{ daily.powerballBetWinCalculate }}
</div>
<div class="hidden lg:block">
{{ daily.totalBetWinCalculate }}
</div>
</div>
</ng-container>
@ -345,7 +237,7 @@
<div
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
>
There are no dailys!
There are no data!
</div>
</ng-template>
</div>

View File

@ -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<Daily[] | undefined>;
users$!: Observable<User[] | undefined>;
__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
*

View File

@ -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; // 총벳윈정산
}