bet/beteran-backend-app-browser
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

수동지급회수로그 수정

Browse Source
This commit is contained in:
이담 정 2022-08-02 09:06:12 +00:00
parent 2f491e7207
commit 8d3f338c0d
5 changed files with 187 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/mock-api/apps/report/payment-log/api.ts
View File

@ -33,7 +33,7 @@ export class ReportPaymentLogMockApi {
.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') || 'giveId';
const order = request.params.get('order') || 'asc'; const order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10); const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10); const size = parseInt(request.params.get('size') ?? '10', 10);
@ -42,7 +42,7 @@ export class ReportPaymentLogMockApi {
let paymentLogs: any[] | null = cloneDeep(this._paymentLogs); let paymentLogs: any[] | null = cloneDeep(this._paymentLogs);
// Sort the paymentLogs // Sort the paymentLogs
if (sort === 'sku' || sort === 'name' || sort === 'active') { if (sort === 'giveId' || sort === 'takeId' || sort === 'idx') {
paymentLogs.sort((a, b) => { paymentLogs.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase(); const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase();

121
src/app/mock-api/apps/report/payment-log/data.ts
View File

@ -2,32 +2,99 @@
export const paymentLogs = [ export const paymentLogs = [
{ {
id: 'on00', id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
totalPartnerCount: '5', idx: 6,
totalHoldingMoney: 303675, giveRank: '회원',
totalComp: 108933, takeRank: '총판',
total: 412608, giveId: 'onon6',
branchCount: 1, takeId: 'on03',
divisionCount: 1, giveBeforeMoney: 0,
officeCount: 1, giveChangeMoney: 10000,
storeCount: 1, giveAfterMoney: 10000,
memberCount: 1, takeBeforeMoney: 213940,
nickname: 'on00', takeChangeMoney: -10000,
accountHolder: '11', takeAfterMoney: 203940,
phoneNumber: '010-1111-1111', giveRegistrationDate: '2022-06-12 17:43',
calculateType: '롤링', takeRegistrationDate: '2022-06-12 17:43',
ownCash: 50000, },
ownComp: 1711, {
ownCoupon: 50000, id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
gameMoney: 0, idx: 5,
todayComp: 0, giveRank: '매장',
totalDeposit: 0, takeRank: '회원',
totalWithdraw: 0, giveId: 'on04',
balance: 0, takeId: 'onon6',
registDate: '2022-06-12 15:38', giveBeforeMoney: 0,
finalSigninDate: '', giveChangeMoney: 200000,
ip: '', giveAfterMoney: 200000,
state: '정상', takeBeforeMoney: 200000,
note: '', takeChangeMoney: -200000,
takeAfterMoney: 0,
giveRegistrationDate: '2022-06-12 16:22',
takeRegistrationDate: '2022-06-12 16:22',
},
{
id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
idx: 4,
giveRank: '총판',
takeRank: '매장',
giveId: 'on03',
takeId: 'on04',
giveBeforeMoney: 0,
giveChangeMoney: 200000,
giveAfterMoney: 200000,
takeBeforeMoney: 200000,
takeChangeMoney: -200000,
takeAfterMoney: 0,
giveRegistrationDate: '2022-06-12 16:21',
takeRegistrationDate: '2022-06-12 16:21',
},
{
id: '8fcce528-d878-4cc8-99f7-bd3451ed5405',
idx: 3,
giveRank: '부본사',
takeRank: '총판',
giveId: 'on02',
takeId: 'on03',
giveBeforeMoney: 0,
giveChangeMoney: 200000,
giveAfterMoney: 200000,
takeBeforeMoney: 200000,
takeChangeMoney: -200000,
takeAfterMoney: 0,
giveRegistrationDate: '2022-06-12 16:20',
takeRegistrationDate: '2022-06-12 16:20',
},
{
id: '8fcce528-d878-4cc8-99f7-bd3451ed5406',
idx: 2,
giveRank: '대본사',
takeRank: '부본사',
giveId: 'on01',
takeId: 'on02',
giveBeforeMoney: 0,
giveChangeMoney: 200000,
giveAfterMoney: 200000,
takeBeforeMoney: 250000,
takeChangeMoney: -200000,
takeAfterMoney: 50000,
giveRegistrationDate: '2022-06-12 16:16',
takeRegistrationDate: '2022-06-12 16:16',
},
{
id: 'd7a47d7c-4cdf-4319-bbaa-37ade38c622c',
idx: 1,
giveRank: '본사',
takeRank: '대본사',
giveId: 'on00',
takeId: 'on01',
giveBeforeMoney: 0,
giveChangeMoney: 250000,
giveAfterMoney: 250000,
takeBeforeMoney: 300000,
takeChangeMoney: -250000,
takeAfterMoney: 50000,
giveRegistrationDate: '2022-06-12 16:11',
takeRegistrationDate: '2022-06-12 16:11',
}, },
]; ];

317
src/app/modules/admin/report/payment-log/components/list.component.html
View File

@ -10,113 +10,32 @@
<mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar> <mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
</div> </div>
<!-- Title --> <!-- Title -->
<div class="text-4xl font-extrabold tracking-tight">수동지급/회수 로그</div> <div class="text-4xl font-extrabold tracking-tight">수동지급/회수로그</div>
<!-- Actions --> <!-- Actions -->
<div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4"> <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Memo --> <!-- Search -->
<!-- <mat-form-field> <button mat-icon-button (click)="__onClickSearch()">
<ng-container *ngIf="paymentLogs$ | async as paymentLogs"> <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<ng-container </button>
*ngFor="let paymentLog of paymentLogs; trackBy: __trackByFn" </div>
> </div>
<div <!-- Search -->
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" <div
> *ngIf="__isSearchOpened"
<fieldset> 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"
총 파트너수:{{ paymentLog.totalPartnerCount }} 총 보유머니:{{ >
paymentLog.totalHoldingpayment <!-- Actions -->
}} <div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
총 콤프:{{ paymentLog.totalComp }} 총 합계:{{
paymentLog.total
}}
</fieldset>
</div>
</ng-container>
</ng-container>
</mat-form-field> -->
<!-- SelectBox --> <!-- SelectBox -->
<mat-form-field> <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
<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-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-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-select>
</mat-form-field> </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 --> <!-- Search -->
<mat-form-field <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 <mat-icon
class="icon-size-5" class="icon-size-5"
@ -127,24 +46,22 @@
matInput matInput
[formControl]="searchInputControl" [formControl]="searchInputControl"
[autocomplete]="'off'" [autocomplete]="'off'"
[placeholder]="'Search'" [placeholder]="'Search user'"
/> />
</mat-form-field> </mat-form-field>
<!-- Add user button --> <!-- Add user button -->
<button <button
class="ml-4" fxFlex
mat-flat-button mat-flat-button
style="position: fixed; margin-top: 4px"
[color]="'primary'" [color]="'primary'"
(click)="__createProduct()" (click)="__createProduct()"
> >
<!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> --> <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
<span class="ml-2 mr-1">검색하기</span> <span class="ml-2 mr-1">Search</span>
</button> </button>
<button>엑셀저장</button>
<button>카지노머니확인</button>
</div> </div>
</div> </div>
<!-- Main --> <!-- Main -->
<div class="flex flex-auto overflow-hidden"> <div class="flex flex-auto overflow-hidden">
<!-- Products list --> <!-- Products list -->
@ -157,29 +74,15 @@
<!-- Header --> <!-- Header -->
<div <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" 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>번호</div>
<div class="hidden sm:block">요율</div> <div>비고</div>
<div class="hidden sm:block">상부트리</div> <div>정보</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 class="hidden sm:block">예금주</div> <div>변동금액</div>
<div class="hidden sm:block">연락처</div> <div class="hidden md:block">이후금액</div>
<div class="hidden sm:block">정산</div> <div class="hidden md: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>
<!-- Rows --> <!-- Rows -->
<ng-container *ngIf="paymentLogs$ | async as paymentLogs"> <ng-container *ngIf="paymentLogs$ | async as paymentLogs">
@ -189,143 +92,43 @@
<div <div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
> >
<div class="hidden sm:block truncate"> <div>
<mat-checkbox></mat-checkbox> {{ paymentLog.idx }}
</div> </div>
<!-- rate --> <div>
<div class="hidden sm:block truncate"> {{ paymentLog.giveRank }}
<button <mat-icon svgIcon="play-outline"></mat-icon>
mat-button {{ paymentLog.takeRank }}회수or지급
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>
</div> </div>
<!-- 매장수 --> <div>
<div class="hidden sm:block truncate"> {{ paymentLog.giveRank }}{{ paymentLog.giveId }}
<button mat-flat-button [color]="'primary'"> <mat-icon svgIcon="play-outline"></mat-icon>
{{ paymentLog.branchCount }} {{ paymentLog.takeRank }}{{ paymentLog.takeId }}
</button>
<button mat-flat-button [color]="'primary'">
{{ paymentLog.divisionCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ paymentLog.officeCount }}
</button>
<button mat-flat-button [color]="'primary'">
{{ paymentLog.storeCount }}
</button>
</div> </div>
<!-- 회원수 --> <div class="hidden sm:block">
<div class="hidden sm:block truncate"> {{ paymentLog.takeRank }}{{ paymentLog.takeId }}
<button mat-flat-button [color]="'primary'"> <hr style="margin: 7px 0px" />
{{ paymentLog.memberCount }} {{ paymentLog.giveRank }}{{ paymentLog.giveId }}
</button>
</div> </div>
<!-- id --> <div>
<ng-container *ngIf="users$ | async as users"> {{ paymentLog.takeBeforeMoney }}원
<ng-container <hr style="margin: 7px 0px" />
*ngFor="let user of users; trackBy: __trackByFn" {{ paymentLog.giveBeforeMoney }}원
>
<div
class="hidden sm:block truncate"
(click)="viewUserDetail(user.id!)"
>
{{ paymentLog.id }}
</div>
</ng-container>
</ng-container>
<!-- nickname -->
<div class="hidden sm:block truncate">
{{ paymentLog.nickname }}
</div> </div>
<!-- accountHolder --> <div>
<div class="hidden sm:block truncate"> {{ paymentLog.takeChangeMoney }}원
{{ paymentLog.accountHolder }} <hr style="margin: 7px 0px" />
{{ paymentLog.giveChangeMoney }}원
</div> </div>
<!-- 연락처 --> <div class="hidden md:block">
<div class="hidden sm:block truncate"> {{ paymentLog.takeAfterMoney }}원
{{ paymentLog.phoneNumber }} <hr style="margin: 7px 0px" />
{{ paymentLog.giveAfterMoney }}원
</div> </div>
<!-- 정산 --> <div class="hidden md:block">
<div class="hidden sm:block truncate"> {{ paymentLog.takeRegistrationDate }}
{{ paymentLog.calculateType }} <hr style="margin: 7px 0px" />
</div> {{ paymentLog.giveRegistrationDate }}
<!-- 보유금 -->
<div class="hidden sm:block truncate">
캐쉬{{ paymentLog.ownCash }} 콤프{{
paymentLog.ownComp
}}
쿠폰{{ paymentLog.ownCoupon }}
</div>
<!-- gameMoney -->
<div class="hidden sm:block truncate">
{{ paymentLog.gameMoney }}
</div>
<!-- casinoCash -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
게임머니확인
</button>
<button mat-flat-button [color]="'primary'">
게임머니회수
</button>
</div>
<!-- todayComp -->
<div class="hidden sm:block truncate">
{{ paymentLog.todayComp }}P
</div>
<!-- 총입출 -->
<div class="hidden sm:block truncate">
입금{{ paymentLog.totalDeposit }} 출금{{
paymentLog.totalWithdraw
}}
차익{{ paymentLog.balance }}
</div>
<!-- log -->
<div class="hidden sm:block truncate">
가입{{ paymentLog.registDate }} 최종{{
paymentLog.finalSigninDate
}}
IP{{ paymentLog.ip }}
</div>
<!-- state -->
<div class="hidden sm:block truncate">
{{ paymentLog.state }}
</div>
<!-- 회원수 -->
<div class="hidden sm:block truncate">
{{ paymentLog.memberCount }}
</div>
<!-- 비고 -->
<div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'">
{{ paymentLog.note }}
</button>
</div> </div>
</div> </div>
</ng-container> </ng-container>
@ -348,7 +151,7 @@
<div <div
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center" class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
> >
There are no paymentLogs! There are no data!
</div> </div>
</ng-template> </ng-template>
</div> </div>

21
src/app/modules/admin/report/payment-log/components/list.component.ts
View File

@ -42,18 +42,22 @@ import { Router } from '@angular/router';
/* language=SCSS */ /* language=SCSS */
` `
.inventory-grid { .inventory-grid {
grid-template-columns: 60px auto 40px; /* 번호 비고 정보 아이디 이전 변동 */
grid-template-columns: 100px 200px auto 100px 100px 100px;
@screen sm { @screen sm {
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
} }
@screen md { @screen md {
grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
} }
@screen lg { @screen lg {
grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; /* 번호 비고 정보 아이디 이전 변동 이후 등록시간 */
grid-template-columns: 100px 200px auto 100px 100px 100px 100px 100px;
} }
} }
`, `,
@ -69,6 +73,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
paymentLogs$!: Observable<PaymentLog[] | undefined>; paymentLogs$!: Observable<PaymentLog[] | undefined>;
users$!: Observable<User[] | undefined>; users$!: Observable<User[] | undefined>;
__isSearchOpened = false;
isLoading = false; isLoading = false;
searchInputControl = new FormControl(); searchInputControl = new FormControl();
selectedPaymentLog?: PaymentLog; selectedPaymentLog?: PaymentLog;
@ -186,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
* *

41
src/app/modules/admin/report/payment-log/models/payment-log.ts
View File

@ -1,29 +1,16 @@
export interface PaymentLog { export interface PaymentLog {
id?: string; id: string;
totalPartnerCount?: number; idx?: number;
totalHoldingMoney?: number; giveRank?: string; // 지급자 등급
totalComp?: number; giveId?: string; // 지급자 아이디
total?: number; giveBeforeMoney?: number; // 지급자 이전금액
branchCount?: number; giveChangeMoney?: number; // 지급자 변동금액
divisionCount?: number; giveAfterMoney?: number; // 지급자 이후금액
officeCount?: number; takeRank?: string; // 회수자 등급
storeCount?: number; takeId?: string; // 회수자 아이디
memberCount?: number; takeBeforeMoney?: number; // 회수자 이전금액
nickname?: string; takeChangeMoney?: number; // 회수자 변동금액
accountHolder?: string; takeAfterMoney?: number; // 회수자 이후금액
phoneNumber?: string; giveRegistrationDate?: Date; // 지급자 등록시간
calculateType?: string; takeRegistrationDate?: Date; // 회수자 등록시간
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;
} }