diff --git a/src/entities/additional-service/model/fund-account/types.ts b/src/entities/additional-service/model/fund-account/types.ts index f43a48a..f962305 100644 --- a/src/entities/additional-service/model/fund-account/types.ts +++ b/src/entities/additional-service/model/fund-account/types.ts @@ -181,7 +181,7 @@ export interface ExtensionFundAccountResultDetailResponse { accountName: string; accountNo: string; applicationDate: string; - requsetDate: string; + requestDate: string; resultMessage: string; failReason: string; bankName: string; 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 66751a5..d3063e0 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 @@ -36,8 +36,7 @@ export const FundAccountResultListWrap = () => { const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); const [bankCode, setBankCode] = useState(''); const [resultStatus, setResultStatus] = useState(FundAccountResultStatus.ALL); - - const [email, setEmail] = useState(''); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); const [totalRequestCount, setTotalRequestCount] = useState(0); const [totalRequestAmount, setTotalRequestAmount] = useState(0); @@ -79,18 +78,6 @@ export const FundAccountResultListWrap = () => { }; - const callDownloadExcel = () => { - let params: ExtensionFundAccountResultExcelParams = { - mid: mid, - email: email, - searchDateType: searchDateType, - fromDate: fromDate, - toDate: toDate, - }; - extensionFundAccountResultExcel(params).then((rs: ExtensionFundAccountResultExcelResponse) => { - - }); - }; const callSummary = () => { let params: ExtensionFundAccountResultSummaryParams = { mid: mid @@ -106,8 +93,24 @@ export const FundAccountResultListWrap = () => { }); }; - const onClickToDownloadExcel = () => { - callDownloadExcel(); + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); + }; + + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + let params: ExtensionFundAccountResultExcelParams = { + mid: mid, + email: selectedEmail, + searchDateType: searchDateType, + fromDate: fromDate, + toDate: toDate, + }; + extensionFundAccountResultExcel(params).then((rs: ExtensionFundAccountResultExcelResponse) => { + console.log('Excel Download Status:', rs); + }); + } + setEmailBottomSheetOn(false); }; const onClickToOpenFilter = () => { @@ -141,17 +144,18 @@ export const FundAccountResultListWrap = () => { date = requestDate; } if (date !== requestDate) { - date = requestDate; if (list.length > 0) { rs.push( ); } + date = requestDate; list = []; } list.push(items); @@ -219,7 +223,7 @@ export const FundAccountResultListWrap = () => { @@ -211,6 +218,13 @@ export const LinkPaymentHistoryWrap = () => { setSendStatus={setSendStatus} setSendMethod={setSendMethod} > + ); } \ No newline at end of file diff --git a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx index 630ca65..1977dfa 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx @@ -34,8 +34,8 @@ export const LinkPaymentWaitSendWrap = () => { const [processStatus, setProcessStatus] = useState(LinkPaymentProcessStatus.ALL); const [listItems, setListItems] = useState>([]); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); - const [email, setEmail] = useState(''); const { mutateAsync: pendingSendList } = useExtensionLinkPayWaitListMutation(); const { mutateAsync: downloadExcel } = useExtensionLinkPayWaitDownloadExcelMutation(); @@ -71,19 +71,26 @@ export const LinkPaymentWaitSendWrap = () => { }); }; - const onClickToDownloadExcel = () => { - downloadExcel({ - mid: mid, - email: email, - searchCl: searchType, - searchValue: searchValue, - fromDate: startDate, - toDate: endDate, - sendMethod: sendMethod, - processStatus: processStatus, - }).then((rs) => { - console.log('Excel Dowload Status : ' + rs.status); - }); + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); + }; + + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + downloadExcel({ + mid: mid, + //email: selectedEmail, + searchCl: searchType, + searchValue: searchValue, + fromDate: startDate, + toDate: endDate, + sendMethod: sendMethod, + processStatus: processStatus, + }).then((rs) => { + console.log('Excel Download Status: ' + rs.status); + }); + } + setEmailBottomSheetOn(false); }; const onClickToSort = (sort: SortTypeKeys) => { @@ -135,11 +142,11 @@ export const LinkPaymentWaitSendWrap = () => { @@ -194,6 +201,13 @@ export const LinkPaymentWaitSendWrap = () => { setSendMethod={setSendMethod} setProcessStatus={setProcessStatus} > + ); } \ 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 0097b8b..3a8fb98 100644 --- a/src/entities/additional-service/ui/list-item.tsx +++ b/src/entities/additional-service/ui/list-item.tsx @@ -266,6 +266,8 @@ export const ListItem = ({ else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) { if (applicationDate && applicationDate.length >= 12) { timeStr = applicationDate.substring(8, 10) + ':' + applicationDate.substring(10, 12); + } else { + timeStr = requestDate?.substring(8,10) + ':' + requestDate?.substring(10, 12); } } else if (additionalServiceCategory === AdditionalServiceCategory.Ars) { diff --git a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx index f4c0c61..a825f09 100644 --- a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx +++ b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx @@ -69,16 +69,6 @@ export const AccountHolderAuthPage = () => { }); }; - const onClickToDownloadExcel = () => { - downloadExcel({ - mid: mid, - fromDate: fromDate, - toDate: toDate, - authStatus: authStatus - }).then((rs) => { - console.log('Excel Downlaod Status : ' + rs.status); - }); - } const onClickToOpenFilter = () => { setFilterOn(!filterOn); @@ -155,11 +145,12 @@ export const AccountHolderAuthPage = () => { diff --git a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx index 872ff99..08a6023 100644 --- a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx +++ b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx @@ -40,7 +40,6 @@ export const AccountHolderSearchPage = () => { const [bank, setBank] = useState(''); const [processResult, setProcessResult] = useState(ProcessResult.ALL); const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); - const [email, setEmail] = useState(''); useSetHeaderTitle('계좌성명조회'); useSetHeaderType(HeaderType.LeftArrow); @@ -87,8 +86,6 @@ export const AccountHolderSearchPage = () => { const onSendRequest = (selectedEmail?: string) => { if (selectedEmail) { - - // 이메일을 설정한 후 다운로드 실행 downloadExcel({ mid: mid, //email: selectedEmail, @@ -105,20 +102,6 @@ export const AccountHolderSearchPage = () => { setEmailBottomSheetOn(false); }; - const onClickToDownloadExcel = () => { - downloadExcel({ - mid: mid, - searchCl: searchType, - searchValue: searchKeyword, - fromDate: startDate, - toDate: endDate, - bankCode: bank, - resultStatus: processResult - }).then((rs) => { - console.log('Excel Dowload Status : ' + rs.status); - }); - }; - const onClickToSort = (sort: SortTypeKeys) => { setSortType(sort); callList({ diff --git a/src/pages/additional-service/ars/list-page.tsx b/src/pages/additional-service/ars/list-page.tsx index d90381b..542d614 100644 --- a/src/pages/additional-service/ars/list-page.tsx +++ b/src/pages/additional-service/ars/list-page.tsx @@ -20,6 +20,7 @@ import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; import { ArsPaymentStatusBtnGroup } from '@/entities/additional-service/model/ars/constant'; import { ArsFilter } from '@/entities/additional-service/ui/filter/ars-filter'; import { useStore } from '@/shared/model/store'; +import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; export const ArsListPage = () => { const { navigate } = useNavigate(); @@ -38,6 +39,7 @@ export const ArsListPage = () => { const [orderStatus, setOrderStatus] = useState(OrderStatus.ALL); const [minAmount, setMinAmount] = useState(); const [maxAmount, setMaxAmount] = useState(); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); const { mutateAsync: extensionArsList } = useExtensionArsListMutation(); const { mutateAsync: extensionArsDownloadExcel } = useExtensionArsDownloadExcelMutation(); @@ -75,20 +77,28 @@ export const ArsListPage = () => { }); }; - const callDownloadExcel = () => { - let params: ExtensionArsDownloadExcelParams = { - mid: mid, - moid: moid, - fromDate: fromDate, - toDate: toDate, - paymentStatus: paymentStatus, - orderStatus: orderStatus, - minAmount: minAmount, - maxAmount: maxAmount, - }; - extensionArsDownloadExcel(params).then((rs: ExtensionArsDownloadExcelResponse) => { + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); + }; - }); + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + const params: ExtensionArsDownloadExcelParams = { + mid: mid, + moid: moid, + fromDate: fromDate, + toDate: toDate, + paymentStatus: paymentStatus, + orderStatus: orderStatus, + minAmount: minAmount, + maxAmount: maxAmount, + //email: selectedEmail + }; + extensionArsDownloadExcel(params).then((rs: ExtensionArsDownloadExcelResponse) => { + console.log('Excel Download Status:', rs); + }); + } + setEmailBottomSheetOn(false); }; const onClickToNavigate = () => { @@ -96,10 +106,6 @@ export const ArsListPage = () => { state: { mid } }); }; - - const onClickToDownloadExcel = () => { - callDownloadExcel(); - }; const onClickToOpenFilter = () => { setFilterOn(!filterOn); }; @@ -206,7 +212,7 @@ export const ArsListPage = () => { @@ -199,6 +210,13 @@ export const FaceAuthPage = () => { setTransactionType={setTransactionType} setProcessResult={setProcessResult} /> + ); }; \ No newline at end of file diff --git a/src/pages/additional-service/fund-account/result-detail-page.tsx b/src/pages/additional-service/fund-account/result-detail-page.tsx index 20eb1b9..2e1c9a9 100644 --- a/src/pages/additional-service/fund-account/result-detail-page.tsx +++ b/src/pages/additional-service/fund-account/result-detail-page.tsx @@ -19,6 +19,7 @@ import { import moment from 'moment'; import { useExtensionFundAccountResultDetailMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-result-detail-mutation'; import { useExtensionFundAccountDownloadReceiptMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-download-certificate-mutation'; +import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; export const FundAccountResultDetailPage = () => { const { navigate } = useNavigate(); @@ -28,7 +29,7 @@ export const FundAccountResultDetailPage = () => { const mid = location.state.mid; const [detail, setDetail] = useState(); - const [email, setEmail] = useState(''); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); const { mutateAsync: extensionFundAccountResultDetail } = useExtensionFundAccountResultDetailMutation(); const { mutateAsync: extensionFundAccountDownlaodReceipt } = useExtensionFundAccountDownloadReceiptMutation(); @@ -40,19 +41,27 @@ export const FundAccountResultDetailPage = () => { }; extensionFundAccountResultDetail(params).then((rs: ExtensionFundAccountResultDetailResponse) => { + console.log(rs.requestDate) setDetail(rs); }); }; - const onClickToDownload = () => { - let params: ExtensionFundAccountDownloadReceiptParams = { - mid: mid, - tid: tid, - email: email - }; - extensionFundAccountDownlaodReceipt(params).then((rs: ExtensionFundAccountDownloadReceiptResponse) => { - console.log(rs); - }); + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); + }; + + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + let params: ExtensionFundAccountDownloadReceiptParams = { + mid: mid, + tid: tid, + email: selectedEmail + }; + extensionFundAccountDownlaodReceipt(params).then((rs: ExtensionFundAccountDownloadReceiptResponse) => { + console.log('Receipt Download Status:', rs); + }); + } + setEmailBottomSheetOn(false); }; useSetHeaderTitle('자금이체 상세'); @@ -64,6 +73,7 @@ export const FundAccountResultDetailPage = () => { useEffect(() => { callDetail(); + console.log(detail?.requestDate) }, []); return ( @@ -83,7 +93,9 @@ export const FundAccountResultDetailPage = () => {
{detail?.accountName}({detail?.accountNo})
-
{moment(detail?.applicationDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss')}
+ {detail?.applicationDate && ( +
{moment(detail?.applicationDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss')}
+ )} {/* ✅ resultMessage가 "정상"일 때만 표시 */} {detail?.resultMessage === '정상' && ( @@ -91,7 +103,7 @@ export const FundAccountResultDetailPage = () => { @@ -210,6 +220,13 @@ export const KeyInPaymentPage = () => { setMinAmount={setMinAmount} setMaxAmount={setMaxAmount} > + ); }; \ No newline at end of file diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 5f6f5a2..3249a68 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -28,6 +28,7 @@ import { PayoutDisbursementStatusBtnGroup } from '@/entities/additional-service/ import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group'; import { AdditionalServiceCategory } from '@/entities/additional-service/model/types'; import { useStore } from '@/shared/model/store'; +import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; export const PayoutListPage = () => { const { navigate } = useNavigate(); @@ -44,6 +45,7 @@ export const PayoutListPage = () => { const [status, setStatus] = useState(PayoutDisbursementStatus.ALL); const [minAmount, setMinAmount] = useState(0); const [maxAmount, setMaxAmount] = useState(50000000); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); const { mutateAsync: extensionPayoutList } = useExtensionPayoutListMutation(); const { mutateAsync: extensionPayoutExcel } = useExtensionPayoutExcelMutation(); @@ -92,23 +94,27 @@ export const PayoutListPage = () => { }); }; - const callDownloadExcel = () => { - let params: ExtensionPayoutExcelParams = { - mid: mid, - searchDateType: searchDateType, - fromDate: fromDate, - toDate: toDate, - status: status, - minAmount: minAmount, - maxAmount: maxAmount, - }; - extensionPayoutExcel(params).then((rs: ExtensionPayoutExcelResponse) => { - - }); + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); }; - const onClickToDownloadExcel = () => { - callDownloadExcel(); + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + const params: ExtensionPayoutExcelParams = { + mid: mid, + searchDateType: searchDateType, + fromDate: fromDate, + toDate: toDate, + status: status, + minAmount: minAmount, + maxAmount: maxAmount, + //email: selectedEmail + }; + extensionPayoutExcel(params).then((rs: ExtensionPayoutExcelResponse) => { + console.log('Excel Download Status:', rs); + }); + } + setEmailBottomSheetOn(false); }; const onClickToOpenFilter = () => { setFilterOn(!filterOn); @@ -211,13 +217,13 @@ export const PayoutListPage = () => { /> - @@ -283,6 +289,13 @@ export const PayoutListPage = () => { setMinAmount={ setMinAmount } setMaxAmount={ setMaxAmount } > + ); }; \ No newline at end of file diff --git a/src/pages/additional-service/sms-payment/sms-payment-page.tsx b/src/pages/additional-service/sms-payment/sms-payment-page.tsx index 2237f37..3fd83a8 100644 --- a/src/pages/additional-service/sms-payment/sms-payment-page.tsx +++ b/src/pages/additional-service/sms-payment/sms-payment-page.tsx @@ -20,6 +20,7 @@ import { useExtensionSmsDetailMutation } from '@/entities/additional-service/api import { useStore } from '@/shared/model/store'; import { AdditionalServiceCategory } from '@/entities/additional-service/model/types'; import { PATHS } from '@/shared/constants/paths'; +import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; export const SmsPaymentPage = () => { @@ -41,6 +42,7 @@ export const SmsPaymentPage = () => { const [toDate, setToDate] = useState(moment().format('YYYYMMDD')); const [smsCl, setSmsCl] = useState(SmsCl.ALL); const [smsDetailData, setSmsDetailData] = useState(null); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); const { mutateAsync: smsPaymentList } = useExtensionSmsListMutation(); const { mutateAsync: downloadExcel } = useExtensionSmsDownloadExcelMutation(); @@ -85,18 +87,26 @@ export const SmsPaymentPage = () => { }) } - const onClickToDownloadExcel = () => { - downloadExcel({ - mid: mid, - searchCl: searchCl, - searchValue: searchValue, - fromDate: fromDate, - toDate: toDate, - smsCl: smsCl, - }).then((rs) => { - console.log('Excel Dowload Status : ' + rs.status); - }); - } + const onClickToOpenEmailBottomSheet = () => { + setEmailBottomSheetOn(true); + }; + + const onSendRequest = (selectedEmail?: string) => { + if (selectedEmail) { + downloadExcel({ + mid: mid, + searchCl: searchCl, + searchValue: searchValue, + fromDate: fromDate, + toDate: toDate, + smsCl: smsCl, + //email: selectedEmail + }).then((rs) => { + console.log('Excel Download Status:', rs.status); + }); + } + setEmailBottomSheetOn(false); + }; const onClickToOpenFilter = () => { setFilterOn(!filterOn); @@ -153,7 +163,7 @@ export const SmsPaymentPage = () => { 다운로드 onClickToDownloadExcel()} + onClick={() => onClickToOpenEmailBottomSheet()} /> @@ -193,6 +203,13 @@ export const SmsPaymentPage = () => { setToDate={setToDate} setSmsCl={setSmsCl} > + ); }; \ No newline at end of file