From 63e3547633228bdf98a1accb36717a24f728a980 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 13 Jul 2023 12:15:04 +0900 Subject: [PATCH 01/12] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EC=9A=94?= =?UTF-8?q?=EA=B8=88=EC=95=88=EB=82=B4=20=EA=B8=B0=EB=8A=A5=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/pay/web/MjonPayController.java | 9 ++ .../let/sym/grd/web/MberGrdController.java | 60 ++++++-- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 4 + .../webapp/WEB-INF/jsp/web/pay/PayGuide.jsp | 136 ++++++++++++++++-- .../WEB-INF/jsp/web/user/mberInfoIndex.jsp | 2 +- 5 files changed, 181 insertions(+), 30 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 ecb5205b..051eee86 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -83,6 +83,8 @@ import itn.let.mjo.reservmsg.service.MjonReservMsgService; import itn.let.mjo.tax.service.TaxService; import itn.let.mjo.tax.service.TaxVO; import itn.let.schdlr.service.SchdlrManageService; +import itn.let.sym.grd.service.MberGrdService; +import itn.let.sym.grd.service.MberGrdVO; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uat.uia.service.AuthCertVO; @@ -158,6 +160,9 @@ public class MjonPayController { @Resource(name = "egovSiteManagerService") EgovSiteManagerService egovSiteManagerService; + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + //배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"} private String[][] sendPayExcelValue ={ {"0" ,"번호" , "1" , "" }, @@ -1627,6 +1632,10 @@ public class MjonPayController { } model.addAttribute("tabType", tabType); + MberGrdVO mberGrdVO = new MberGrdVO(); + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + return "/web/pay/PayGuide"; } diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java index aba79606..1860a1f6 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -77,8 +78,36 @@ public class MberGrdController { return "/web/grd/MberGrdHistListAjax"; } + // 등급제 시행 ON/OFF 체크 + @RequestMapping(value = "/web/grd/mberSettDetailAjax.do") + public ModelAndView mberSettingDetailAjax( + @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = false; + String msg = ""; + + try{ + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) { + isSuccess = true; + } + } + catch(Exception e) { + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + // 등급제 적용여부 체크 - @RequestMapping(value = "/web/member/grd/mberGrdChkAjax.do") + @RequestMapping(value = "/web/grd/mberGrdChkAjax.do") public ModelAndView mberGrdChkAjax( @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { @@ -88,25 +117,28 @@ public class MberGrdController { // 로그인VO에서 사용자 정보 가져오기 LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - mberGrdVO.setMberId(userId); + boolean isSuccess = false; String msg = ""; MberGrdVO rtnMberGrdVO = new MberGrdVO(); try{ - // 회원별 이벤트 진행여부 - int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); - if (mberEventPrgCnt == 0) { - rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); - if (null != rtnMberGrdVO) { - isSuccess = true; - } - else { - msg = "종료"; - } + if (StringUtils.isNotEmpty(userId)) { + mberGrdVO.setMberId(userId); + + // 회원별 이벤트 진행여부 + int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); + if (mberEventPrgCnt == 0) { + rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); + if (null != rtnMberGrdVO) { + isSuccess = true; + } + else { + msg = "종료"; + } + } } - } catch(Exception e) { msg = e.getMessage(); @@ -117,6 +149,6 @@ public class MberGrdController { modelAndView.addObject("msg", msg); return modelAndView; - } + } } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 55a73212..3f2a7c28 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -181,6 +181,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp index 3fd7009b..9909f3e2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp @@ -65,6 +65,12 @@ $(document).ready(function () { $("#btnEstimate").trigger("click"); } + //등급제 시행 ON/OFF 체크 + //getMberSettingDetail(); + + // 등급제 대상 여부 + //getMberGrdChk(); + }); //품목정보 추가 @@ -318,21 +324,70 @@ function fn_gunClear(){ } - //체크박스 전체선택/해제 - $(document).on("click", "#chkAll", function(e) { - var isChecked = $(this).is(":checked"); - $("input[name=chkEach]:checkbox").prop("checked", isChecked); - }); +//체크박스 전체선택/해제 +$(document).on("click", "#chkAll", function(e) { + var isChecked = $(this).is(":checked"); + $("input[name=chkEach]:checkbox").prop("checked", isChecked); +}); + +/* 윈도우팝업 열기 */ +function infoPop(pageUrl){ + document.infoPopForm.pageType.value = pageUrl; + document.infoPopForm.action = "/web/pop/infoPop.do"; + document.infoPopForm.method = "post"; + window.open("about:blank", 'infoPop', 'width=790, height=280, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); + document.infoPopForm.target = "infoPop"; + document.infoPopForm.submit(); +} + + +//등급제 시행 ON/OFF 체크 +function getMberSettingDetail() { + $.ajax({ + type: "POST", + url: "/web/grd/mberSettDetailAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 문자(등급별 요금 안내) + $("#mberGrdSettingArea").show(); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + +// 등급제 대상 여부 +function getMberGrdChk() { + $.ajax({ + type: "POST", + url: "/web/grd/mberGrdChkAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 등급제 누적결제액 세부내역 + $("#grdShowArea").html("(등급 : " + data.rtnMberGrdVO.grdSetNm + ")"); + $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)"); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} - /* 윈도우팝업 열기 */ - function infoPop(pageUrl){ - document.infoPopForm.pageType.value = pageUrl; - document.infoPopForm.action = "/web/pop/infoPop.do"; - document.infoPopForm.method = "post"; - window.open("about:blank", 'infoPop', 'width=790, height=280, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); - document.infoPopForm.target = "infoPop"; - document.infoPopForm.submit(); - }
@@ -376,7 +431,7 @@ function fn_gunClear(){

- 문자이미지 문자 + 문자이미지 문자

@@ -412,6 +467,57 @@ function fn_gunClear(){
* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지. + + + +

알림톡 아이콘 이미지 알림톡

diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index 763e41a1..cdcf0dcf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -111,7 +111,7 @@ function mberGrdHistListAjax(pageNo){ function getMberGrdChk() { $.ajax({ type: "POST", - url: "/web/member/grd/mberGrdChkAjax.do", + url: "/web/grd/mberGrdChkAjax.do", data: {}, dataType:'json', async: false, From 9f0b88feec84680c44ceddb1c4d190300c3b2873 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 13 Jul 2023 12:37:00 +0900 Subject: [PATCH 02/12] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=83=81=ED=83=9C=EA=B0=92=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 42 ++++++++++++++++++- .../WEB-INF/jsp/sym/grd/mberGrdList.jsp | 4 +- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 3f2a7c28..5c05591f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -140,8 +140,46 @@ A.MBER_ID = #searchKeyword# - - A.GRD_STATUS = #searchGrdStatus# + + + AND (CASE + WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d') + THEN '대기' + WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE + THEN '진행' + WHEN A.GRD_STATUS = 'N' + THEN '대기' + WHEN A.GRD_STATUS = 'E' + THEN '종료' + ELSE '종료' + END) = '진행' + + + AND (CASE + WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d') + THEN '대기' + WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE + THEN '진행' + WHEN A.GRD_STATUS = 'N' + THEN '대기' + WHEN A.GRD_STATUS = 'E' + THEN '종료' + ELSE '종료' + END) = '대기' + + + AND (CASE + WHEN E.EVENT_STATUS = 'Y' AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN DATE_FORMAT(E.EVENT_START_DATE, '%Y-%m-%d') AND DATE_FORMAT(E.EVENT_END_DATE, '%Y-%m-%d') + THEN '대기' + WHEN A.GRD_STATUS = 'Y' AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE + THEN '진행' + WHEN A.GRD_STATUS = 'N' + THEN '대기' + WHEN A.GRD_STATUS = 'E' + THEN '종료' + ELSE '종료' + END) = '종료' + ORDER BY 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp index 33b6408e..a21b3402 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp @@ -101,8 +101,8 @@ function getMberGrdChk(mberId) { From ee9dc2af256fb53f2e053e8996de40344217ddd4 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 13 Jul 2023 15:01:13 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=A0=95=EC=A7=80?= =?UTF-8?q?=EC=8B=9C=20=EC=95=84=EC=9D=B4=ED=94=BC=20=EC=B0=A8=EB=8B=A8=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uat/uia/service/impl/EgovMberManageServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index 5e73987b..b16f8824 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -471,6 +471,8 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement //이용정지 처리 시 해당 회원 접속 기록이 있는 IP들 차단 처리 hackIpVO.setFrstRegisterId(mberManageVO.getMberSttusUpdusrId()); hackIpVO.setIgnoreDc("이용정지로 인한 IP 차단"); + // JSPark 2023.07.13 => 이용정지시 아이피 차단 기능 주석처리(장팀장 요청) + /* for (int i=0; i 이용정지시 아이피 차단 기능 주석처리(장팀장 요청) + /* for (int i=0; i Date: Thu, 13 Jul 2023 16:10:20 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=EC=9A=94=EA=B8=88=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EB=93=B1=EA=B8=89=EC=A0=9C=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/pay/PayListAllAjax.jsp | 70 +++++++++++++++++++ .../WEB-INF/jsp/web/user/mberInfoIndex.jsp | 2 +- 2 files changed, 71 insertions(+), 1 deletion(-) 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 740ef08c..80aec80e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp @@ -89,6 +89,8 @@ $(document).ready(function(){ $(this).val($(this).val().replace(/[^\.0-9]/g,"")) }) + // 등급제 대상 여부 + //getMberGrdChk(); }); @@ -307,6 +309,46 @@ $(document).on("click", "#chkAll", function(e) { var isChecked = $(this).is(":checked"); $("input[name=eachChk]:checkbox").prop("checked", isChecked); }); + + +//등급제 누적결제액 세부내역 +function mberGrdHistListAjax(pageNo){ + document.levelForm.pageIndex.value = pageNo; + + var sendData= $(document.levelForm).serializeArray(); + $("#mberGrdHistListLoad").load("/web/member/grd/mberGrdHistListAjax.do", sendData ,function(response, status, xhr){ + + }); +} + +// 등급제 대상 여부 +function getMberGrdChk() { + $.ajax({ + type: "POST", + url: "/web/grd/mberGrdChkAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 등급제 누적결제액 세부내역 + $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)"); + document.levelForm.grdSetNm.value = data.rtnMberGrdVO.grdSetNm; + document.levelForm.totAmt.value = data.rtnMberGrdVO.totAmt; + mberGrdHistListAjax(1); + + $("#levelIconBtn").show(); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + @@ -351,6 +393,9 @@ $(document).on("click", "#chkAll", function(e) { -->
+ @@ -852,3 +897,28 @@ $(document).on("click", "#chkAll", function(e) {
+ +
+ + + + + + +
+
+
+

누적결제액 세부내역

+ +
+
+
+ +
+ +
+
+
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index cdcf0dcf..9fd02da2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -121,7 +121,7 @@ function getMberGrdChk() { $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)"); document.levelForm.grdSetNm.value = data.rtnMberGrdVO.grdSetNm; document.levelForm.totAmt.value = data.rtnMberGrdVO.totAmt; - mberGrdHistListAjax(1, data.rtnMberGrdVO.grdSetNm, data.rtnMberGrdVO.totAmt); + mberGrdHistListAjax(1); // 등급제 아이콘 버튼 노출여부 var sHtml = ""; From 105898cede55a7bbb63c368e55f321b61b7ea124 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 13 Jul 2023 16:55:42 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=EC=9A=94=EA=B8=88=EC=95=88=EB=82=B4=20to?= =?UTF-8?q?p=20=EB=B0=B0=EB=84=88=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 6d78e136..967dd730 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1053,6 +1053,20 @@ function actionLogin() {
본문 바로가기
+ + + + + + + + + From c0d32862a133a26a8cace2c4739d02e7dff1f9b2 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 14:07:15 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=EA=B0=84=ED=8E=B8=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index 1473f71c..ef6d256f 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -95,7 +95,7 @@ Globals.fax.file.permit.ext=hwp,hwpml,doc,xls,ppt,pdf,txt,docx,xlsx,pptx,tif,jpg #KG \ubaa8\ube4c\ub9ac\uc5b8\uc2a4 \uc124\uc815 #CARD -Globals.pay.kgm.card.cnSvcid=191017078687 +Globals.pay.kgm.card.cnSvcid=230523133878 Globals.pay.kgm.card.payMode=10 #BANK Globals.pay.kgm.bank.raSvcid=230510133362 From 72c2605d63812827fa8d8cb965f92e1512f90543 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 14:21:56 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=EA=B0=84=ED=8E=B8=EA=B2=B0=EC=A0=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B0=8F=20=ED=95=98=EB=93=9C=EC=BD=94?= =?UTF-8?q?=EB=94=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/itn/let/mjo/block/web/AddrBlockController.java | 2 +- .../itn/let/mjo/event/web/MjonEventPayV2Controller.java | 5 ----- src/main/java/itn/let/mjo/pay/web/MjonPayController.java | 1 - src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java | 7 +++---- .../webapp/WEB-INF/jsp/web/addrBlock/AddrBlockList.jsp | 1 - src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp | 4 ++-- 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/itn/let/mjo/block/web/AddrBlockController.java b/src/main/java/itn/let/mjo/block/web/AddrBlockController.java index ea7a4f03..8ea4600c 100644 --- a/src/main/java/itn/let/mjo/block/web/AddrBlockController.java +++ b/src/main/java/itn/let/mjo/block/web/AddrBlockController.java @@ -543,7 +543,7 @@ public class AddrBlockController { //전송사 구분 코드 - 01 : 아이하트, 02 : 현대 퓨쳐넷, 03 : 아이엠오 //mjonMsgVO.setAgentCode("01"); - // 하드코딩 + //sendAgent = "02"; mjonMsgVO.setAgentCode(sendAgent); diff --git a/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java b/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java index 2522d29e..5057a830 100644 --- a/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java +++ b/src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java @@ -76,11 +76,6 @@ public class MjonEventPayV2Controller { return "redirect:/web/user/login/login.do"; } - // 하드코딩 - if(!userId.equals("nobledeco") && !userId.equals("nobledeco2") && !userId.equals("nopay")) { - return "redirect:/web/main/mainPage.do"; - } - //기존 결제 내역이 있는 회원인지 확인 int payCnt = 0; if(StringUtil.isNotEmpty(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 051eee86..12fbd40a 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1660,7 +1660,6 @@ public class MjonPayController { float picturePrice2 = 0; // 그림문자(MMS) 2장 float picturePrice3 = 0; // 그림문자(MMS) 3장 - // 하드코딩 => 그림문자 2장, 3장 금액은 30원씩 플러스 shortPrice = sysJoinSetVO.getShortPrice(); longPrice = sysJoinSetVO.getLongPrice(); picturePrice = sysJoinSetVO.getPicturePrice(); diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index 75f874c1..e5f9813f 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -119,11 +119,10 @@ public class MjonPayV2Controller { return "redirect:/web/user/login/login.do"; } - // 하드코딩 // Itm Member Id Check - if(!getItnMemberId(userId)) { - return "redirect:/web/main/mainPage.do"; - } + //if(!getItnMemberId(userId)) { + // return "redirect:/web/main/mainPage.do"; + //} MberManageVO mberManageVO = mberManageService.selectMber(loginVO.getId()); model.addAttribute("mberManageVO", mberManageVO); diff --git a/src/main/webapp/WEB-INF/jsp/web/addrBlock/AddrBlockList.jsp b/src/main/webapp/WEB-INF/jsp/web/addrBlock/AddrBlockList.jsp index 17c7d43d..5f471b79 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addrBlock/AddrBlockList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addrBlock/AddrBlockList.jsp @@ -991,7 +991,6 @@ function SetBlockResultMode(obj, blockId) { function SetBlockResultSave() { //alert(globalBlockId); - // 하드코딩 //alert("준비중입니다."); //return; diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp index b704fd90..31d03bf3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp @@ -60,8 +60,8 @@ function goClose() {

- <%----%> - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp index 759b6a94..3f2fe1a6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp @@ -60,8 +60,8 @@ function goClose() {

- <%----%> - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp index cd5c0f39..b539f27c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp @@ -60,8 +60,8 @@ function goClose() {

- <%----%> - + +
From b8d266e8c9a55b57b429d3c7da1dbc2d74c5d10f Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 15:17:11 +0900 Subject: [PATCH 08/12] =?UTF-8?q?=EC=B2=AB=EA=B2=B0=EC=A0=9C=20=EC=A0=84?= =?UTF-8?q?=EC=9A=A9=EC=A0=84=EC=86=A1=EC=82=AC=20=EB=A9=94=EB=AA=A8?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uss/umt/service/impl/EgovUserManageServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 33d9041b..f80db2c3 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -585,7 +585,9 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); if (blineCode != null && blineCode.equals("N")) { // 전송사 JJ로 변경 - mberManageVO.setHotlineAgentCode("05"); // 전송사 JJ + mberManageVO.setHotlineAgentName("첫결제 JJ"); + mberManageVO.setHotlineAgentCode("05"); + mberManageVO.setFrstRegisterId("admin"); mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); } } From 02b96ad2aced004a1659b640b546b9921c526630 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 15:35:41 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=ED=83=9C(?= =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=A0=95=EC=A7=80)=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=8B=9C=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94=EB=AA=A8=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uss/umt/web/EgovUserManageController.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 155c5ff8..ff7a4a82 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -2316,6 +2316,19 @@ public class EgovUserManageController { } + // 관리자 메모 + String memo = ""; + if(mberManageVO.getMberSttus().equals("Y")) { + memo = "회원상태 변경 : 일반"; + } + else if(mberManageVO.getMberSttus().equals("B")) { + memo = "회원상태 변경 : 이용정지"; + } + mberManageVO.setMberId(mberId); + mberManageVO.setMemoCn(memo); + mberManageVO.setFrstRegisterId(userId); + mberManageService.insertMberMemo(mberManageVO); + modelAndView.addObject("message", "이용자 상태를 수정하였습니다."); modelAndView.addObject("result", "success"); @@ -2648,7 +2661,14 @@ public class EgovUserManageController { resultCnt = mberManageService.updateUserSecessionMsttus(mberManageVO); if(resultCnt > 0) { - + // 관리자 메모 + String memo = ""; + memo = "회원상태 변경 : 탈퇴"; + mberManageVO.setMberId(mberId); + mberManageVO.setMemoCn(memo); + mberManageVO.setFrstRegisterId(userId); + mberManageService.insertMberMemo(mberManageVO); + modelAndView.addObject("message", "이용자 탈퇴가 완료 되었습니다."); modelAndView.addObject("result", "success"); From 29bb04198f23b50cbf0a840cec433ab40d49467d Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 16:33:09 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=ED=95=98=EA=B8=B0?= =?UTF-8?q?=EC=97=90=20=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/pay/web/MjonPayV2Controller.java | 8 ++ .../webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp | 118 ++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index e5f9813f..c34d3bc6 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -35,6 +35,8 @@ import itn.let.mjo.pay.service.MjonPayVO; import itn.let.mjo.pay.service.MjonVaMsgLogVO; import itn.let.mjo.payva.service.VacsVactService; import itn.let.mjo.payva.service.VacsVactVO; +import itn.let.sym.grd.service.MberGrdService; +import itn.let.sym.grd.service.MberGrdVO; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uss.umt.service.EgovMberManageService; @@ -76,6 +78,8 @@ public class MjonPayV2Controller { @Resource(name="MjonCommon") private MjonCommon mjonCommon; + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; /** KG 모빌리언스 설정 */ // CARD @@ -180,6 +184,10 @@ public class MjonPayV2Controller { } model.addAttribute("tabType", tabType); + MberGrdVO mberGrdVO = new MberGrdVO(); + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + return "/web/pay/PayViewV2"; } diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index 1d4674c0..9d7c845e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -29,6 +29,11 @@ $(document).ready(function(){ $("#btnDdedicatedAccount").trigger("click"); } + //등급제 시행 ON/OFF 체크 + //getMberSettingDetail(); + + // 등급제 대상 여부 + //getMberGrdChk(); }); @@ -601,6 +606,59 @@ function TabTypePay(obj, tabId) { // 충전금액 세팅 setPriceMake(); } + + +//등급제 시행 ON/OFF 체크 +function getMberSettingDetail() { + $.ajax({ + type: "POST", + url: "/web/grd/mberSettDetailAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 문자(등급별 요금 안내) + $("#mberGrdSettingArea").show(); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + +// 등급제 대상 여부 +function getMberGrdChk() { + $.ajax({ + type: "POST", + url: "/web/grd/mberGrdChkAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 등급제 누적결제액 세부내역 + var sHtml = ""; + sHtml += "

등급 : 등급 스몰 아이콘" + data.rtnMberGrdVO.grdSetNm; + sHtml += "(누적결제액 :                  " + numberWithCommas(data.rtnMberGrdVO.totAmt) + "원)

"; + $("#grdShowArea").html(sHtml); + $("#grdShowArea").show(); + $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)"); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
등급누적결제액단문장문그림(1장)그림(2장)그림(3장)
+ + * 등급별 요금제는 당사의 정책 및 운영의 필요상 수정, 중단 또는 변경될 수 있습니다.
+ * 누적결제액은 등급별 요금제 적용일로부터 적립된 결제금액을 말하며, 누적결제액에 따라 등급은 자동으로 적용됩니다.
+ * "첫결제 이벤트" 등 이벤트 결제금액은 등급별 요금제 누적결제액에서 제외됩니다.
+ +

+ * 문자피싱, 스미싱, 주식, 도박, 로또, 스팸, 사기, 협박, 범죄, 유사투자, 유사수신 등을 목적으로 하거나 교사 또는 방조하는 내용의 정보, 발신번호 조작 + 등으로 인지되는 문자에 대해서는 + 사전 또는 즉시 발송을 차단하고 + 이용을 정지시킬 수 있으며, 이에 대한 어떠한 환불이나 보상을 실시하지 않습니다. 또한, 상기 문자를 발송한 회원에 대해서는 그 즉시 등급별 요금제 혜택을 + 취소합니다. +

+
+ + +
From 3377ee78cbe0ab0ad2a69f1d77e92b53e9ffc1d7 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 14 Jul 2023 17:25:00 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=EC=B2=AB=EA=B2=B0=EC=A0=9C=EC=8B=9C=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=EC=82=AC=20JJ=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EA=B4=80=EB=A6=AC=EC=9E=90=EB=A9=94?= =?UTF-8?q?=EB=AA=A8=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index f80db2c3..13f98b7e 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -587,7 +587,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement // 전송사 JJ로 변경 mberManageVO.setHotlineAgentName("첫결제 JJ"); mberManageVO.setHotlineAgentCode("05"); - mberManageVO.setFrstRegisterId("admin"); + mberManageVO.setAdmUserId("admin"); mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); } } From 8156264009231eb0569a4953de2142f41e612e01 Mon Sep 17 00:00:00 2001 From: itn Date: Mon, 17 Jul 2023 10:14:26 +0900 Subject: [PATCH 12/12] =?UTF-8?q?=EC=B2=AB=EA=B2=B0=EC=A0=9C(=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=EA=B2=B0=EC=A0=9C=20=EC=A0=9C=EC=99=B8)=EC=8B=9C=20JJ?= =?UTF-8?q?=20=EC=A0=84=EC=9A=A9=EC=A0=84=EC=86=A1=EC=82=AC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EA=B8=B0=EB=8A=A5=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 13f98b7e..10e1bbd3 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -579,6 +579,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement // 업데이트 userManageDAO.updateUserSmishingYn(userManageVO); + /* // B선 전송사 이용고객 => 전송사 JJ로 변경안함 MberManageVO mberManageVO = new MberManageVO(); mberManageVO.setMberId(userManageVO.getMberId()); @@ -590,6 +591,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement mberManageVO.setAdmUserId("admin"); mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); } + */ } // 알림톡 스미싱의심 온/오프