자금이체 끝 2

This commit is contained in:
focp212@naver.com
2025-09-23 16:55:33 +09:00
parent 15daea0f6b
commit b92d7c6a44
5 changed files with 75 additions and 50 deletions

View File

@@ -137,7 +137,7 @@ export const FundAccountResultListWrap = () => {
for (const [key, value] of Object.entries(listItems)) { for (const [key, value] of Object.entries(listItems)) {
rs.push( rs.push(
<ListDateGroup <ListDateGroup
additionalServiceCategory={ AdditionalServiceCategory.FundAccount } additionalServiceCategory={ AdditionalServiceCategory.FundAccountResult }
mid={ mid } mid={ mid }
key={ key } key={ key }
date={ key } date={ key }

View File

@@ -132,7 +132,7 @@ export const FundAccountTransferListWrap = () => {
for (const [key, value] of Object.entries(listItems)) { for (const [key, value] of Object.entries(listItems)) {
rs.push( rs.push(
<ListDateGroup <ListDateGroup
additionalServiceCategory={ AdditionalServiceCategory.FundAccount } additionalServiceCategory={ AdditionalServiceCategory.FundAccountTransfer }
mid={ mid } mid={ mid }
key={ key } key={ key }
date={ key } date={ key }
@@ -252,6 +252,6 @@ export const FundAccountTransferListWrap = () => {
setReceiveBankCode={ setReceiveBankCode } setReceiveBankCode={ setReceiveBankCode }
setStatus={ setStatus } setStatus={ setStatus }
></FundAccountTransactionFilter> ></FundAccountTransactionFilter>
</> </>
); );
}; };

View File

@@ -141,7 +141,7 @@ export const ListItem = ({
} }
}); });
} }
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) { else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
navigate(PATHS.additionalService.fundAccount.transferDetail, { navigate(PATHS.additionalService.fundAccount.transferDetail, {
state: { state: {
additionalServiceCategory: additionalServiceCategory, 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) { else if (additionalServiceCategory === AdditionalServiceCategory.SettlementAgency) {
} }
@@ -181,7 +190,10 @@ export const ListItem = ({
let time = requestDate?.substring(8, 14); let time = requestDate?.substring(8, 14);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4) + ':' + time?.substring(4, 6); 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'); timeStr = moment(requestDate).format('mm:ss');
} }
else { else {
@@ -213,7 +225,10 @@ export const ListItem = ({
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) { else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
str = companyName; str = companyName;
} }
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){ else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
str = `${receiveAccountName}(${receiveAccountNo})`
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
str = `${receiveAccountName}(${receiveAccountNo})` str = `${receiveAccountName}(${receiveAccountNo})`
} }
@@ -288,7 +303,16 @@ export const ListItem = ({
</div> </div>
); );
} }
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccount){ else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span className="separator">|</span>
<span>{ status }</span>
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
rs.push( rs.push(
<div className="transaction-details"> <div className="transaction-details">
<span>{ getTime() }</span> <span>{ getTime() }</span>
@@ -357,7 +381,22 @@ export const ListItem = ({
</div> </div>
); );
} }
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccount) { else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer) {
rs.push(
<div
key="payout-item-amount"
className="transaction-amount"
>
<NumericFormat
value={transferAmount}
thousandSeparator
displayType="text"
suffix='원'
></NumericFormat>
</div>
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
rs.push( rs.push(
<div <div
key="payout-item-amount" key="payout-item-amount"

View File

@@ -10,10 +10,12 @@ import {
import { useLocation } from 'react-router'; import { useLocation } from 'react-router';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { NumericFormat } from 'react-number-format'; import { NumericFormat } from 'react-number-format';
import { useExtensionFundAccountTransferDetailMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-transfer-detail-mutation'; import {
import { ExtensionFundAccountTransferDetailParams, ExtensionFundAccountTransferDetailResponse, ExtensionFundAccountTransferRequestParams, ExtensionFundAccountTransferRequestResponse } from '@/entities/additional-service/model/fund-account/types'; ExtensionFundAccountResultDetailParams,
ExtensionFundAccountResultDetailResponse,
} from '@/entities/additional-service/model/fund-account/types';
import moment from 'moment'; import moment from 'moment';
import { useExtensionFundAccountTransferRequestMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-transfer-request-mutation'; import { useExtensionFundAccountResultDetailMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-result-detail-mutation';
export const FundAccountResultDetailPage = () => { export const FundAccountResultDetailPage = () => {
const { navigate } = useNavigate(); const { navigate } = useNavigate();
@@ -22,18 +24,17 @@ export const FundAccountResultDetailPage = () => {
const tid = location.state.tid; const tid = location.state.tid;
const mid = location.state.mid; const mid = location.state.mid;
const [detail, setDetail] = useState<ExtensionFundAccountTransferDetailResponse>(); const [detail, setDetail] = useState<ExtensionFundAccountResultDetailResponse>();
const { mutateAsync: extensionFundAccountTransferDetail } = useExtensionFundAccountTransferDetailMutation(); const { mutateAsync: extensionFundAccountResultDetail } = useExtensionFundAccountResultDetailMutation();
const { mutateAsync: extensionFundAccountTransferRequest } = useExtensionFundAccountTransferRequestMutation();
const callDetail = () => { const callDetail = () => {
let params: ExtensionFundAccountTransferDetailParams = { let params: ExtensionFundAccountResultDetailParams = {
tid: tid, tid: tid,
mid: mid, mid: mid,
}; };
extensionFundAccountTransferDetail(params).then((rs: ExtensionFundAccountTransferDetailResponse) => { extensionFundAccountResultDetail(params).then((rs: ExtensionFundAccountResultDetailResponse) => {
setDetail(rs); setDetail(rs);
}); });
}; };
@@ -42,29 +43,13 @@ export const FundAccountResultDetailPage = () => {
useSetHeaderType(HeaderType.LeftArrow); useSetHeaderType(HeaderType.LeftArrow);
useSetFooterMode(false); useSetFooterMode(false);
useSetOnBack(() => { useSetOnBack(() => {
navigate(PATHS.additionalService.fundAccount.transferList); navigate(PATHS.additionalService.fundAccount.resultList);
}); });
useEffect(() => { useEffect(() => {
callDetail(); 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 ( return (
<> <>
<main className="full-height"> <main className="full-height">
@@ -81,29 +66,29 @@ export const FundAccountResultDetailPage = () => {
></NumericFormat> ></NumericFormat>
</span> </span>
</div> </div>
<div className="num-store"></div> <div className="num-store">{ detail?.receiveAccountName }({ detail?.receiveAccountNo })</div>
<div className="num-day">2025.08.19</div> <div className="num-day">{ moment(detail?.processDate).format('YYYY.MM.DD') }</div>
</div> </div>
<div className="detail-divider"></div> <div className="detail-divider"></div>
<div className="pay-detail"> <div className="pay-detail">
<div className="detail-title"> </div> <div className="detail-title"> </div>
<ul className="kv-list"> <ul className="kv-list">
<li className="kv-row"> <li className="kv-row">
<span className="k"></span> <span className="k"></span>
<span className="v">{ moment(detail?.processDate).format('YYYY.MM.DD') }</span> <span className="v">{ moment(detail?.processDate).format('YYYY.MM.DD') }</span>
</li> </li>
<li className="kv-row"> <li className="kv-row">
<span className="k"></span> <span className="k"></span>
<span className="v">{ detail?.status }</span>
</li>
<li className="kv-row">
<span className="k"></span>
<span className="v">{ moment(detail?.requestDate).format('YYYY.MM.DD') }</span> <span className="v">{ moment(detail?.requestDate).format('YYYY.MM.DD') }</span>
</li> </li>
<li className="kv-row"> <li className="kv-row">
<span className="k"></span> <span className="k"></span>
<span className="v">{ detail?.status }</span> <span className="v">{ detail?.status }</span>
</li> </li>
<li className="kv-row">
<span className="k"></span>
<span className="v">{ detail?.failReason }</span>
</li>
<li className="kv-row"> <li className="kv-row">
<span className="k"></span> <span className="k"></span>
<span className="v">{ detail?.receiveAccountName }</span> <span className="v">{ detail?.receiveAccountName }</span>
@@ -120,15 +105,16 @@ export const FundAccountResultDetailPage = () => {
<span className="k">MID</span> <span className="k">MID</span>
<span className="v">{ mid }</span> <span className="v">{ mid }</span>
</li> </li>
<li className="kv-row">
<span className="k"></span>
<span className="v">{ '주문번호' }</span>
</li>
<li className="kv-row">
<span className="k">TID</span>
<span className="v">{ detail?.bankTid }</span>
</li>
</ul> </ul>
</div> </div>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={ () => onClickToRequest() }
> </button>
</div>
</div> </div>
</div> </div>
</main> </main>

View File

@@ -81,8 +81,8 @@ export const FundAccountTransferDetailPage = () => {
></NumericFormat> ></NumericFormat>
</span> </span>
</div> </div>
<div className="num-store"></div> <div className="num-store">{ detail?.receiveAccountName }({ detail?.receiveAccountNo })</div>
<div className="num-day">2025.08.19</div> <div className="num-day">{ moment(detail?.processDate).format('YYYY.MM.DD') }</div>
</div> </div>
<div className="detail-divider"></div> <div className="detail-divider"></div>
<div className="pay-detail"> <div className="pay-detail">