From 79cd62e56b378b401dbbda03e5968a2ef09d548d Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 27 Dec 2023 14:44:28 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9B=84=EB=B6=88=EC=A0=9C=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=20=EC=9A=94=EA=B8=88=20=EA=B2=B0=EC=A0=9C=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=ED=99=94=EB=A9=B4=20=EB=B3=80=EA=B2=BD=20=20-=20?=
 =?UTF-8?q?=ED=83=AD=20=EC=A2=85=EB=A5=98=20=EB=B0=8F=20=ED=83=AD=20?=
 =?UTF-8?q?=EB=AA=85=EC=B9=AD=20=EB=B6=84=EA=B8=B0=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=20-=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20=ED=85=8D?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B6=84=EA=B8=B0=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/mjo/pay/web/MjonPayController.java     | 14 +++++++-------
 src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp    |  2 +-
 .../webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp  | 13 ++++++++++++-
 .../WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp      |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index 99f05b15..6c392cd1 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -1931,6 +1931,13 @@ public class MjonPayController {
 			// End	    	
     	}
     	*/
+		
+		//후불제 회원 여부 조회 
+		UserManageVO userManageVO = new UserManageVO();
+		userManageVO.setMberId(userId);
+		userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO);
+		
+		model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
     	
     	if(pattern.equals("/web/member/pay/PayListAllAjax.do")
     			|| pattern.equals("/web/member/pay/PayListMobileAjax.do")
@@ -2099,13 +2106,6 @@ public class MjonPayController {
     		return "/web/pay/PayListAllAjax";
 		}
     	
-    	//후불제 회원 여부 조회 
-		UserManageVO userManageVO = new UserManageVO();
-		userManageVO.setMberId(userId);
-		userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO);
-		
-		model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
-    	
 		return "/web/pay/PayList";
 	}
     
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
index 5de44239..c6a59d75 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
@@ -199,7 +199,7 @@ function fnShowRefundPrintPopup(){
 					</c:when>
 					<c:otherwise>
 						<ul class="tabType1">
-							<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
+							<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >후불 결제내역</button></li>
 							<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>					
 						</ul>
 					</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
index 29c73212..723d3d71 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
@@ -393,7 +393,18 @@ function getMberGrdChk() {
 				<div class="add_text2" style="line-height: 1.2em;">
 					※ 요금 결제내역은 결제일을 기준으로 최대 6개월까지만 조회가능합니다.
 					<br />
-					※ 간편결제 영수증은 결제하신 서비스를 통해 제공됩니다.
+					<c:choose>
+						<c:when test="${prePaymentYn eq 'Y'}">
+							※ 간편결제 영수증은 결제하신 서비스를 통해 제공됩니다.	
+						</c:when>
+						<c:otherwise>
+							※ 후불제 고객은 사용금액 결제수단은 계좌이체만 가능합니다. <br /> 
+							※ 세금계산서 발행 후 매월 15일(공휴일인 경우 다음 영업일) 이전까지  계좌로 입금 부탁드립니다.<br />
+							※ 입금은행 : 우리은행 <br />
+							※ 입금계좌 : 1005-904-154328 <br /> 
+							※ 받는사람 : 주식회사 아이티앤
+						</c:otherwise>
+					</c:choose>
 				</div>
 				<div style="padding-top: 10px;">
                     <button type="button" class="level_btn" data-tooltip="level_check_popup01" id="levelIconBtn" style="display: none;">
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
index d06836ca..43240f1a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
@@ -395,7 +395,7 @@ function fnShowPdfPrintPopup(){
 					</c:when>
 					<c:otherwise>
 						<tr>
-							<td colspan="8">
+							<td colspan="6">
 								검색 결과가 없습니다.
 							</td>
 						</tr>