diff --git a/src/entities/additional-service/model/sms-payment/types.ts b/src/entities/additional-service/model/sms-payment/types.ts index c81b119..d8fd13c 100644 --- a/src/entities/additional-service/model/sms-payment/types.ts +++ b/src/entities/additional-service/model/sms-payment/types.ts @@ -23,7 +23,7 @@ export interface SmsPaymentListItem { export interface SmsPaymentListProps { listItems: Record>; mid: string; - onResendClick?: () => void; + onResendClick?: (mid: string, tid: string) => void; } export interface SmsPaymentFilterProps extends FilterProps { @@ -85,3 +85,9 @@ export interface ExtensionSmsResendParams extends ExtensionRequestParams { export interface ExtensionSmsResendResponse { status: boolean; } + +export interface SmsPaymentDetailResendProps { + bottomSmsPaymentDetailResendOn: boolean; + setBottomSmsPaymentDetailResendOn: (bottomSmsPaymentDetailResendOn: boolean) => void; + smsDetailData: ExtensionSmsDetailResponse | null; +} diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index 285b8e3..0cbfddd 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -4,6 +4,7 @@ import { FundAccountTransferContentItem, FundAccountResultContentItem } from './ import { ArsListContent } from './ars/types'; import { AlimtalkListContent } from './alimtalk/types'; import { SmsPaymentListItem } from './sms-payment/types'; +import type { ExtensionSmsDetailResponse } from './sms-payment/types'; // ======================================== // 공통 Enums 및 타입들 @@ -398,7 +399,7 @@ export interface ListItemProps extends ArsListContent, AlimtalkListContent { additionalServiceCategory?: AdditionalServiceCategory; mid?: string; - onResendClick?: () => void; + onResendClick?: (mid: string, tid: string) => void; } export interface ListDateGroupProps { @@ -406,7 +407,7 @@ export interface ListDateGroupProps { date?: string; items?: Array; mid?: string; - onResendClick?: () => void; + onResendClick?: (mid: string, tid: string) => void; } export interface AdditionalServiceListProps { @@ -773,13 +774,6 @@ export interface ExtensionSmsDetailParams extends ExtensionRequestParams { tid: string; } -export interface ExtensionSmsDetailResponse { - senderNumber: string; - senderName: string; - receiverNumber: string; - receiverName: string; - sendMessage: string; -} // ======================================== @@ -826,7 +820,3 @@ export interface ArsCardPaymentFinishProps { setRequestSuccess: (requestSuccess: boolean) => void; } -export interface SmsPaymentDetailResendProps { - bottomSmsPaymentDetailResendOn: boolean; - setBottomSmsPaymentDetailResendOn: (bottomSmsPaymentDetailResendOn: boolean) => void; -} \ No newline at end of file diff --git a/src/entities/additional-service/ui/account-holder-search/filter/account-holder-search-filter.tsx b/src/entities/additional-service/ui/account-holder-search/filter/account-holder-search-filter.tsx index 3cc3081..1624046 100644 --- a/src/entities/additional-service/ui/account-holder-search/filter/account-holder-search-filter.tsx +++ b/src/entities/additional-service/ui/account-holder-search/filter/account-holder-search-filter.tsx @@ -120,17 +120,17 @@ export const AccountHolderSearchFilter = ({ diff --git a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx index 9b84abd..814be91 100644 --- a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx +++ b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx @@ -105,7 +105,7 @@ export const KeyInPaymentFilter = ({ {sendCl} ); } - else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick) { + else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick && tid) { rs.push(
onResendClick()} + onClick={() => mid && tid && onResendClick(mid, tid)} >{'재발송'}
) } diff --git a/src/entities/additional-service/ui/sms-payment/sms-payment-detail-resend.tsx b/src/entities/additional-service/ui/sms-payment/sms-payment-detail-resend.tsx index 91bd938..ceb17cd 100644 --- a/src/entities/additional-service/ui/sms-payment/sms-payment-detail-resend.tsx +++ b/src/entities/additional-service/ui/sms-payment/sms-payment-detail-resend.tsx @@ -1,10 +1,11 @@ import { motion } from 'framer-motion'; import { IMAGE_ROOT } from '@/shared/constants/common'; -import { SmsPaymentDetailResendProps } from '../../model/types'; +import { SmsPaymentDetailResendProps } from '../../../additional-service/model/sms-payment/types'; export const SmsPaymentDetailResend = ({ bottomSmsPaymentDetailResendOn, - setBottomSmsPaymentDetailResendOn + setBottomSmsPaymentDetailResendOn, + smsDetailData }: SmsPaymentDetailResendProps) => { const variants = { @@ -44,11 +45,11 @@ export const SmsPaymentDetailResend = ({
-
발신자(번호) : 유앤아이피부과(16610808)
-
수신자(번호) : 김*환(010****7000)
+
발신자(번호) : {smsDetailData?.senderName || '-'}({smsDetailData?.senderNumber || '-'})
+
수신자(번호) : {smsDetailData?.receiverName || '-'}({smsDetailData?.receiverNumber || '-'})
-

[유앤아이피부과]김*환님, 신한은행 110322141414 (300원 06/08 입금완료)

+

{smsDetailData?.sendMessage || '-'}

diff --git a/src/entities/additional-service/ui/sms-payment/sms-payment-filter.tsx b/src/entities/additional-service/ui/sms-payment/sms-payment-filter.tsx index cac34d0..93135f8 100644 --- a/src/entities/additional-service/ui/sms-payment/sms-payment-filter.tsx +++ b/src/entities/additional-service/ui/sms-payment/sms-payment-filter.tsx @@ -102,17 +102,17 @@ export const SmsPaymentFilter = ({ { @@ -26,14 +27,17 @@ export const SmsPaymentPage = () => { const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [filterOn, setFilterOn] = useState(false); const [mid, setMid] = useState('nictest001m'); + const [tid, setTid] = useState(''); const [searchCl, setSearchCl] = useState(SmsPaymentSearchType.BUYER_NAME) const [searchValue, setSearchValue] = useState('') const [fromDate, setFromDate] = useState(moment().format('YYYY-MM-DD')); const [toDate, setToDate] = useState(moment().format('YYYY-MM-DD')); const [smsCl, setSmsCl] = useState(SmsType.ALL); + const [smsDetailData, setSmsDetailData] = useState(null); const { mutateAsync: smsPaymentList } = useExtensionSmsListMutation(); const { mutateAsync: downloadExcel } = useExtensionSmsDownloadExcelMutation(); + const { mutateAsync: detail } = useExtensionSmsDetailMutation(); useSetHeaderTitle('SMS 결제 통보'); useSetHeaderType(HeaderType.LeftArrow); @@ -79,6 +83,17 @@ export const SmsPaymentPage = () => { return data; }; + const callDetail = (selectedMid: string, selectedTid: string) => { + console.log("Selected Mid: ", selectedMid, "Selected Tid: ", selectedTid) + detail({ + mid: selectedMid, + tid: selectedTid + }).then((rs) => { + console.log('Detail info : ', rs) + setSmsDetailData(rs); + }) + } + const onClickToDownloadExcel = () => { downloadExcel({ mid: mid, @@ -103,7 +118,9 @@ export const SmsPaymentPage = () => { }; - const onClickToShowDetail = () => { + const onClickToShowDetail = (selectedMid: string, selectedTid: string) => { + setTid(selectedTid); + callDetail(selectedMid, selectedTid); setBottomSmsPaymentDetailResendOn(true); }; @@ -161,6 +178,7 @@ export const SmsPaymentPage = () => {