- ars,SMS,KeyIn 수정

src/entities/additional-service/ui/list-item.tsx

@@ -16,16 +16,12 @@ import { getPayoutStatusText } from '../model/payout/constant';
 
 export const ListItem = ({
   additionalServiceCategory,
-  mid, tid, paymentDate, paymentStatus,
-
+  mid, tid, orderDate, paymentStatus,
+  orderTime,buyerPhoneLast4,statusColor,
   applicationDate, requestDate, bankName, accountNo, resultStatus, resultMessage,
   amount, sendMethod, processStatus, registDate,
-
-  accountName,
-
-  submallId, settlementDate, companyName,
-
-  orderStatus, arsPaymentMethod,
+  transactionTime,transactionCode,transactionType,
+  accountName,submallId, settlementDate, companyName,orderStatus,
 
   alimCl, sendType, sendCl,
   paymentMethod, receiverName,
@@ -36,6 +32,7 @@ export const ListItem = ({
 
   smsCl, groupId, userMallId, transType,
   authResult, failReason, requestTime,
+  resendEnabled,
   onResendClick
 }: ListItemProps) => {
   const { navigate } = useNavigate();
@@ -59,16 +56,16 @@ export const ListItem = ({
   const getDotClass = (str?: string) => {
     let rs = '';
     if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
-      if (paymentStatus === '') {
+      if (transactionType === '') {
         rs = '';
       }
-      else if (paymentStatus === "APPROVAL") {
+      else if (transactionType === "APPROVAL") {
         rs = 'blue';
       }
-      else if (paymentStatus === "ALL_CANCEL") {
+      else if (transactionType === "FULL_CANCEL") {
         rs = 'gray';
       }
-      else if (paymentStatus === 'AFTER_CANCEL') {
+      else if (transactionType === 'PARTIAL_CANCEL') {
         rs = 'gray';
       }
 
@@ -143,6 +140,12 @@ export const ListItem = ({
       } else if (status === "FAIL") {
         rs = 'gray';
       }
+    } else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
+      if (paymentStatus === "PENDING" || paymentStatus === "SUCCESS") {
+        rs = 'blue';
+      } else {
+        rs = 'gray';
+      }
     }
     return rs;
 
@@ -231,8 +234,7 @@ export const ListItem = ({
         state: {
           additionalServiceCategory: additionalServiceCategory,
           mid: mid,
-          tid: tid,
-          amount: amount
+          tid: tid
         }
       });
     }
@@ -261,7 +263,7 @@ export const ListItem = ({
   const getTime = () => {
     let timeStr = '';
     if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
-      let time = paymentDate?.substring(8, 12);
+      let time = transactionTime?.substring(0, 4);
       timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
@@ -289,8 +291,7 @@ export const ListItem = ({
       }
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
-      let time = paymentDate?.substring(8, 12);
-      timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
+      timeStr = orderTime?.substring(0, 2) + ':' + orderTime?.substring(2, 4);
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
       let time = sendDate?.substring(8, 12);
@@ -323,7 +324,7 @@ export const ListItem = ({
       statusText = getSmsClName(smsCl);
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
-      statusText = getKeyInPaymentPaymentStatusName(paymentStatus)
+      statusText = getKeyInPaymentPaymentStatusName(transactionType)
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
       statusText = getArsPaymentStatusName(paymentStatus)
@@ -337,7 +338,7 @@ export const ListItem = ({
   const getTitle = () => {
     let str: string | undefined = '';
     if (additionalServiceCategory === AdditionalServiceCategory.KeyInPayment) {
-      str = `${tid}(${amount})`;
+      str = `${transactionCode}`;
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
       str = `${accountName}(${accountNo})`;
@@ -363,10 +364,15 @@ export const ListItem = ({
       str = `${accountName}(${accountNo})`;
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment) {
-      str = `${paymentDate}(${paymentStatus})[추후 수정 필요]`
+      if (buyerPhoneLast4) {
+        str = `${buyerName}(${buyerPhoneLast4})`
+      } else {
+        str = `${buyerName}`
+      }
+      
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Ars) {
-      str = '이름(' + tid + ')';
+      str = `${buyerName}(${tid})`;
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.Alimtalk) {
       str = `${receiverName}(${getAlimtalkSendTypeText(sendType)})`;
@@ -493,7 +499,7 @@ export const ListItem = ({
           <span className="separator">|</span>
           <span>{getArsOrderStatusName(orderStatus)}</span>
           <span className="separator">|</span>
-          <span>{arsPaymentMethod}</span>
+          <span>{transactionType}</span>
         </div>
       );
     }
@@ -625,12 +631,12 @@ export const ListItem = ({
         >{getAlimtalkSendClTypeText(sendCl)}</div>
       );
     }
-    else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick && tid) {
+    else if (additionalServiceCategory === AdditionalServiceCategory.SMSPayment && onResendClick && resendEnabled) {
       rs.push(
         <div
           key="sms-payment-amount"
           className={`status-label success`}
-          onClick={() => mid && tid && onResendClick(mid, tid)}
+          onClick={() => mid && onResendClick(mid, tid || '')}
         >{'재발송'}</div>
       )
     }