From f1f38551fa5e85cb6add52dcbe93f0319ec8a9c2 Mon Sep 17 00:00:00 2001 From: HyeonJongKim Date: Wed, 5 Nov 2025 17:18:58 +0900 Subject: [PATCH] =?UTF-8?q?-Key=20In=20=EA=B2=B0=EC=A0=9C=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=B9=B4=EB=93=9C=EB=B2=88=ED=98=B8=204=EC=9E=90?= =?UTF-8?q?=20=EC=A0=9C=ED=95=9C=20-=20SMS=20=EA=B2=B0=EC=A0=9C=ED=86=B5?= =?UTF-8?q?=EB=B3=B4=20=ED=95=84=EB=93=9C=20=EB=B3=80=EA=B2=BD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/sms-payment/types.ts | 21 +++++++---------- .../additional-service/model/types.ts | 4 ++-- .../additional-service/ui/list-item.tsx | 2 +- .../sms-payment/sms-payment-detail-resend.tsx | 9 ++++---- .../key-in-payment/requeset-page.tsx | 10 ++++++-- .../sms-payment/sms-payment-page.tsx | 23 +++++++------------ 6 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/entities/additional-service/model/sms-payment/types.ts b/src/entities/additional-service/model/sms-payment/types.ts index 5b7f564..8fcf328 100644 --- a/src/entities/additional-service/model/sms-payment/types.ts +++ b/src/entities/additional-service/model/sms-payment/types.ts @@ -15,6 +15,7 @@ export enum SmsPaymentSearchCl { export interface SmsPaymentListItem { mid?: string; tid?: string; + seq?: number; buyerName?: string; buyerPhoneLast4?: string; sendDate?: string; @@ -28,7 +29,7 @@ export interface SmsPaymentListProps { listItems: Array; additionalServiceCategory: AdditionalServiceCategory; mid: string; - onResendClick?: (mid: string, tid: string) => void; + onResendClick?: (seq: number) => void; } export interface SmsPaymentFilterProps extends FilterProps { @@ -71,24 +72,18 @@ export interface ExtensionSmsDetailResponse { sendMessage: string; } -export interface ExtensionSmsResendParams extends ExtensionRequestParams { - tid: string; - sendMessage: string; -} - - export interface SmsPaymentDetailResendProps { bottomSmsPaymentDetailResendOn: boolean; setBottomSmsPaymentDetailResendOn: (bottomSmsPaymentDetailResendOn: boolean) => void; smsDetailData: ExtensionSmsDetailResponse | null; - mid: string; - tid: string; + seq: number; } // SMS 결제알림 확장 서비스 // ======================================== -export interface ExtensionSmsResendParams extends ExtensionRequestParams { - tid: string; +export interface ExtensionSmsResendParams { + seq: number; + sendMessage: string; } export interface ExtensionSmsResendResponse { @@ -139,6 +134,6 @@ export interface ExtensionSmsDownloadExcelResponse { } -export interface ExtensionSmsDetailParams extends ExtensionRequestParams { - tid: string; +export interface ExtensionSmsDetailParams { + seq: number; } \ No newline at end of file diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index b899549..8abd012 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -195,7 +195,7 @@ export interface ListItemProps extends additionalServiceCategory?: AdditionalServiceCategory; mid?: string; seq?: number; - onResendClick?: (mid: string, tid: string) => void; + onResendClick?: (seq: number) => void; setDetailData?: (detailData: DetailData) => void; } @@ -204,7 +204,7 @@ export interface ListDateGroupProps { date?: string; items?: Array; mid?: string; - onResendClick?: (mid: string, tid: string) => void; + onResendClick?: (seq: number) => void; setDetailData?: (detailData: DetailData) => void; } diff --git a/src/entities/additional-service/ui/list-item.tsx b/src/entities/additional-service/ui/list-item.tsx index 80fe12b..cbadc04 100644 --- a/src/entities/additional-service/ui/list-item.tsx +++ b/src/entities/additional-service/ui/list-item.tsx @@ -608,7 +608,7 @@ export const ListItem = ({
mid && onResendClick(mid, tid || '')} + onClick={() => seq && onResendClick(seq)} >{t('additionalService.common.resend')}
) } 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 ea4a4f3..9007807 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 @@ -10,8 +10,7 @@ export const SmsPaymentDetailResend = ({ bottomSmsPaymentDetailResendOn, setBottomSmsPaymentDetailResendOn, smsDetailData, - mid, - tid + seq }: SmsPaymentDetailResendProps) => { const { t } = useTranslation(); @@ -29,18 +28,18 @@ export const SmsPaymentDetailResend = ({ } resendMessage({ - mid: mid, - tid: tid, + seq: seq, sendMessage: smsDetailData.sendMessage }).then((rs) => { if (rs.status) { snackBar(t('additionalService.sms.sendSuccess')) + setBottomSmsPaymentDetailResendOn(false) } else { snackBar(t('additionalService.sms.sendFailed', { message: rs.error?.message })) } - setBottomSmsPaymentDetailResendOn(false); }).catch((error) => { snackBar(t('additionalService.sms.sendFailed', { message: error?.response?.data?.message || error?.response?.data?.error?.message }) || t('additionalService.sms.sendFailedGeneric')) + setBottomSmsPaymentDetailResendOn(false) }); } diff --git a/src/pages/additional-service/key-in-payment/requeset-page.tsx b/src/pages/additional-service/key-in-payment/requeset-page.tsx index 9fc34c9..4d12132 100644 --- a/src/pages/additional-service/key-in-payment/requeset-page.tsx +++ b/src/pages/additional-service/key-in-payment/requeset-page.tsx @@ -124,8 +124,14 @@ export const KeyInPaymentRequestPage = () => { }; const isValidCardNumber = () => { - return cardNo1.length === 4 && cardNo2.length === 4 && - cardNo3.length === 4 && cardNo4.length === 4; + // 실제 숫자만 추출 (포맷팅 문자 제거) + const cleanCardNo1 = cardNo1.replace(/\D/g, ''); + const cleanCardNo2 = cardNo2.replace(/\D/g, ''); + const cleanCardNo3 = cardNo3.replace(/\D/g, ''); + const cleanCardNo4 = cardNo4.replace(/\D/g, ''); + + return cleanCardNo1.length === 4 && cleanCardNo2.length === 4 && + cleanCardNo3.length === 4 && cleanCardNo4.length === 4; }; const isFormValid = () => { 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 b8fcda3..840210e 100644 --- a/src/pages/additional-service/sms-payment/sms-payment-page.tsx +++ b/src/pages/additional-service/sms-payment/sms-payment-page.tsx @@ -24,6 +24,7 @@ import { PATHS } from '@/shared/constants/paths'; import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check'; import useIntersectionObserver from '@/widgets/intersection-observer'; +import { set } from 'lodash-es'; export const SmsPaymentPage = () => { const { t } = useTranslation(); @@ -42,8 +43,7 @@ export const SmsPaymentPage = () => { const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [filterOn, setFilterOn] = useState(false); const [mid, setMid] = useState(userMid); - const [selectedTid, setSelectedTid] = useState(''); - const [selectedMid, setSelectedMid] = useState(''); + const [seq, setSeq] = useState(0); const [searchCl, setSearchCl] = useState(SmsPaymentSearchCl.BUYER_NAME) const [searchValue, setSearchValue] = useState('') const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD')); @@ -51,9 +51,6 @@ export const SmsPaymentPage = () => { const [smsCl, setSmsCl] = useState(SmsCl.ALL); const [smsDetailData, setSmsDetailData] = useState(null); const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); - const [detailOn, setDetailOn] = useState(false); - const [detailTid, setDetailTid] = useState(''); - const [detailServiceCode, setDetailServiceCode] = useState(''); const { mutateAsync: smsPaymentList } = useExtensionSmsListMutation(); const { mutateAsync: downloadExcel } = useExtensionSmsDownloadExcelMutation(); @@ -129,11 +126,9 @@ export const SmsPaymentPage = () => { }); } - const callDetail = (selectedMid: string, selectedTid: string) => { - console.log('Selected Mid: ', selectedMid, 'Selected Tid: ', selectedTid); + const callDetail = (selectedSeq:number) => { detail({ - mid: selectedMid, - tid: selectedTid + seq: selectedSeq }).then((rs) => { setSmsDetailData(rs); }) @@ -165,10 +160,9 @@ export const SmsPaymentPage = () => { }; - const onClickToShowDetail = (itemMid: string, itemTid: string) => { - setSelectedMid(itemMid); - setSelectedTid(itemTid); - callDetail(itemMid, itemTid); + const onClickToShowDetail = (selectedSeq: number) => { + setSeq(selectedSeq); + callDetail(selectedSeq); setBottomSmsPaymentDetailResendOn(true); }; @@ -239,8 +233,7 @@ export const SmsPaymentPage = () => { bottomSmsPaymentDetailResendOn={bottomSmsPaymentDetailResendOn} setBottomSmsPaymentDetailResendOn={setBottomSmsPaymentDetailResendOn} smsDetailData={smsDetailData} - mid={selectedMid} - tid={selectedTid} + seq={seq} >