From 8d3f338c0d39f94d786b9f90e1abaa10655bc542 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Tue, 2 Aug 2022 09:06:12 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=EC=88=98=EB=8F=99=EC=A7=80=EA=B8=89?= =?UTF-8?q?=ED=9A=8C=EC=88=98=EB=A1=9C=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mock-api/apps/report/payment-log/api.ts | 4 +- .../mock-api/apps/report/payment-log/data.ts | 121 +++++-- .../components/list.component.html | 317 ++++-------------- .../payment-log/components/list.component.ts | 21 +- .../report/payment-log/models/payment-log.ts | 41 +-- 5 files changed, 187 insertions(+), 317 deletions(-) diff --git a/src/app/mock-api/apps/report/payment-log/api.ts b/src/app/mock-api/apps/report/payment-log/api.ts index 6f98a33..18ea648 100644 --- a/src/app/mock-api/apps/report/payment-log/api.ts +++ b/src/app/mock-api/apps/report/payment-log/api.ts @@ -33,7 +33,7 @@ export class ReportPaymentLogMockApi { .reply(({ request }) => { // Get available queries 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 page = parseInt(request.params.get('page') ?? '1', 10); const size = parseInt(request.params.get('size') ?? '10', 10); @@ -42,7 +42,7 @@ export class ReportPaymentLogMockApi { let paymentLogs: any[] | null = cloneDeep(this._paymentLogs); // Sort the paymentLogs - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if (sort === 'giveId' || sort === 'takeId' || sort === 'idx') { paymentLogs.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/report/payment-log/data.ts b/src/app/mock-api/apps/report/payment-log/data.ts index 98e4bc4..ffc8a6d 100644 --- a/src/app/mock-api/apps/report/payment-log/data.ts +++ b/src/app/mock-api/apps/report/payment-log/data.ts @@ -2,32 +2,99 @@ export const paymentLogs = [ { - 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: '7eb7c859-1347-4317-96b6-9476a7e2ba3c', + idx: 6, + giveRank: '회원', + takeRank: '총판', + giveId: 'onon6', + takeId: 'on03', + giveBeforeMoney: 0, + giveChangeMoney: 10000, + giveAfterMoney: 10000, + takeBeforeMoney: 213940, + takeChangeMoney: -10000, + takeAfterMoney: 203940, + giveRegistrationDate: '2022-06-12 17:43', + takeRegistrationDate: '2022-06-12 17:43', + }, + { + id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d', + idx: 5, + giveRank: '매장', + takeRank: '회원', + giveId: 'on04', + takeId: 'onon6', + giveBeforeMoney: 0, + giveChangeMoney: 200000, + giveAfterMoney: 200000, + takeBeforeMoney: 200000, + 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', }, ]; diff --git a/src/app/modules/admin/report/payment-log/components/list.component.html b/src/app/modules/admin/report/payment-log/components/list.component.html index 9e5f004..96b1d5e 100644 --- a/src/app/modules/admin/report/payment-log/components/list.component.html +++ b/src/app/modules/admin/report/payment-log/components/list.component.html @@ -10,113 +10,32 @@ -
수동지급/회수 로그
+
수동지급/회수로그
- - - + + +
+ + +
+ +
- - - 40 - 60 - 80 - 100 - - - - - LV.1 - LV.2 - LV.3 - LV.4 - - - - - 정상 - 대기 - 탈퇴 - 휴면 - 블랙 - 정지 - - - - - 카지노제한 - 슬롯제한 - - - - - 계좌입금 - - - - - 카지노콤프 - 슬롯콤프 - 배팅콤프 - 첫충콤프 - - - - -
-
@@ -157,29 +74,15 @@
- - - - - - +
번호
+
비고
+
정보
- - - - - - - - - - - - - +
이전금액
+
변동금액
+ +
@@ -189,143 +92,43 @@
-