From b92d7c6a44f829f1646632d24ce1a4b77e0555b0 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Tue, 23 Sep 2025 16:55:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EA=B8=88=EC=9D=B4=EC=B2=B4=20?= =?UTF-8?q?=EB=81=9D=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/fund-account/result-list-wrap.tsx | 2 +- .../ui/fund-account/transfer-list-wrap.tsx | 4 +- .../additional-service/ui/list-item.tsx | 49 ++++++++++++-- .../fund-account/result-detail-page.tsx | 66 ++++++++----------- .../fund-account/transfer-detail-page.tsx | 4 +- 5 files changed, 75 insertions(+), 50 deletions(-) diff --git a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx index af4be2f..50a8064 100644 --- a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx @@ -137,7 +137,7 @@ export const FundAccountResultListWrap = () => { for (const [key, value] of Object.entries(listItems)) { rs.push( { for (const [key, value] of Object.entries(listItems)) { rs.push( { setReceiveBankCode={ setReceiveBankCode } setStatus={ setStatus } > - + ); }; \ No newline at end of file diff --git a/src/entities/additional-service/ui/list-item.tsx b/src/entities/additional-service/ui/list-item.tsx index 3b6dd34..37366eb 100644 --- a/src/entities/additional-service/ui/list-item.tsx +++ b/src/entities/additional-service/ui/list-item.tsx @@ -141,7 +141,7 @@ export const ListItem = ({ } }); } - else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) { + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) { navigate(PATHS.additionalService.fundAccount.transferDetail, { state: { additionalServiceCategory: additionalServiceCategory, @@ -150,6 +150,15 @@ export const ListItem = ({ } }); } + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) { + navigate(PATHS.additionalService.fundAccount.resultDetail, { + state: { + additionalServiceCategory: additionalServiceCategory, + mid: mid, + tid: tid + } + }); + } else if (additionalServiceCategory === AdditionalServiceCategory.SettlementAgency) { } @@ -181,7 +190,10 @@ export const ListItem = ({ let time = requestDate?.substring(8, 14); timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4) + ':' + time?.substring(4, 6); } - else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) { + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) { + timeStr = moment(requestDate).format('mm:ss'); + } + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) { timeStr = moment(requestDate).format('mm:ss'); } else { @@ -213,7 +225,10 @@ export const ListItem = ({ else if (additionalServiceCategory === AdditionalServiceCategory.Payout) { str = companyName; } - else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){ + else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){ + str = `${receiveAccountName}(${receiveAccountNo})` + } + else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){ str = `${receiveAccountName}(${receiveAccountNo})` } @@ -288,7 +303,16 @@ export const ListItem = ({ ); } - else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){ + else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){ + rs.push( +
+ { getTime() } + | + { status } +
+ ); + } + else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){ rs.push(
{ getTime() } @@ -357,7 +381,22 @@ export const ListItem = ({
); } - else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) { + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) { + rs.push( +
+ +
+ ); + } + else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) { rs.push(
{ const { navigate } = useNavigate(); @@ -22,18 +24,17 @@ export const FundAccountResultDetailPage = () => { const tid = location.state.tid; const mid = location.state.mid; - const [detail, setDetail] = useState(); + const [detail, setDetail] = useState(); - const { mutateAsync: extensionFundAccountTransferDetail } = useExtensionFundAccountTransferDetailMutation(); - const { mutateAsync: extensionFundAccountTransferRequest } = useExtensionFundAccountTransferRequestMutation(); + const { mutateAsync: extensionFundAccountResultDetail } = useExtensionFundAccountResultDetailMutation(); const callDetail = () => { - let params: ExtensionFundAccountTransferDetailParams = { + let params: ExtensionFundAccountResultDetailParams = { tid: tid, mid: mid, }; - extensionFundAccountTransferDetail(params).then((rs: ExtensionFundAccountTransferDetailResponse) => { + extensionFundAccountResultDetail(params).then((rs: ExtensionFundAccountResultDetailResponse) => { setDetail(rs); }); }; @@ -42,29 +43,13 @@ export const FundAccountResultDetailPage = () => { useSetHeaderType(HeaderType.LeftArrow); useSetFooterMode(false); useSetOnBack(() => { - navigate(PATHS.additionalService.fundAccount.transferList); + navigate(PATHS.additionalService.fundAccount.resultList); }); useEffect(() => { callDetail(); }, []); - const onClickToRequest = () =>{ - let params: ExtensionFundAccountTransferRequestParams = { - mid: mid, - transferAmount: detail?.transferAmount, - receiveBankCode: detail?.receiveBankName, - receiveAccountNo: detail?.receiveAccountNo, - receiveAccountName: detail?.receiveAccountName, - transferMemo: '' - }; - extensionFundAccountTransferRequest(params).then((rs: ExtensionFundAccountTransferRequestResponse) => { - console.log(rs) - alert(rs.message); - navigate(PATHS.additionalService.fundAccount.transferList); - }); - }; - return ( <>
@@ -81,29 +66,29 @@ export const FundAccountResultDetailPage = () => { >
-
나이스테스트가맹점
-
2025.08.19
+
{ detail?.receiveAccountName }({ detail?.receiveAccountNo })
+
{ moment(detail?.processDate).format('YYYY.MM.DD') }
상세 정보
  • - 등록일시 + 요청일시 { moment(detail?.processDate).format('YYYY.MM.DD') }
  • - 처리결과 - { detail?.status } -
    • -
  • - 요청일자 + 이체일시 { moment(detail?.requestDate).format('YYYY.MM.DD') }
  • 이체결과 { detail?.status }
    • +
  • + 실패사유 + { detail?.failReason } +
  • 수취인명 { detail?.receiveAccountName } @@ -120,15 +105,16 @@ export const FundAccountResultDetailPage = () => { MID { mid }
    • - +
  • + 주문번호 + { '주문번호' } +
    • +
  • + TID + { detail?.bankTid } +
-
- -
diff --git a/src/pages/additional-service/fund-account/transfer-detail-page.tsx b/src/pages/additional-service/fund-account/transfer-detail-page.tsx index b167dab..a88f4e8 100644 --- a/src/pages/additional-service/fund-account/transfer-detail-page.tsx +++ b/src/pages/additional-service/fund-account/transfer-detail-page.tsx @@ -81,8 +81,8 @@ export const FundAccountTransferDetailPage = () => { > -
나이스테스트가맹점
-
2025.08.19
+
{ detail?.receiveAccountName }({ detail?.receiveAccountNo })
+
{ moment(detail?.processDate).format('YYYY.MM.DD') }