diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
index abb7083a..1ecc5485 100644
--- a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
+++ b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
@@ -67,9 +67,17 @@ public class MjonPayVO extends ComDefaultVO{
private String sendUserId; // 보내는 사용자 아이디
private String recvUserId; // 받는 사용자 아이디
private String admUserId; // 관리자 아이디
+ private String blineCode;
-
+ public String getBlineCode() {
+ return blineCode;
+ }
+
+ public void setBlineCode(String blineCode) {
+ this.blineCode = blineCode;
+ }
+
public double getTotalPrice() {
return totalPrice;
}
diff --git a/src/main/java/itn/let/uss/umt/service/UserManageVO.java b/src/main/java/itn/let/uss/umt/service/UserManageVO.java
index ffcff8f0..45345c0c 100644
--- a/src/main/java/itn/let/uss/umt/service/UserManageVO.java
+++ b/src/main/java/itn/let/uss/umt/service/UserManageVO.java
@@ -202,6 +202,21 @@ public class UserManageVO extends UserDefaultVO{
private String smishingYn; // 스미싱 의심여부
private String vipYn; // VIP 여부
private float cash;
+ private String blineCode; // B라인코드
+ private String recommendId; // 추천아이디
+
+ public String getBlineCode() {
+ return blineCode;
+ }
+ public void setBlineCode(String blineCode) {
+ this.blineCode = blineCode;
+ }
+ public String getRecommendId() {
+ return recommendId;
+ }
+ public void setRecommendId(String recommendId) {
+ this.recommendId = recommendId;
+ }
public float getCash() {
return cash;
diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index 16fa2e7b..c42483c6 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -976,6 +976,8 @@ public class EgovUserManageController {
mberManageVO.setAdminSmsNoticeYn(userManageVO.getAdminSmsNoticeYn());
mberManageVO.setPrePaymentYn(userManageVO.getPrePaymentYn());
mberManageVO.setAutoCash(userManageVO.getAutoCash());
+ mberManageVO.setBlineCode(userManageVO.getBlineCode());
+ mberManageVO.setRecommendId(userManageVO.getRecommendId());
String userId = mberManageVO.getMberId();
UserLogVO userLogVO = new UserLogVO();
diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
index 2ac8b077..a4feee45 100644
--- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
@@ -103,6 +103,7 @@
, EMI.EVENT_PG_MOID AS eventMoid
, mber.SMISHING_YN AS smishingYn
, mber.VIP_YN AS vipYn
+ , IFNULL(mber.BLINE_CODE, 'N') AS blineCode
, (SELECT COUNT(0) FROM MJ_PG SP
WHERE SP.PG_STATUS = 1
AND SP.USER_ID = A.USER_ID
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
index 99544874..f047f8df 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
@@ -342,6 +342,8 @@
, M.picture2Price
, M.picture3Price
, M.hotlineAgentCode
+ , M.blineCode
+ , M.recommendId
, M.eventStatus
, (
SELECT MAX(MBER_LOG_DATE)
@@ -372,8 +374,6 @@
, prePaymentYn
, smishingYn
, vipYn
- , blineCode
- , recommendId
, DATE_FORMAT(sbscrbDe, '%Y-%m-%d %H:%i') sbscrbDe
, DATE_FORMAT(expirePnttm, '%Y-%m-%d %H:%i') expirePnttm
, DATE_FORMAT(mberSttusUptPnttm, '%Y-%m-%d %H:%i') mberSttusUptPnttm
@@ -390,6 +390,8 @@
, picture2Price
, picture3Price
, hotlineAgentCode
+ , blineCode
+ , recommendId
, EVNT.EVENT_STATUS AS eventStatus
, SPAM.SMI_MEMO AS smiMemo
@@ -413,8 +415,6 @@
, PRE_PAYMENT_YN prePaymentYn
, SMISHING_YN smishingYn
, VIP_YN vipYn
- , BLINE_CODE blineCode
- , RECOMMEND_ID recommendId
, EXPIRE_PNTTM expirePnttm
, MBER_STTUS_UPT_PNTTM mberSttusUptPnttm
, ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn
@@ -425,6 +425,8 @@
, PICTURE2_PRICE AS picture2Price
, PICTURE3_PRICE AS picture3Price
, HOTLINE_AGENT_CODE AS hotlineAgentCode
+ , IFNULL(BLINE_CODE, 'N') AS blineCode
+ , IFNULL(RECOMMEND_ID, '') AS recommendId
FROM
LETTNGNRLMBER
) A
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
index 9e7b341a..761ede99 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
@@ -1290,11 +1290,13 @@
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp
index 787b3e58..bbd7e918 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp
@@ -388,7 +388,7 @@ function customLinkPage(mberId){
-
+
@@ -458,13 +458,13 @@ function customLinkPage(mberId){
-
-
+
+
+
-
-
+
@@ -512,7 +512,7 @@ function customLinkPage(mberId){
class="smishing">
<%-- " onclick="javascript:fnSelectMber(':'); return false;"> --%>
<%-- ', ''); return false;"> --%>
- vip">
+ vip bMark">
'); return false;">
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index 93cf7d4b..69df99e4 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -2553,8 +2553,8 @@ function fnMberExceptSpamYn(){
|
- |
- |
+ 추천아이디/이름 |
+ |
@@ -2979,8 +2979,8 @@ function fnMberExceptSpamYn(){
- |
- |
+ 추천아이디/이름 |
+ |
| 전화번호 |
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
index 1b2fd7ae..5260a70e 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayList.jsp
@@ -374,7 +374,7 @@ function fnSmishingUpdate(flag, id) {
class="smishing" title="">
- vip">
+ vip bMark">
'); return false;">
diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 0845599c..28c4fc2e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -1162,6 +1162,9 @@ function fn_click_banner_add_stat(bannerMenuCode){
+
@@ -1174,9 +1177,6 @@ function fn_click_banner_add_stat(bannerMenuCode){
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab3.jsp b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab3.jsp
index c7ad4c77..5f910512 100644
--- a/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab3.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/user/sendRESTAPI_infoPage3_r1_tab3.jsp
@@ -13,7 +13,9 @@
-
+
+ [Request]
+
-
@@ -53,9 +55,9 @@
HTTPS 프로토콜을 사용하여 POST로 요청합니다.
-
+
@@ -86,26 +88,26 @@
| O |
- | callFrom |
- 발신자 번호 (아이디에 등록되어 있는 번호) |
+ page |
+ 페이지 번호 |
+ String |
+ X |
+
+
+ | pageSize |
+ 페이지당 출력개수 |
+ String |
+ X |
+
+
+ | startDate |
+ 시작일자 |
String |
O |
- | callToList |
- 수신자 번호 (콤마(,) 기준으로 입력) |
- String |
- O |
-
-
- | smsTxt |
- 메세지 내용 |
- String (1~2,000Byte) |
- O |
-
-
- | nameStr |
- 메세지 내용에 [*이름*]이 있으면 치환용 이름 입력 |
+ endDate |
+ 마감일자 |
String |
X |
@@ -124,7 +126,7 @@
-
@@ -138,11 +140,10 @@
{
"mberId":"String"
,"accessKey":"String"
- ,"callFrom":"String"
- ,"callToList":"String"
- ,"smsTxt":"String"
- ,"nameStr":"String"
- ,"callFrom":"String"
+ ,"page":"String"
+ ,"pageSize":"String"
+ ,"startDate":"String"
+ ,"endDate":"String"
,"test_yn":"( YS | YF )"
}
@@ -152,3 +153,215 @@
+
+
+ [Response]
+
+
+ JSON 객체로 응답 합니다.
+
+
+
+
+
+
+
+
+
+
+ | 키 |
+ 설명 |
+ 타입 |
+
+
+
+
+ | resultCode |
+ 성공 여부 ( "0" 아니면 실패 ) |
+ String |
+
+
+ | data |
+ 결과값 객체 ( 성공 : 데이터, 실패 : 메세지 ) |
+ Object |
+
+
+ | [data].msgGroupId |
+ 메세지 그룹 ID |
+ String |
+
+
+ | [data].msgTypeName |
+ 문자 구분명(단문, 장문, 그림) |
+ String |
+
+
+ | [data].msgType |
+ 메세지 타입 ( 4: 단문, 5: 장문 ) |
+ String |
+
+
+ | [data].callFrom |
+ 발신자 번호 |
+ String |
+
+
+ | [data].msgGroupCnt |
+ 문자 발송 건수 |
+ String |
+
+
+ | [data].msgGroupCnt |
+ 문자 발송 건수 |
+ String |
+
+
+ | [data].sCnt |
+ 성공 건수 |
+ String |
+
+
+ | [data].fCnt |
+ 실패 건수 |
+ String |
+
+
+ | [data].wCnt |
+ 대기 건수 |
+ String |
+
+
+ | [data].msgResult |
+ 발송결과( 성공 : S, 실패 : F) |
+ String |
+
+
+ | [data].smsTxt |
+ 문자내용 |
+ String |
+
+
+ | [data].subject |
+ 제목 |
+ String |
+
+
+ | [data].reqdate |
+ 발송 일자 |
+ String |
+
+
+ | [data].curState |
+ 전송 처리 결과값 |
+ String |
+
+
+ | [data].userId |
+ 사용자 ID |
+ String |
+
+
+ | [data].regdate |
+ 등록 일자 |
+ String |
+
+
+ | [data].reserveCYn |
+ 예약 취소 여부 |
+ String |
+
+
+ | [data].ttlCnt |
+ 전체 요청 수 |
+ String |
+
+
+ | [data].remainMsgCnt |
+ 남은 문자 건수 |
+ String |
+
+
+ | [data].totMsgCnt |
+ 전체 문자 개수 |
+ String |
+
+
+
+
+ * 성공 예시
+
+ -
+
+
+
+
+
+
+
+
+ |
+ {
+ "resultCode":"0"
+ , "data":[
+
+ "msgGroupId":"MSGGID_0000000000000"
+ , "msgTypeName":"단문(SMS)"
+ , "msgType":"4"
+ , "callFrom":"01011112222"
+ , "msgGroupCnt":"2"
+ , "sCnt":"2"
+ , "fCnt":"0"
+ , "wCnt":"0"
+ , "msgResult":"S"
+ , "smsTxt":"문자 내용"
+ , "subject":""
+ , "reqdate":"2023-04-05 00:00:00"
+ , "curState":"3"
+ , "userId":"testuser"
+ , "regdate":"3"
+ , "successCnt":"2023-04-04 16:10:19"
+ , "reserveCYn":"N"
+ , "ttlCnt":"4"
+ , "remainMsgCnt":"0"
+ , "totMsgCnt":"3"
+
+ ]
+ }
+ |
+
+
+
+
+
+
+ * 실패 예시
+
+ -
+
+
+
+
+
+
+
+
+ |
+ {
+ "resultCode":"1040"
+ ,"data":"치환 데이터 오류"
+ }
+ |
+
+
+
+
+
+
diff --git a/src/main/webapp/pb/css/content.css b/src/main/webapp/pb/css/content.css
index 9745d284..a5458532 100644
--- a/src/main/webapp/pb/css/content.css
+++ b/src/main/webapp/pb/css/content.css
@@ -230,7 +230,9 @@ input[type="button"].printBtn{border: 1px solid #686b72;background-image: url(/p
.pageCont .tbType1 tbody tr td .id_box {height:30px;line-height:30px;text-align:left;}
.pageCont .tbType1 tbody tr td .id_box a {overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline-block;width:calc(100% - 23px);vertical-align:top;}
.pageCont .tbType1 tbody tr td .id_box:before {content:'';display:inline-block;width:20px;height:20px;margin:6px 3px 0 0;vertical-align:top;}
-.pageCont .tbType1 tbody tr td .id_box.vip:before {background:url(../img/icon_vip.png) no-repeat left top;}
+.pageCont .tbType1 tbody tr td .id_box.vip:before {background:url(/pb/img/icon_vip.png) no-repeat left top;}
+.pageCont .tbType1 tbody tr td .id_box.bMark:before {background:url(/pb/img/icon_bmark.png) no-repeat left top;}
+.pageCont .tbType1 tbody tr td .id_box.vip.bMark:before{width: 45px; background: url(/pb/img/icon_vip.png),url(/pb/img/icon_bmark.png); background-position: left top, 24px top; background-repeat: no-repeat;}
.pageCont .tbType1 tbody tr.biz_hover_wrap {border:0 none;}
.pageCont .tbType1 tbody tr.biz_hover_wrap td {overflow:inherit;position:relative;height:0;padding:0;border:0 none;}
.pageCont .tbType1 tbody tr.biz_hover_wrap td .biz_hover_content {display:none;position:fixed;left:0;top:0;padding:20px;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-shadow:0px 3px 10px 0px rgba(0 0 0 / 0.2);z-index:1;}
diff --git a/src/main/webapp/pb/guide_2023.html b/src/main/webapp/pb/guide_2023.html
index 2f309d5f..14ebfb02 100644
--- a/src/main/webapp/pb/guide_2023.html
+++ b/src/main/webapp/pb/guide_2023.html
@@ -18,6 +18,7 @@
|
+
+ 
+
+
+
+
+
+
+
+
+
총 182건
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/pb/img/icon_bmark.png b/src/main/webapp/pb/img/icon_bmark.png
new file mode 100644
index 00000000..8510bda3
Binary files /dev/null and b/src/main/webapp/pb/img/icon_bmark.png differ
diff --git a/src/main/webapp/pb/user_manage_list.html b/src/main/webapp/pb/user_manage_list.html
new file mode 100644
index 00000000..859da7dc
--- /dev/null
+++ b/src/main/webapp/pb/user_manage_list.html
@@ -0,0 +1,291 @@
+
+
+
+