From 677866f053a60860a3325b7b070bb9284f2ce57b Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Mon, 25 Jul 2022 07:05:48 +0000 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=ED=8A=B8=EB=84=88=20=EC=9E=85?= =?UTF-8?q?=EC=B6=9C=EA=B8=88=EC=A0=95=EC=82=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/bank/partner-calculate/api.ts | 8 +- .../apps/bank/partner-calculate/data.ts | 86 ++-- .../mock-api/apps/bank/web-calculate/api.ts | 8 +- .../mock-api/apps/bank/web-calculate/data.ts | 4 +- .../components/list.component.html | 387 ++++++------------ .../components/list.component.ts | 21 +- .../models/partner-calculate.ts | 30 +- .../components/list.component.html | 2 +- .../web-calculate/models/web-calculate.ts | 2 +- 9 files changed, 220 insertions(+), 328 deletions(-) diff --git a/src/app/mock-api/apps/bank/partner-calculate/api.ts b/src/app/mock-api/apps/bank/partner-calculate/api.ts index 400d033..e5679d3 100644 --- a/src/app/mock-api/apps/bank/partner-calculate/api.ts +++ b/src/app/mock-api/apps/bank/partner-calculate/api.ts @@ -33,7 +33,7 @@ export class BankPartnerCalculateMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'partnerDepositId'; 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); @@ -44,7 +44,11 @@ export class BankPartnerCalculateMockApi { ); // Sort the partnerCalculates - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'partnerDepositId' || + sort === 'partnerDepositNickname' || + sort === 'accountHolder' + ) { partnerCalculates.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/bank/partner-calculate/data.ts b/src/app/mock-api/apps/bank/partner-calculate/data.ts index 6cfd839..4081ebc 100644 --- a/src/app/mock-api/apps/bank/partner-calculate/data.ts +++ b/src/app/mock-api/apps/bank/partner-calculate/data.ts @@ -2,57 +2,43 @@ export const partnerCalculates = [ { - rank: '회원', - level: 4, - id: 'aa100', - nickname: 'aa100', - paymentDue: 50000, - calculateType: '롤링', - accountHolder: '광주은행2sss', - note: '@', - registrationDate: '2022-06-18 13:14', - processDate: '000-0-0 0:0', - deposit: 41200000, - withdraw: 19000000, - total: 22200000, - gameMoney: 67131, - highRank: '[매장]kgon5', - state: '신청', + id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + partnerDepositIdx: 1, + partnerDepositId: 'kgon1', + partnerDepositNickname: '본사', + partnerDepositRank: '본사', + nameOfDepositer: '본사', + partnerDepositAmountOfPayment: 50000, + partnerDepositRegistrationDate: '2022-05-18 13:05', + partnerDepositConfirmDate: '2022-05-18 13:05', + + partnerWithdrawIdx: 1, + partnerWithdrawId: 'kgon1', + partnerWithdrawNickname: '본사', + partnerWithdrawRank: '본사', + accountHolder: '국민은행 예금주본사 89898989898989898989', + partnerWithdrawAmountOfPayment: 70000, + partnerWithdrawRegistrationDate: '2022-05-18 13:05', + partnerWithdrawConfirmDate: '2022-05-18 13:05', }, { - rank: '회원', - level: 1, - id: 'onon6', - nickname: '가가가', - paymentDue: 100000, - calculateType: '롤링', - accountHolder: '가가가', - note: '', - registrationDate: '2022-06-13 12:57', - processDate: '2022-06-13 12:58', - deposit: 200000, - withdraw: 0, - total: 200000, - gameMoney: 0, - highRank: '[매장]on04', - state: '완료', - }, - { - rank: '회원', - level: 1, - id: 'onon6', - nickname: '가가가', - paymentDue: 100000, - calculateType: '롤링', - accountHolder: '가가가', - note: '', - registrationDate: '2022-06-13 12:56', - processDate: '2022-06-13 12:57', - deposit: 200000, - withdraw: 0, - total: 200000, - gameMoney: 0, - highRank: '[매장]on04', - state: '완료', + id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d', + partnerDepositIdx: 2, + partnerDepositId: 'kgon4', + partnerDepositNickname: '총판', + partnerDepositRank: '총판', + nameOfDepositer: '총판', + partnerDepositAmountOfPayment: 500000, + partnerDepositRegistrationDate: '2022-05-17 21:46', + partnerDepositConfirmDate: '2022-05-17 21:46', + + partnerWithdrawIdx: 2, + partnerWithdrawId: 'kgon4', + partnerWithdrawNickname: '총판', + partnerWithdrawRank: '총판', + accountHolder: '국민은행 예금주총판 0430440404040040', + partnerWithdrawAmountOfPayment: 100000, + partnerWithdrawRegistrationDate: '2022-05-17 21:46', + partnerWithdrawConfirmDate: '2022-05-17 21:46', }, ]; diff --git a/src/app/mock-api/apps/bank/web-calculate/api.ts b/src/app/mock-api/apps/bank/web-calculate/api.ts index e1375ab..934f08d 100644 --- a/src/app/mock-api/apps/bank/web-calculate/api.ts +++ b/src/app/mock-api/apps/bank/web-calculate/api.ts @@ -33,7 +33,7 @@ export class BankWebCalculateMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'webDepositId'; 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 BankWebCalculateMockApi { let webCalculates: any[] | null = cloneDeep(this._webCalculates); // Sort the webCalculates - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'webDepositId' || + sort === 'webDepositNickname' || + sort === 'accountHolder' + ) { webCalculates.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/bank/web-calculate/data.ts b/src/app/mock-api/apps/bank/web-calculate/data.ts index 99a605e..400cda1 100644 --- a/src/app/mock-api/apps/bank/web-calculate/data.ts +++ b/src/app/mock-api/apps/bank/web-calculate/data.ts @@ -10,7 +10,7 @@ export const webCalculates = [ nameOfDepositer: '가가가', webDepositAmountOfPayment: 100000, webDepositRegistrationDate: '2022-06-13 12:57', - webDepositComfirmDate: '2022-06-13 12:58', + webDepositConfirmDate: '2022-06-13 12:58', webWithdrawIdx: 1, webWithdrawId: 'aa100', @@ -30,7 +30,7 @@ export const webCalculates = [ nameOfDepositer: '가가가', webDepositAmountOfPayment: 100000, webDepositRegistrationDate: '2022-06-13 12:56', - webDepositComfirmDate: '2022-06-13 12:57', + webDepositConfirmDate: '2022-06-13 12:57', webWithdrawIdx: 2, webWithdrawId: 'aa100', diff --git a/src/app/modules/admin/bank/partner-calculate/components/list.component.html b/src/app/modules/admin/bank/partner-calculate/components/list.component.html index eca0281..66f14da 100644 --- a/src/app/modules/admin/bank/partner-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/partner-calculate/components/list.component.html @@ -10,35 +10,33 @@ -
파트너 입/출금정산
+
파트너 입출금 정산
- - - - - + + +
+ + +
+ +
- - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - - + + 아이디 닉네임 - 이름 - 사이트 - 파트너수동지급 - +
+
파트너입금
-
-
- - - - - - - - - - - - - - - - - -
- - diff --git a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts index 3fd24b6..6c7b061 100644 --- a/src/app/modules/admin/bank/partner-calculate/components/list.component.ts +++ b/src/app/modules/admin/bank/partner-calculate/components/list.component.ts @@ -41,18 +41,22 @@ import { PartnerCalculateService } from '../services/partner-calculate.service'; /* language=SCSS */ ` .inventory-grid { - grid-template-columns: 60px auto 40px; + /* 번호 아이디 등급 입금자 결제 */ + grid-template-columns: 40px 140px 100px auto 140px; @screen sm { - grid-template-columns: 60px auto 60px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 140px 100px auto 140px 140px; } @screen md { - grid-template-columns: 60px 60px auto 112px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 140px 100px auto 140px 140px; } @screen lg { - grid-template-columns: 60px 60px auto 112px 96px 96px 72px; + /* 번호 아이디 등급 입금자 결제 신청 */ + grid-template-columns: 40px 100px auto 40px 140px 140px; } } `, @@ -68,6 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy { partnerCalculates$!: Observable; users$!: Observable; + __isSearchOpened = false; isLoading = false; searchInputControl = new FormControl(); selectedPartnerCalculate?: PartnerCalculate; @@ -180,6 +185,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/bank/partner-calculate/models/partner-calculate.ts b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts index dcf948d..c013c69 100644 --- a/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts +++ b/src/app/modules/admin/bank/partner-calculate/models/partner-calculate.ts @@ -1,18 +1,20 @@ export interface PartnerCalculate { id?: string; - rank?: string; - level?: string; - nickname?: string; - paymentDue?: number; - calculateType?: string; + partnerDepositIdx?: number; // 파트너입금 idx + partnerDepositId?: string; // 파트너입금 아이디 + partnerDepositNickname?: string; // 파트너입금 닉네임 + partnerDepositRank?: string; // 파트너입금 등급 + nameOfDepositer?: string; + partnerDepositAmountOfPayment?: number; // 파트너입금 결제금액 + partnerDepositRegistrationDate?: Date; // 파트너입금 신청일 + partnerDepositConfirmDate?: Date; // 파트너입금 확인일 + + partnerWithdrawIdx?: number; // 파트너출금 idx + partnerWithdrawId?: string; // 파트너입금 아이디 + partnerWithdrawNickname?: string; // 파트너입금 닉네임 + partnerWithdrawRank?: string; // 파트너입금 등급 accountHolder?: string; - note?: string; - registrationDate?: string; - processDate?: string; - deposit?: number; - withdraw?: number; - total?: number; - gameMoney?: number; - highRank?: string; - state?: string; + partnerWithdrawAmountOfPayment?: number; // 파트너입금 결제금액 + partnerWithdrawRegistrationDate?: Date; // 파트너입금 신청일 + partnerWithdrawConfirmDate?: Date; // 파트너입금 확인일 } diff --git a/src/app/modules/admin/bank/web-calculate/components/list.component.html b/src/app/modules/admin/bank/web-calculate/components/list.component.html index 9d2e48b..e524791 100644 --- a/src/app/modules/admin/bank/web-calculate/components/list.component.html +++ b/src/app/modules/admin/bank/web-calculate/components/list.component.html @@ -119,7 +119,7 @@
diff --git a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts index 91a6335..52a9b06 100644 --- a/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts +++ b/src/app/modules/admin/bank/web-calculate/models/web-calculate.ts @@ -7,7 +7,7 @@ export interface WebCalculate { nameOfDepositer?: string; // 입금자명 webDepositAmountOfPayment?: number; // 웹입금 결제금액 webDepositRegistrationDate?: Date; // 웹입금 신청일 - webDepositComfirmDate?: Date; // 웹입금 확인일 + webDepositConfirmDate?: Date; // 웹입금 확인일 webWithdrawIdx?: number; // 웹출금 idx webWithdrawId?: string; // 웹출금 아이디