nicepayments/nice-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minAmount max amount 타입 변경 및 ars

Browse Source
This commit is contained in:
focp212@naver.com
2025-09-24 09:51:44 +09:00
parent 0e1d624b41
commit 4e4d0fd554
22 changed files with 139 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/entities/additional-service/model/ars/types.ts
View File

@@ -32,12 +32,12 @@ export interface ExtensionArsListParams {
page: DefaultRequestPagination;
};
export interface ArsListContent {
tid: string;
paymentDate: string;
paymentStatus: string;
orderStatus: string;
arsPaymentMethod: string;
amount: number;
tid?: string;
paymentDate?: string;
paymentStatus?: string;
orderStatus?: string;
arsPaymentMethod?: string;
amount?: number;
};
export interface ExtensionArsListResponse extends DefaulResponsePagination {
content: Array<ArsListContent>;

4
src/entities/additional-service/model/payout/types.ts
View File

@@ -23,8 +23,8 @@ export interface ExtensionPayoutListParams {
fromDate: string;
toDate: string;
disbursementStatus: PayoutDisbursementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
page?: DefaultRequestPagination;
};
export interface ExtensionPayoutListResponse extends DefaulResponsePagination{

20
src/entities/additional-service/model/types.ts
View File

@@ -2,6 +2,7 @@ import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/c
import { PayoutContent } from './payout/types';
import { P } from 'node_modules/framer-motion/dist/types.d-Cjd591yU';
import { FundAccountResultContentItem, FundAccountTransferContentItem } from './fund-account/types';
import { ArsListContent } from './ars/types';
// ========================================
// 공통 Enums 및 타입들
@@ -134,14 +135,14 @@ export interface KeyInPaymentFilterProps extends FilterProps {
startDate: string;
endDate: string;
transactionStatus: KeyInPaymentTransactionStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setStartDate: (startDate: string) => void;
setEndDate: (endDate: string) => void;
setTransactionStatus: (transactionStatus: KeyInPaymentTransactionStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
}
// ========================================
@@ -384,7 +385,8 @@ export interface ListItemProps extends
KeyInPaymentListItem, AccountHolderSearchListItem,
AccountHolderAuthListItem, LinkPaymentHistoryListItem,
LinkPaymentWaitListItem,
PayoutContent, FundAccountTransferContentItem {
PayoutContent, FundAccountTransferContentItem,
ArsListContent {
additionalServiceCategory?: AdditionalServiceCategory;
mid?: string
}
@@ -668,8 +670,8 @@ export interface ExtensionKeyinListParams extends ExtensionRequestParams {
fromDate: string;
toDate: string;
paymentStatus: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
page?: DefaultRequestPagination;
}
@@ -688,8 +690,8 @@ export interface ExtensionKeyinDownloadExcelParams extends ExtensionRequestParam
fromDate?: string;
toDate?: string;
paymentStatus?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
}
export interface ExtensionKeyinDownloadExcelResponse {

12
src/entities/additional-service/ui/filter/payout-filter.tsx
View File

@@ -28,15 +28,15 @@ export interface PayoutFilterProps {
fromDate: string;
toDate: string;
disbursementStatus: PayoutDisbursementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchCl: (searchCl: PayoutSearchCl) => void;
setFromDate: (fromDate: string) => void;
setToDate: (toDate: string) => void;
setDisbursementStatus: (disbursementStatus: PayoutDisbursementStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export const PayoutFilter = ({
@@ -63,8 +63,8 @@ export const PayoutFilter = ({
const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
const [filterDisbursementStatus, setFilterDisbursementStatus] = useState<PayoutDisbursementStatus>(disbursementStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);

4
src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx
View File

@@ -34,8 +34,8 @@ export const KeyInPaymentFilter = ({
const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTransactionStatus>(transactionStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const variants = {
hidden: { x: '100%' },

5
src/entities/additional-service/ui/list-date-group.tsx
View File

@@ -53,7 +53,10 @@ export const ListDateGroup = ({
receiveAccountNo={ items[i]?.receiveAccountNo }
receiveAccountName={ items[i]?.receiveAccountName }
status={ items[i]?.status }
processDate={items[i]?.processDate }
processDate={ items[i]?.processDate }
orderStatus={ items[i]?.orderStatus }
arsPaymentMethod={ items[i]?.arsPaymentMethod }
></ListItem>
)
}

45
src/entities/additional-service/ui/list-item.tsx
View File

@@ -20,7 +20,9 @@ export const ListItem = ({
transferAmount, receiveBankName,
receiveAccountNo, receiveAccountName,
status, processDate
status, processDate,
orderStatus, arsPaymentMethod
}: ListItemProps) => {
const { navigate } = useNavigate();
const getItemClass = () => {
@@ -171,6 +173,15 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
navigate(PATHS.additionalService.payout.detail, {
state: {
additionalServiceCategory: additionalServiceCategory,
mid: mid,
tid: tid
}
});
}
else {
alert('additionalServiceCategory가 존재하지 않습니다.');
}
@@ -196,6 +207,10 @@ export const ListItem = ({
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
timeStr = moment(requestDate).format('mm:ss');
}
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
let time = paymentDate?.substring(8, 12);
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
}
else {
return
}
@@ -208,28 +223,31 @@ export const ListItem = ({
str = `${tid}(${amount})`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
str = `${accountName}(${accountNo})`
str = `${accountName}(${accountNo})`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
str = `${accountNo}`
str = `${accountNo}`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
) {
if (sendMethod === "SMS") {
str = `${"buyerName"}(${"휴대폰 번호"})`
str = `${"buyerName"}(${"휴대폰 번호"})`;
} else {
str = `${"buyerName"}(${"이메일"})`
str = `${"buyerName"}(${"이메일"})`;
}
}
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
str = companyName;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
str = `${receiveAccountName}(${receiveAccountNo})`
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
str = `${receiveAccountName}(${receiveAccountNo})`
str = `${receiveAccountName}(${receiveAccountNo})`;
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
str = '이름(' + tid + ')';
}
return str;
@@ -321,6 +339,19 @@ export const ListItem = ({
</div>
);
}
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
rs.push(
<div className="transaction-details">
<span>{ getTime() }</span>
<span className="separator">|</span>
<span>{ paymentStatus }</span>
<span className="separator">|</span>
<span>{ orderStatus }</span>
<span className="separator">|</span>
<span>{ arsPaymentMethod }</span>
</div>
);
}
return rs;
};

8
src/entities/common/model/types.ts
View File

@@ -44,10 +44,10 @@ export enum AltMsgKeys {
};
export interface FilterRangeAmountProps {
title?: string;
minAmount?: number | string;
maxAmount?: number | string;
setMinAmount: (minAmount: number | string) => void;
setMaxAmount: (maxAmount: number | string) => void;
minAmount?: number;
maxAmount?: number;
setMinAmount: (minAmount: number) => void;
setMaxAmount: (maxAmount: number) => void;
};
export interface FilterButtonGroupsProps {
title: string;

38
src/entities/transaction/model/types.ts
View File

@@ -231,8 +231,8 @@ export interface AllTransactionListParams {
toDate: string;
stateCode: string;
serviceCode: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
dateCl: string;
goodsName: string;
cardCode?: string;
@@ -260,8 +260,8 @@ export interface EscrowListParams {
endDate?: string;
deliveryStatus?: string;
settlementStatus?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
pagination?: DefaultRequestPagination;
};
@@ -274,8 +274,8 @@ export interface BillingListParams {
requestStatus?: string;
processResult?: string;
paymentMethod?: string;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
pagination?: DefaultRequestPagination
};
@@ -510,8 +510,8 @@ export interface AllTransactionFilterProps extends FilterProps {
toDate: string;
stateCode: AllTransactionStateCode;
serviceCode: AllTransactionServiceCode;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
cardCode?: string;
bankCode?: string;
searchCl?: AllTransactionSearchCl;
@@ -523,8 +523,8 @@ export interface AllTransactionFilterProps extends FilterProps {
setToDate: (endDate: string) => void;
setStateCode: (stateCode: AllTransactionStateCode) => void;
setServiceCode: (serviceCode: AllTransactionServiceCode) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
setCardCode: (cardCode: string | undefined) => void;
setBankCode: (bankCode: string | undefined) => void;
setSearchCl: (searchCl: AllTransactionSearchCl | undefined) => void;
@@ -553,8 +553,8 @@ export interface EscrowFilterProps extends FilterProps {
endDate: string;
deliveryStatus: EscrowDeliveryStatus;
settlementStatus: EscrowSettlementStatus;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchType: (searchType: EscrowSearchType) => void;
setSearchKeyword: (searchKeyword: string) => void;
@@ -562,8 +562,8 @@ export interface EscrowFilterProps extends FilterProps {
setEndDate: (endDate: string) => void;
setDeliveryStatus: (deliveryStatus: EscrowDeliveryStatus) => void;
setSettlementStatus: (settlementStatus: EscrowSettlementStatus) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export interface BillingFilterProps extends FilterProps {
mid: string;
@@ -574,8 +574,8 @@ export interface BillingFilterProps extends FilterProps {
requestStatus: BillingRequestStatus;
processResult: BillingProcessResult;
paymentMethod: BillingPaymentMethod;
minAmount?: number | string;
maxAmount?: number | string;
minAmount?: number;
maxAmount?: number;
setMid: (mid: string) => void;
setSearchType: (searchType: BillingSearchType) => void;
setSearchKeyword: (searchKeyword: string) => void;
@@ -584,8 +584,8 @@ export interface BillingFilterProps extends FilterProps {
setRequestStatus: (requestStatus: BillingRequestStatus) => void;
setProcessResult: (processResult: BillingProcessResult) => void;
setPaymentMethod: (paymentMethod: BillingPaymentMethod) => void;
setMinAmount: (minAmount: string | number) => void;
setMaxAmount: (maxAmount: string | number) => void;
setMinAmount: (minAmount?: number) => void;
setMaxAmount: (maxAmount?: number) => void;
};
export interface CashReceiptPurposeUpdateParams {
@@ -620,7 +620,7 @@ export interface CashReceiptManualIssueResponse {
export interface BillingChargeParams {
billKey: string;
productName: string;
productAmount: number | string;
productAmount: number;
orderNumber: string;
buyerName: string;
paymentRequestDate: string;

24
src/entities/transaction/ui/cash-receipt-hand-written-issuance-step2.tsx
View File

@@ -4,14 +4,14 @@ import { ProcessStep } from '../model/types';
export interface CashReceiptHandWrittenIssuanceStep2Props {
setProcessStep: (processStep: ProcessStep) => void;
supplyAmount: number | string;
vatAmount: number | string;
taxFreeAmount: number | string;
serviceCharge: number | string;
setSupplyAmount: (supplyAmount: number | string) => void;
setVatAmount: (vatAmount: number | string) => void;
setTaxFreeAmount: (taxFreeAmount: number | string) => void;
setServiceCharge: (serviceCharge: number | string) => void;
supplyAmount: number;
vatAmount: number;
taxFreeAmount: number;
serviceCharge: number;
setSupplyAmount: (supplyAmount: number) => void;
setVatAmount: (vatAmount: number) => void;
setTaxFreeAmount: (taxFreeAmount: number) => void;
setServiceCharge: (serviceCharge: number) => void;
};
export const CashReceiptHandWrittenIssuanceStep2 = ({
setProcessStep,
@@ -63,7 +63,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ supplyAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setSupplyAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setSupplyAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -75,7 +75,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ vatAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setVatAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setVatAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -87,7 +87,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ taxFreeAmount }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setTaxFreeAmount(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setTaxFreeAmount(parseInt(e.target.value)) }
/>
</div>
</div>
@@ -99,7 +99,7 @@ export const CashReceiptHandWrittenIssuanceStep2 = ({
type="text"
placeholder=""
value={ serviceCharge }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setServiceCharge(e.target.value) }
onChange={ (e: ChangeEvent<HTMLInputElement>) => setServiceCharge(parseInt(e.target.value)) }
/>
</div>
</div>

4
src/entities/transaction/ui/filter/all-transaction-filter.tsx
View File

@@ -62,8 +62,8 @@ export const AllTransactionFilter = ({
const [filterToDate, setFilterToDate] = useState<string>(toDate);
const [filterStateCode, setFilterStateCode] = useState<AllTransactionStateCode>(stateCode);
const [filterServiceCode, setFilterServiceCode] = useState<AllTransactionServiceCode>(serviceCode);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const [filterCardCode, setFilterCardCode] = useState<string | undefined>(cardCode);
const [filterBankCode, setFilterBankCode] = useState<string | undefined>(bankCode);

4
src/entities/transaction/ui/filter/billing-filter.tsx
View File

@@ -59,8 +59,8 @@ export const BillingFilter = ({
const [filterRequestStatus, setFilterRequestStatus] = useState<BillingRequestStatus>(requestStatus);
const [filterProcessResult, setFilterProcessResult] = useState<BillingProcessResult>(processResult);
const [filterPaymentMethod, setFilterPaymentMethod] = useState<BillingPaymentMethod>(paymentMethod);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);

4
src/entities/transaction/ui/filter/escrow-filter.tsx
View File

@@ -54,8 +54,8 @@ export const EscrowFilter = ({
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
const [filterDeliveryStatus, setFilterDeliveryStatus] = useState<EscrowDeliveryStatus>(deliveryStatus);
const [filterSettlementStatus, setFilterSettlementStatus] = useState<EscrowSettlementStatus>(settlementStatus);
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
const onClickToClose = () => {
setFilterOn(false);