From 846780c8c334217e92ac765cd6eb3f0daf00c0f1 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 25 Jul 2025 16:51:25 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=8F=20=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/pay/web/MjonPayV2Controller.java | 2 + src/main/java/itn/web/MainController.java | 37 ++++++ .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 105 ++++++++++++++---- 3 files changed, 120 insertions(+), 24 deletions(-) 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 7907a32d..472ecf80 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -278,6 +278,8 @@ public class MjonPayV2Controller { try { // 다음 결제시 결제수단 SELECT nextPayMethod = userManageService.selectNextPayMethod(userId); + // 실제 마지막 결제 방식 - + } catch(Exception e) { isSuccess = false; diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index cfaf8028..aba9ff3b 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -12,6 +12,9 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.spec.RSAPublicKeySpec; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -106,6 +109,7 @@ import itn.let.lett.service.LetterVO; import itn.let.mjo.addr.service.AddrTransHistService; import itn.let.mjo.addr.service.AddrTransHistVO; import itn.let.mjo.event.service.MjonEventService; +import itn.let.mjo.event.service.MjonEventVO; import itn.let.mjo.kisa.service.KisaService; import itn.let.mjo.kisa.service.KisaVO; import itn.let.mjo.mjocommon.MjonForienIpChk; @@ -130,6 +134,7 @@ import itn.let.sym.mnu.mpm.service.MenuManageVO; import itn.let.sym.prm.service.EgovProgrmManageService; import itn.let.sym.prm.service.ProgrmManageVO; import itn.let.sym.site.service.EgovSiteManagerService; +import itn.let.sym.site.service.JoinSettingVO; import itn.let.sym.site.service.MetaTagVO; import itn.let.sym.site.service.SiteManagerVO; import itn.let.uss.umt.service.EgovMberManageService; @@ -1256,6 +1261,38 @@ public class MainController { model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO)); } + /* + * 회원별 정보(단가), 기본 단가, 남은 이벤트 기간 조회 + * 2025.07.25 이지우 추가 + * */ + MberManageVO mberPriceVO = new MberManageVO(); + JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); + MjonEventVO mjonEventVO = new MjonEventVO(); + if(loginVO != null) { + mberPriceVO = mberManageService.selectMber(loginVO.getId()); + if(!(mberPriceVO.getShortPrice() > 0)) mberPriceVO.setShortPrice(sysJoinSetVO.getShortPrice()); + if(!(mberPriceVO.getLongPrice() > 0)) mberPriceVO.setLongPrice(sysJoinSetVO.getLongPrice()); + if(!(mberPriceVO.getPicturePrice() > 0)) mberPriceVO.setPicturePrice(sysJoinSetVO.getPicturePrice()); + if(!(mberPriceVO.getPicture2Price() > 0)) mberPriceVO.setPicture2Price(sysJoinSetVO.getPicture2Price()); + if(!(mberPriceVO.getPicture3Price() > 0)) mberPriceVO.setPicture3Price(sysJoinSetVO.getPicture3Price()); + //카카오, 팩스는 기본단가 고정 + mberPriceVO.setKakaoAtPrice(sysJoinSetVO.getKakaoAtPrice()); + mberPriceVO.setFaxPrice(sysJoinSetVO.getFaxPrice()); + + mjonEventVO.setMberId(loginVO.getId()); + mjonEventVO = mjonEventService.selectEventMsgMberDefaultInfo(mjonEventVO); + String eventEndDateStr = ""; + if(StringUtil.isNotEmpty(mjonEventVO.getEventEndDate())) { + eventEndDateStr = mjonEventVO.getEventEndDate(); + LocalDate today = LocalDate.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate eventEndDate = LocalDate.parse(eventEndDateStr, formatter); + long eventLeftDay = ChronoUnit.DAYS.between(today, eventEndDate); + model.addAttribute("eventLeftDay", eventLeftDay); + } + + } + model.addAttribute("mberPriceVO", mberPriceVO); return "web/com/webCommonHeader"; } 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 71ddc8e0..898c6dbf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1398,14 +1398,14 @@ function actionLogin_end(){
@@ -1627,7 +1627,9 @@ function actionLogin_end(){
  • -
    마이페이지
    + <%-- 250724 마이페이지 대시보드 삭제 --%> + <%--
    마이페이지
    --%> +
    마이페이지
    • 회원정보 변경
      • @@ -1744,8 +1746,9 @@ function actionLogin_end(){
    diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp index 29591d82..80792b31 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp @@ -41,7 +41,7 @@ function getNextPayMethod() { var nextPayMethod = ""; $.ajax({ type: "POST", - url: "/web/member/pay/selectNextPayMethodAjax.do", + url: "/web/member/pay/selectLastPayMethodAjax.do", data: {}, dataType:'json', async: false, diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp index bed33f22..77664f19 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp @@ -247,20 +247,17 @@ function updateUserInfo(){ return false; } - if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){ - if($("#emailAdd").val() != ""){ - var email = $("#emailId").val() + "@" + $("#emailAdd").val(); - var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i; - if(taxExptext.test(email)==false){ - alert("이메일주소 형식이 올바르지 않습니다."); - return false; - } - - $("#mberEmailAdres").val(email); - }else{ - alert("이메일 주소를 확인해 주세요"); + if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){ + alert("이메일은 필수 입력 항목입니다.") + return false; + }else { + var email = $("#emailId").val() + "@" + $("#emailAdd").val(); + var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i; + if(taxExptext.test(email)==false){ + alert("이메일주소 형식이 올바르지 않습니다."); return false; } + $("#mberEmailAdres").val(email); } if("${cmpPhoneChangeManageVO.hstSttus}" == '03'){ @@ -678,7 +675,7 @@ function changeValueWork(obj){
    -
    *이메일
    +
    이메일
    From 7aa34761134f1516bb395d3223c78422b265b20b Mon Sep 17 00:00:00 2001 From: JIWOO Date: Thu, 7 Aug 2025 17:21:08 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=20=EB=B3=B4=EC=9C=A0=EC=9E=94=EC=95=A1=20=EC=B6=A9?= =?UTF-8?q?=EC=A0=84=20=EC=98=81=EC=97=AD=20=EA=B0=84=EA=B2=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 2 -- 1 file changed, 2 deletions(-) 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 fe9447a7..5f9097cb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1781,7 +1781,6 @@ function actionLogin_end(){
    +
    + + +

    포인트 원

    + +