diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java index 078c6873..16760fea 100644 --- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java +++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java @@ -87,6 +87,7 @@ import itn.let.mjo.symbol.service.MjonSymbolService; import itn.let.mjo.symbol.service.MjonSymbolVO; import itn.let.sym.ccm.cde.service.CateCode; import itn.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; +import itn.let.sym.grd.service.MberGrdService; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uss.umt.service.EgovMberManageService; @@ -170,6 +171,10 @@ public class MjonMsgCampainDataController { @Resource(name = "egovSiteManagerService") EgovSiteManagerService egovSiteManagerService; + /** 등급제 관리 서비스 */ + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgCampainDataController.class); /** @@ -372,6 +377,9 @@ public class MjonMsgCampainDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); @@ -946,6 +954,9 @@ public class MjonMsgCampainDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); @@ -2070,6 +2081,9 @@ public class MjonMsgCampainDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java index 1942fd60..6bc36bf2 100644 --- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java +++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java @@ -96,6 +96,7 @@ import itn.let.mjo.symbol.service.MjonSymbolVO; import itn.let.schdlr.service.SchdlrManageService; import itn.let.sym.ccm.cde.service.CateCode; import itn.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; +import itn.let.sym.grd.service.MberGrdService; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uss.umt.service.EgovMberManageService; @@ -173,6 +174,10 @@ public class MjonMsgDataController { @Resource(name = "egovSiteManagerService") EgovSiteManagerService egovSiteManagerService; + /** 등급제 관리 서비스 */ + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class); /** @@ -496,6 +501,9 @@ public class MjonMsgDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); @@ -901,6 +909,9 @@ public class MjonMsgDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); @@ -2230,6 +2241,9 @@ public class MjonMsgDataController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); 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 12fbd40a..77f7fce9 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1568,6 +1568,10 @@ public class MjonPayController { //개별문자 가격 및 총 금액 셋팅해주기 - 시스템 기본 단가기준으로 입력해줌 //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + float shortPrice = 0; // 단문(SMS) float longPrice = 0; // 장문(LMS) float picturePrice = 0; // 그림문자(MMS) 1장 diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java index 591ce491..245302a2 100644 --- a/src/main/java/itn/let/mjo/test/web/TestController.java +++ b/src/main/java/itn/let/mjo/test/web/TestController.java @@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -46,8 +45,6 @@ import itn.com.cmm.service.EgovFileMngUtil; import itn.com.cmm.service.FileVO; import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.StringUtil; -import itn.com.utl.fcc.service.EgovStringUtil; -import itn.let.fax.user.service.FaxTranVO; import itn.let.kakao.kakaoComm.KakaoVO; import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiProfile; import itn.let.kakao.kakaoComm.kakaoApi.KakaoApiProfileCategory; @@ -57,7 +54,6 @@ import itn.let.mjo.addr.service.AddrGroupService; import itn.let.mjo.addr.service.AddrService; import itn.let.mjo.addragency.service.AddrAgencyVO; import itn.let.mjo.apikey.service.ApiKeyMngService; -import itn.let.mjo.apikey.service.ApiKeyVO; import itn.let.mjo.event.service.MjonEventService; import itn.let.mjo.event.service.MjonEventVO; import itn.let.mjo.mjocommon.MjonCommon; @@ -73,6 +69,7 @@ import itn.let.mjo.spammsg.web.ComGetSpamStringParser; import itn.let.mjo.symbol.service.MjonSymbolService; import itn.let.schdlr.service.SchdlrManageService; import itn.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; +import itn.let.sym.grd.service.MberGrdService; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.sym.site.service.TermsVO; @@ -196,6 +193,9 @@ public class TestController { private EgovFileMngService fileMngService; */ + /** 등급제 관리 서비스 */ + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; private static final Logger logger = LoggerFactory.getLogger(TestController.class); @@ -1314,6 +1314,9 @@ public class TestController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java index 91799c2c..c1a2954c 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -6,7 +6,6 @@ import java.util.List; import javax.annotation.Resource; -import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; @@ -33,6 +32,7 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG // 등급제 단가 추출 => 시스템 단가에 적용 @Override public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception { + /* // 공백제거 mberId = mberId.trim(); @@ -55,6 +55,7 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG } } } + */ return sysJoinSetVO; } diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java index 8e8c3996..cdbf7c72 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -61,6 +61,7 @@ import itn.let.mjo.msgsent.service.MjonMsgSentVO; import itn.let.mjo.pay.service.KmcVO; import itn.let.mjo.pay.service.MjonPayService; import itn.let.mjo.pay.service.MjonPayVO; +import itn.let.sym.grd.service.MberGrdService; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uat.uia.service.AuthCertVO; @@ -160,6 +161,10 @@ public class EgovMypageController { @Resource(name = "egovSiteManagerService") EgovSiteManagerService egovSiteManagerService; + /** 등급제 관리 서비스 */ + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + /** * 마이페이지 비밀번호 변경 탭 */ @@ -236,6 +241,9 @@ public class EgovMypageController { //1.시스템 기본 단가 정보 불러오기 JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + // 등급제 단가 추출 => 시스템 단가에 적용 + sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId); + //2.사용자 개인 단가 정보 불러오기 MberManageVO mberManageVO = new MberManageVO(); if(!userId.equals("") && !author.equals("ROLE_ADMIN")) { diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp index 8ff5d57a..8f2b1d6e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp @@ -4029,6 +4029,33 @@ $(".btn_event_cash").off().on("click", function(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp index dbb9bda2..70d70901 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp @@ -3620,6 +3620,33 @@ $(".btn_event_cash").off().on("click", function(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index 163602ae..998159f6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3827,6 +3827,33 @@ $(".btn_event_cash").off().on("click", function(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp index 374086f2..4dcb10c7 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp @@ -3378,6 +3378,33 @@ $(".btn_event_cash").off().on("click", function(){
+ + + + +