- 부가서비스 소개 List, 권한 검증 추가
- 각 API 오류 수정
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import moment from 'moment';
|
||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
||||
import { motion } from 'framer-motion';
|
||||
import { useState } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { FilterSelect } from '@/shared/ui/filter/select';
|
||||
import { FilterCalendar } from '@/shared/ui/filter/calendar';
|
||||
import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
|
||||
@@ -42,6 +42,9 @@ export const AccountHolderAuthFilter = ({
|
||||
onClickToClose();
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
setFilterAuthStatus(authStatus);
|
||||
}, [authStatus]);
|
||||
return (
|
||||
<>
|
||||
<motion.div
|
||||
|
||||
@@ -49,8 +49,7 @@ export const ListDateGroup = ({
|
||||
submallId={ items[i]?.submallId }
|
||||
settlementDate={ items[i]?.settlementDate }
|
||||
companyName={ items[i]?. companyName }
|
||||
disbursementStatus={ items[i]?.disbursementStatus }
|
||||
disbursementAmount={ items[i]?.disbursementAmount }
|
||||
status={ items[i]?.status }
|
||||
|
||||
orderStatus={ items[i]?.orderStatus }
|
||||
arsPaymentMethod={ items[i]?.arsPaymentMethod }
|
||||
|
||||
@@ -12,30 +12,31 @@ import { getArsPaymentStatusName, getArsOrderStatusName } from '../model/ars/con
|
||||
import { ServiceCode } from '../model/alimtalk/types';
|
||||
import { getAlimtalkAlimClText, getAlimtalkSendClTypeText, getAlimtalkSendTypeText, getAlimtalkServiceCodeText } from '../model/alimtalk/constant';
|
||||
import { getAuthResultStatusText, getTransTypeText } from '../model/face-auth/constant';
|
||||
import { getPayoutStatusText } from '../model/payout/constant';
|
||||
|
||||
export const ListItem = ({
|
||||
additionalServiceCategory,
|
||||
mid, tid, paymentDate, paymentStatus,
|
||||
|
||||
applicationDate, requestDate, bankName, accountNo, resultStatus, resultMessage,
|
||||
amount, sendMethod, processStatus,registDate,
|
||||
amount, sendMethod, processStatus, registDate,
|
||||
|
||||
accountName,
|
||||
|
||||
submallId, settlementDate, companyName,
|
||||
disbursementStatus, disbursementAmount,
|
||||
status: disbursementStatus, amount: disbursementAmount,
|
||||
|
||||
orderStatus, arsPaymentMethod,
|
||||
|
||||
alimCl, sendType, sendCl,
|
||||
paymentMethod, receiverName,
|
||||
requestId,subReqId,
|
||||
buyerName,receiverInfo,
|
||||
seq,serviceCode,sendDate,
|
||||
authStatus,
|
||||
requestId, subReqId,
|
||||
buyerName, receiverInfo,
|
||||
seq, serviceCode, sendDate,
|
||||
authStatus, status,
|
||||
|
||||
smsCl,groupId,userMallId,transType,
|
||||
authResult,failReason,requestTime,
|
||||
smsCl, groupId, userMallId, transType,
|
||||
authResult, failReason, requestTime,
|
||||
onResendClick
|
||||
}: ListItemProps) => {
|
||||
const { navigate } = useNavigate();
|
||||
@@ -89,7 +90,7 @@ export const ListItem = ({
|
||||
}
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
|
||||
if (sendCl === "SUCCESS" || "REQUEST") {
|
||||
if (sendCl === "SUCCESS" || sendCl === "REQUEST") {
|
||||
rs = 'blue';
|
||||
} else {
|
||||
rs = 'gray';
|
||||
@@ -104,20 +105,13 @@ export const ListItem = ({
|
||||
}
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory) {
|
||||
if (paymentStatus === "PAYMENT_COMPLETE") {
|
||||
if (paymentStatus === "0" || paymentStatus === "1" || paymentStatus === "2") {
|
||||
rs = 'blue';
|
||||
}
|
||||
|
||||
else if (paymentStatus === "ACTIVE") {
|
||||
rs = 'blue';
|
||||
else if (paymentStatus === "3") {
|
||||
rs = 'gray';
|
||||
}
|
||||
else if (paymentStatus === "DEPOSIT_REQUEST") {
|
||||
rs = 'blue';
|
||||
}
|
||||
else if (paymentStatus === "PAYMENT_FAIL") {
|
||||
rs = 'blue';
|
||||
}
|
||||
else if (paymentStatus === "INACTIVE") {
|
||||
else if (paymentStatus === '4') {
|
||||
rs = 'gray';
|
||||
}
|
||||
} else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
|
||||
@@ -144,6 +138,12 @@ export const ListItem = ({
|
||||
} else if (resultStatus === "FAIL") {
|
||||
rs = 'gray';
|
||||
}
|
||||
} else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
|
||||
if (status === "SUCCESS" || status === "REQUEST") {
|
||||
rs = 'blue';
|
||||
} else if (status === "FAIL") {
|
||||
rs = 'gray';
|
||||
}
|
||||
}
|
||||
return rs;
|
||||
|
||||
@@ -286,7 +286,7 @@ export const ListItem = ({
|
||||
if (applicationDate && applicationDate.length >= 12) {
|
||||
timeStr = applicationDate.substring(8, 10) + ':' + applicationDate.substring(10, 12);
|
||||
} else {
|
||||
timeStr = requestDate?.substring(8,10) + ':' + requestDate?.substring(10, 12);
|
||||
timeStr = requestDate?.substring(8, 10) + ':' + requestDate?.substring(10, 12);
|
||||
}
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
|
||||
@@ -349,9 +349,10 @@ export const ListItem = ({
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.FaceAuth) {
|
||||
str = `${userMallId}(${mid})`;
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
|
||||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory
|
||||
) {
|
||||
str = `${buyerName}`;
|
||||
} else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
|
||||
str = `${buyerName}(${receiverInfo})`;
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
|
||||
@@ -451,7 +452,7 @@ export const ListItem = ({
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
|
||||
rs.push(
|
||||
<div className="transaction-details">
|
||||
<span>{disbursementStatus}</span>
|
||||
<span>{getPayoutStatusText(disbursementStatus)}</span>
|
||||
<span className="separator">|</span>
|
||||
<span>{submallId}</span>
|
||||
</div>
|
||||
@@ -498,7 +499,7 @@ export const ListItem = ({
|
||||
);
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
|
||||
console.log(serviceCode)
|
||||
console.log(serviceCode)
|
||||
rs.push(
|
||||
<div className="transaction-details">
|
||||
<span>{getTime()}</span>
|
||||
|
||||
Reference in New Issue
Block a user