From 53504e45af1c23dec9086da995be548d01336cff Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Wed, 15 Jan 2025 21:18:42 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20API=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/ShowSettlementPage/index.tsx | 126 +++++++++++------- packages/api/src/queryKey.ts | 2 +- 2 files changed, 77 insertions(+), 51 deletions(-) diff --git a/apps/admin/src/pages/ShowSettlementPage/index.tsx b/apps/admin/src/pages/ShowSettlementPage/index.tsx index deab8e47..c025db4d 100644 --- a/apps/admin/src/pages/ShowSettlementPage/index.tsx +++ b/apps/admin/src/pages/ShowSettlementPage/index.tsx @@ -12,6 +12,7 @@ import { useShowLastSettlementEvent, useShowSettlementInfo, useShowSettlementStatement, + useShowSettlementSummary, useUploadBankAccountCopyPhoto, useUploadIDCardPhotoFile, } from '@boolti/api'; @@ -55,6 +56,7 @@ const ShowSettlementPage = () => { const { data: settlementStatementBlob } = useShowSettlementStatement(showId, { enabled: lastSettlementEvent?.settlementEventType != null, }); + const { data: settlementSummary } = useShowSettlementSummary(showId); const { data: settlementBanners } = useSettlementBanners(); const uploadIDCardPhotoFileMutation = useUploadIDCardPhotoFile(showId); @@ -85,7 +87,7 @@ const ShowSettlementPage = () => { }); }, [params.showId, readSettlementBanner, settlementBanners]); - if (!show || !myHostInfo) return null; + if (!show || !myHostInfo || !settlementSummary) return null; if (!PAGE_PERMISSION['정산 관리'].includes(myHostInfo.type)) { return ( @@ -125,63 +127,87 @@ const ShowSettlementPage = () => { 결제 금액 - 43,000원 + + {settlementSummary.salesAmount.toLocaleString()}원 + - 예상 수수료 - - + {settlementSummary.expected ? `예상 ` : ''}수수료 + {settlementSummary.expected && ( + <> + + + + )} - 43,000원 + + {( + settlementSummary.expected?.fee ?? + settlementSummary.actual?.fee ?? + 0 + ).toLocaleString()} + 원 + - 예상 정산 금액 - - + {settlementSummary.expected ? `예상 ` : ''}정산 금액 + {settlementSummary.expected && ( + <> + + + + )} - 957,000원 + + {( + settlementSummary.expected?.settlementAmount ?? + settlementSummary.actual?.settlementAmount ?? + 0 + ).toLocaleString()} + 원 + {settlementInfo && ( diff --git a/packages/api/src/queryKey.ts b/packages/api/src/queryKey.ts index e3be1f3e..53630083 100644 --- a/packages/api/src/queryKey.ts +++ b/packages/api/src/queryKey.ts @@ -397,7 +397,7 @@ export const showQueryKeys = createQueryKeys('show', { settlementSummary: (showId: number) => ({ queryKey: [showId], queryFn: () => - fetcher.get(`/web/v1/shows/${showId}/settlement-summaries`), + fetcher.get(`web/v1/shows/${showId}/settlement-summaries`), }), });