itn
2023-08-25
결제수단과 카드정보 공백제거
@5fe9df5280fd91bbb9085ab047ec3a527a773f8b
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectPayDataListPop.jsp
... | ... | @@ -210,17 +210,17 @@ |
| 210 | 210 |
<div class="tableWrap"> |
| 211 | 211 |
<table class="tbType1"> |
| 212 | 212 |
<colgroup> |
| 213 |
- <col style="width: 5%"> |
|
| 214 |
- <col style="width: 8%"> |
|
| 215 |
- <col style="width: 8%"> |
|
| 213 |
+ <col style="width: 4%"> |
|
| 214 |
+ <col style="width: 7%"> |
|
| 215 |
+ <col style="width: 7%"> |
|
| 216 | 216 |
<col style="width: 5%"> |
| 217 | 217 |
<col style="width: 9%"> |
| 218 |
- <col style="width: 5%"> |
|
| 218 |
+ <col style="width: 9%"> |
|
| 219 | 219 |
<col style="width: *%"> |
| 220 | 220 |
<col style="width: 9%"> |
| 221 | 221 |
<col style="width: 6%"> |
| 222 | 222 |
<col style="width: 6%"> |
| 223 |
- <col style="width: 13%"> |
|
| 223 |
+ <col style="width: 11%"> |
|
| 224 | 224 |
</colgroup> |
| 225 | 225 |
<thead> |
| 226 | 226 |
<tr> |
... | ... | @@ -269,7 +269,34 @@ |
| 269 | 269 |
</c:if> |
| 270 | 270 |
</td> |
| 271 | 271 |
<td> |
| 272 |
- <c:out value="${result.payMethodTxt}"/>
|
|
| 272 |
+ <c:choose> |
|
| 273 |
+ <c:when test="${result.payMethodTxt eq '신용카드'}">
|
|
| 274 |
+ <c:choose> |
|
| 275 |
+ <c:when test="${not empty result.cardName}">
|
|
| 276 |
+ 카드(<c:out value="${result.cardName}"/>)
|
|
| 277 |
+ </c:when> |
|
| 278 |
+ <c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
|
|
| 279 |
+ 카드(결제취소) |
|
| 280 |
+ </c:when> |
|
| 281 |
+ <c:otherwise> |
|
| 282 |
+ 카드 |
|
| 283 |
+ </c:otherwise> |
|
| 284 |
+ </c:choose> |
|
| 285 |
+ </c:when> |
|
| 286 |
+ <c:when test="${result.payMethodTxt eq '간편결제'}">
|
|
| 287 |
+ <c:choose> |
|
| 288 |
+ <c:when test="${not empty result.cardName}">
|
|
| 289 |
+ 간편(<c:out value="${result.cardName}"/>)
|
|
| 290 |
+ </c:when> |
|
| 291 |
+ <c:otherwise> |
|
| 292 |
+ 간편 |
|
| 293 |
+ </c:otherwise> |
|
| 294 |
+ </c:choose> |
|
| 295 |
+ </c:when> |
|
| 296 |
+ <c:otherwise> |
|
| 297 |
+ <c:out value="${result.payMethodTxt}"/>
|
|
| 298 |
+ </c:otherwise> |
|
| 299 |
+ </c:choose> |
|
| 273 | 300 |
</td> |
| 274 | 301 |
<td> |
| 275 | 302 |
<c:out value="${result.tid}"/>
|
... | ... | @@ -298,7 +325,8 @@ |
| 298 | 325 |
</c:if> |
| 299 | 326 |
</td> |
| 300 | 327 |
<td> |
| 301 |
- <c:out value="${result.regDate}"/>
|
|
| 328 |
+ <fmt:parseDate value="${result.regDate}" var="regDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 329 |
+ <fmt:formatDate value="${regDateValue}" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 302 | 330 |
</td> |
| 303 | 331 |
</tr> |
| 304 | 332 |
</c:forEach> |
--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
... | ... | @@ -416,37 +416,29 @@ |
| 416 | 416 |
</td> |
| 417 | 417 |
<%-- <td><fmt:formatNumber value="${result.cancelAmt}" type="number" /><c:if test="${'8' eq result.pgStatus}"><font color="red">(오류)</font></c:if></td> --%>
|
| 418 | 418 |
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
| 419 |
- <!-- 카드결제 오류로 인한 카드 결제사 이름이 없는 경우 표시 문구 추가 2023.01.02 우영두 --> |
|
| 420 | 419 |
<c:choose> |
| 421 | 420 |
<c:when test="${result.payMethodTxt eq '신용카드'}">
|
| 422 |
- 카드 |
|
| 423 |
- <c:choose> |
|
| 424 |
- <c:when test="${not empty result.cardName}">
|
|
| 425 |
- (<c:out value="${result.cardName}"/>)
|
|
| 426 |
- </c:when> |
|
| 427 |
- <c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
|
|
| 428 |
- <%-- 9991, 9993, I002 결과코드는 사용자가 결제 중간에 취소하여 오류가 발생한 케이스임. --%> |
|
| 429 |
- (결제취소) |
|
| 430 |
- </c:when> |
|
| 431 |
- <c:otherwise> |
|
| 432 |
- |
|
| 433 |
- </c:otherwise> |
|
| 434 |
- </c:choose> |
|
| 421 |
+ <c:choose> |
|
| 422 |
+ <c:when test="${not empty result.cardName}">
|
|
| 423 |
+ 카드(<c:out value="${result.cardName}"/>)
|
|
| 424 |
+ </c:when> |
|
| 425 |
+ <c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
|
|
| 426 |
+ 카드(결제취소) |
|
| 427 |
+ </c:when> |
|
| 428 |
+ <c:otherwise> |
|
| 429 |
+ 카드 |
|
| 430 |
+ </c:otherwise> |
|
| 431 |
+ </c:choose> |
|
| 435 | 432 |
</c:when> |
| 436 | 433 |
<c:when test="${result.payMethodTxt eq '간편결제'}">
|
| 437 |
- 간편 |
|
| 438 |
- <c:choose> |
|
| 439 |
- <c:when test="${not empty result.cardName}">
|
|
| 440 |
- (<c:out value="${result.cardName}"/>)
|
|
| 441 |
- </c:when> |
|
| 442 |
- <c:when test="${result.resultCode == '9991' || result.resultCode == '9993' || result.resultCode == 'I002'}">
|
|
| 443 |
- <%-- 9991, 9993, I002 결과코드는 사용자가 결제 중간에 취소하여 오류가 발생한 케이스임. --%> |
|
| 444 |
- (결제취소) |
|
| 445 |
- </c:when> |
|
| 446 |
- <c:otherwise> |
|
| 447 |
- |
|
| 448 |
- </c:otherwise> |
|
| 449 |
- </c:choose> |
|
| 434 |
+ <c:choose> |
|
| 435 |
+ <c:when test="${not empty result.cardName}">
|
|
| 436 |
+ 간편(<c:out value="${result.cardName}"/>)
|
|
| 437 |
+ </c:when> |
|
| 438 |
+ <c:otherwise> |
|
| 439 |
+ 간편 |
|
| 440 |
+ </c:otherwise> |
|
| 441 |
+ </c:choose> |
|
| 450 | 442 |
</c:when> |
| 451 | 443 |
<c:otherwise> |
| 452 | 444 |
<c:out value="${result.payMethodTxt}"/>
|
--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayModify.jsp
... | ... | @@ -211,7 +211,34 @@ |
| 211 | 211 |
<tr class="no_modi"> |
| 212 | 212 |
<th><span class="reqArea">결제수단</span></th> |
| 213 | 213 |
<td colspan="3"> |
| 214 |
- <input type="text" name="payMethodTxt" value="${mjonPayVO.payMethodTxt}" title="결제수단" maxlength="20" />
|
|
| 214 |
+ <c:choose> |
|
| 215 |
+ <c:when test="${mjonPayVO.payMethodTxt eq '신용카드'}">
|
|
| 216 |
+ <c:choose> |
|
| 217 |
+ <c:when test="${not empty mjonPayVO.cardName}">
|
|
| 218 |
+ 카드(<c:out value="${mjonPayVO.cardName}"/>)
|
|
| 219 |
+ </c:when> |
|
| 220 |
+ <c:when test="${mjonPayVO.resultCode == '9991' || mjonPayVO.resultCode == '9993' || mjonPayVO.resultCode == 'I002'}">
|
|
| 221 |
+ 카드(결제취소) |
|
| 222 |
+ </c:when> |
|
| 223 |
+ <c:otherwise> |
|
| 224 |
+ 카드 |
|
| 225 |
+ </c:otherwise> |
|
| 226 |
+ </c:choose> |
|
| 227 |
+ </c:when> |
|
| 228 |
+ <c:when test="${mjonPayVO.payMethodTxt eq '간편결제'}">
|
|
| 229 |
+ <c:choose> |
|
| 230 |
+ <c:when test="${not empty mjonPayVO.cardName}">
|
|
| 231 |
+ 간편(<c:out value="${mjonPayVO.cardName}"/>)
|
|
| 232 |
+ </c:when> |
|
| 233 |
+ <c:otherwise> |
|
| 234 |
+ 간편 |
|
| 235 |
+ </c:otherwise> |
|
| 236 |
+ </c:choose> |
|
| 237 |
+ </c:when> |
|
| 238 |
+ <c:otherwise> |
|
| 239 |
+ <c:out value="${mjonPayVO.payMethodTxt}"/>
|
|
| 240 |
+ </c:otherwise> |
|
| 241 |
+ </c:choose> |
|
| 215 | 242 |
</td> |
| 216 | 243 |
</tr> |
| 217 | 244 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?