결제관리, 문자관리 JJ B라인 아이콘 추가
@3ce8a32641962cb59a2cb3f91310e1ffd2b651eb
--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
... | ... | @@ -162,7 +162,14 @@ |
| 162 | 162 |
|
| 163 | 163 |
private String searchMsgResultCode; // 발송결과 검색필터 |
| 164 | 164 |
private String reqFullDate; |
| 165 |
+ private String blineCode; |
|
| 165 | 166 |
|
| 167 |
+ public String getBlineCode() {
|
|
| 168 |
+ return blineCode; |
|
| 169 |
+ } |
|
| 170 |
+ public void setBlineCode(String blineCode) {
|
|
| 171 |
+ this.blineCode = blineCode; |
|
| 172 |
+ } |
|
| 166 | 173 |
public String getReqFullDate() {
|
| 167 | 174 |
return reqFullDate; |
| 168 | 175 |
} |
--- src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
+++ src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
... | ... | @@ -67,9 +67,17 @@ |
| 67 | 67 |
private String sendUserId; // 보내는 사용자 아이디 |
| 68 | 68 |
private String recvUserId; // 받는 사용자 아이디 |
| 69 | 69 |
private String admUserId; // 관리자 아이디 |
| 70 |
+ private String blineCode; |
|
| 70 | 71 |
|
| 71 | 72 |
|
| 72 |
- |
|
| 73 |
+ public String getBlineCode() {
|
|
| 74 |
+ return blineCode; |
|
| 75 |
+ } |
|
| 76 |
+ |
|
| 77 |
+ public void setBlineCode(String blineCode) {
|
|
| 78 |
+ this.blineCode = blineCode; |
|
| 79 |
+ } |
|
| 80 |
+ |
|
| 73 | 81 |
public double getTotalPrice() {
|
| 74 | 82 |
return totalPrice; |
| 75 | 83 |
} |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -601,6 +601,7 @@ |
| 601 | 601 |
, M.smishingYn |
| 602 | 602 |
, M.vipYn |
| 603 | 603 |
, M.userCallbackYn |
| 604 |
+ , M.blineCode |
|
| 604 | 605 |
, M.delayYn |
| 605 | 606 |
, M.delayCompleteYn |
| 606 | 607 |
, (SELECT |
... | ... | @@ -710,6 +711,7 @@ |
| 710 | 711 |
, LMB.SMISHING_YN AS smishingYn |
| 711 | 712 |
, LMB.VIP_YN AS vipYn |
| 712 | 713 |
, LMB.CALLBACK_YN AS userCallbackYn |
| 714 |
+ , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode |
|
| 713 | 715 |
, A.DELAY_YN AS delayYn |
| 714 | 716 |
, A.DELAY_COMPLETE_YN AS delayCompleteYn |
| 715 | 717 |
FROM |
--- src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
... | ... | @@ -103,6 +103,7 @@ |
| 103 | 103 |
, EMI.EVENT_PG_MOID AS eventMoid |
| 104 | 104 |
, mber.SMISHING_YN AS smishingYn |
| 105 | 105 |
, mber.VIP_YN AS vipYn |
| 106 |
+ , IFNULL(mber.BLINE_CODE, 'N') AS blineCode |
|
| 106 | 107 |
, (SELECT COUNT(0) FROM MJ_PG SP |
| 107 | 108 |
WHERE SP.PG_STATUS = 1 |
| 108 | 109 |
AND SP.USER_ID = A.USER_ID |
--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
... | ... | @@ -499,7 +499,7 @@ |
| 499 | 499 |
</c:if> |
| 500 | 500 |
</td> |
| 501 | 501 |
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
| 502 |
- <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
|
|
| 502 |
+ <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
|
|
| 503 | 503 |
<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
|
| 504 | 504 |
<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
|
| 505 | 505 |
</a> |
--- src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
... | ... | @@ -374,7 +374,7 @@ |
| 374 | 374 |
</td> |
| 375 | 375 |
|
| 376 | 376 |
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> title="<c:out value="${result.userId}"/>">
|
| 377 |
- <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
|
|
| 377 |
+ <div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
|
|
| 378 | 378 |
<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
|
| 379 | 379 |
<c:out value="${result.userId}"/>
|
| 380 | 380 |
</a> |
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?